Resolve Date Picker Issues.

client/package.json

@@ -4,41 +4,40 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@apollo/client": "^3.5.10",
+    "@apollo/client": "^3.5.6",
     "@asseinfo/react-kanban": "^2.2.0",
     "@craco/craco": "^6.4.3",
-    "@fingerprintjs/fingerprintjs": "^3.3.3",
-    "@sentry/react": "^6.19.6",
-    "@sentry/tracing": "^6.19.6",
-    "@splitsoftware/splitio-react": "^1.4.0",
-    "@stripe/react-stripe-js": "^1.7.1",
-    "@stripe/stripe-js": "^1.27.0",
-    "@tanem/react-nprogress": "^4.0.12",
-    "antd": "^4.19.5",
+    "@fingerprintjs/fingerprintjs": "^3.3.1",
+    "@sentry/react": "^6.16.1",
+    "@sentry/tracing": "^6.16.1",
+    "@splitsoftware/splitio-react": "^1.3.0",
+    "@stripe/react-stripe-js": "^1.7.0",
+    "@stripe/stripe-js": "^1.22.0",
+    "@tanem/react-nprogress": "^3.0.82",
+    "antd": "^4.17.4",
     "apollo-link-logger": "^2.0.0",
-    "axios": "^0.26.1",
+    "axios": "^0.24.0",
     "craco-less": "^1.20.0",
     "dinero.js": "^1.9.1",
-    "dotenv": "^16.0.0",
+    "dotenv": "^10.0.0",
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
-    "firebase": "^9.6.11",
-    "graphql": "^16.3.0",
-    "i18next": "^21.6.16",
-    "i18next-browser-languagedetector": "^6.1.4",
-    "jsoneditor": "^9.7.4",
+    "firebase": "^9.6.1",
+    "graphql": "^16.2.0",
+    "i18next": "^21.6.3",
+    "i18next-browser-languagedetector": "^6.1.2",
+    "jsoneditor": "^9.5.8",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.9.51",
-    "logrocket": "^2.2.1",
-    "markerjs2": "^2.21.1",
+    "libphonenumber-js": "^1.9.44",
+    "logrocket": "^2.1.2",
+    "markerjs2": "^2.17.2",
     "moment-business-days": "^1.2.0",
     "moment-timezone": "^0.5.34",
-    "normalize-url": "^7.0.3",
-    "phone": "^3.1.15",
+    "phone": "^3.1.10",
     "preval.macro": "^5.0.0",
-    "prop-types": "^15.8.1",
-    "query-string": "^7.1.1",
+    "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.2",
@@ -46,42 +45,41 @@
     "react-color": "^2.19.3",
     "react-cookie": "^4.1.1",
     "react-dom": "^17.0.2",
-    "react-drag-listview": "^0.1.9",
+    "react-drag-listview": "^0.1.8",
     "react-grid-gallery": "^0.5.5",
-    "react-grid-layout": "^1.3.4",
-    "react-i18next": "^11.16.6",
+    "react-grid-layout": "^1.3.0",
+    "react-i18next": "^11.15.1",
     "react-icons": "^4.3.1",
-    "react-number-format": "^4.9.1",
-    "react-redux": "^7.2.8",
+    "react-number-format": "^4.9.0",
+    "react-redux": "^7.2.6",
     "react-resizable": "^3.0.4",
     "react-router-dom": "^5.3.0",
     "react-scripts": "^4.0.3",
-    "react-sticky": "^6.0.3",
     "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.3",
-    "recharts": "^2.1.9",
+    "recharts": "^2.1.8",
     "redux": "^4.1.2",
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.1.3",
     "redux-state-sync": "^3.1.2",
     "reselect": "^4.1.5",
-    "sass": "^1.50.0",
-    "socket.io-client": "^4.4.1",
-    "styled-components": "^5.3.5",
+    "sass": "^1.45.0",
+    "socket.io-client": "^4.4.0",
+    "styled-components": "^5.3.3",
     "subscriptions-transport-ws": "^0.11.0",
-    "web-vitals": "^2.1.4",
-    "workbox-background-sync": "^6.5.2",
-    "workbox-broadcast-update": "^6.5.2",
-    "workbox-cacheable-response": "^6.5.2",
-    "workbox-core": "^6.5.2",
-    "workbox-expiration": "^6.5.2",
-    "workbox-google-analytics": "^6.5.2",
-    "workbox-navigation-preload": "^6.5.2",
-    "workbox-precaching": "^6.5.2",
-    "workbox-range-requests": "^6.5.2",
-    "workbox-routing": "^6.5.2",
-    "workbox-strategies": "^6.5.2",
-    "workbox-streams": "^6.5.2",
+    "web-vitals": "^2.1.2",
+    "workbox-background-sync": "^6.4.2",
+    "workbox-broadcast-update": "^6.4.2",
+    "workbox-cacheable-response": "^6.4.2",
+    "workbox-core": "^6.4.2",
+    "workbox-expiration": "^6.4.2",
+    "workbox-google-analytics": "^6.4.2",
+    "workbox-navigation-preload": "^6.4.2",
+    "workbox-precaching": "^6.4.2",
+    "workbox-range-requests": "^6.4.2",
+    "workbox-routing": "^6.4.2",
+    "workbox-strategies": "^6.4.2",
+    "workbox-streams": "^6.4.2",
     "yauzl": "^2.10.0"
   },
   "scripts": {
@@ -118,11 +116,11 @@
     "react-error-overlay": "6.0.9"
   },
   "devDependencies": {
-    "@sentry/webpack-plugin": "^1.18.8",
+    "@sentry/webpack-plugin": "^1.18.3",
     "@testing-library/cypress": "^8.0.2",
-    "cypress": "^9.5.3",
+    "cypress": "^9.1.1",
     "eslint-plugin-cypress": "^2.12.1",
-    "react-error-overlay": "6.0.10",
+    "react-error-overlay": "6.0.9",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.2"
   }

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

@@ -13,7 +13,6 @@ import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -28,7 +27,7 @@ export default connect(
   mapDispatchToProps
 )(AccountingPayablesTableComponent);
 
-export function AccountingPayablesTableComponent({ bodyshop, loading, bills, refetch }) {
+export function AccountingPayablesTableComponent({ bodyshop, loading, bills }) {
   const { t } = useTranslation();
   const [selectedBills, setSelectedBills] = useState([]);
   const [transInProgress, setTransInProgress] = useState(false);
@@ -132,9 +131,11 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills, ref
       dataIndex: "attempts",
       key: "attempts",
 
-      render: (text, record) => (
-        <ExportLogsCountDisplay logs={record.exportlogs} />
-      ),
+      render: (text, record) => {
+        const success = record.exportlogs.filter((e) => e.successful).length;
+        const attempts = record.exportlogs.length;
+        return `${success}/${attempts}`;
+      },
     },
     {
       title: t("general.labels.actions"),
@@ -149,7 +150,6 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills, ref
             disabled={transInProgress || !!record.exported}
             loadingCallback={setTransInProgress}
             setSelectedBills={setSelectedBills}
-            refetch={refetch}
           />
         </div>
       ),
@@ -182,7 +182,6 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills, ref
             disabled={transInProgress || selectedBills.length === 0}
             loadingCallback={setTransInProgress}
             completedCallback={setSelectedBills}
-            refetch={refetch}
           />
           {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && (
             <QboAuthorizeComponent />

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

@@ -12,8 +12,6 @@ import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -32,7 +30,6 @@ export function AccountingPayablesTableComponent({
   bodyshop,
   loading,
   payments,
-  refetch,
 }) {
   const { t } = useTranslation();
   const [selectedPayments, setSelectedPayments] = useState([]);
@@ -79,12 +76,14 @@ export function AccountingPayablesTableComponent({
       render: (text, record) => {
         return record.job.owner ? (
           <Link to={"/manage/owners/" + record.job.owner.id}>
-            <OwnerNameDisplay ownerObject={record.job} />
+            {`${record.job.ownr_fn || ""} ${record.job.ownr_ln || ""} ${
+              record.job.ownr_co_nm || ""
+            }`}
           </Link>
         ) : (
-          <span>
-            <OwnerNameDisplay ownerObject={record.job} />
-          </span>
+          <span>{`${record.job.ownr_fn || ""} ${record.job.ownr_ln || ""} ${
+            record.job.ownr_co_nm || ""
+          }`}</span>
         );
       },
     },
@@ -132,9 +131,11 @@ export function AccountingPayablesTableComponent({
       dataIndex: "attempts",
       key: "attempts",
 
-      render: (text, record) => (
-        <ExportLogsCountDisplay logs={record.exportlogs} />
-      ),
+      render: (text, record) => {
+        const success = record.exportlogs.filter((e) => e.successful).length;
+        const attempts = record.exportlogs.length;
+        return `${success}/${attempts}`;
+      },
     },
     {
       title: t("general.labels.actions"),
@@ -148,7 +149,6 @@ export function AccountingPayablesTableComponent({
           disabled={transInProgress || !!record.exportedat}
           loadingCallback={setTransInProgress}
           setSelectedPayments={setSelectedPayments}
-          refetch={refetch}
         />
       ),
     },
@@ -162,19 +162,10 @@ export function AccountingPayablesTableComponent({
   const dataSource = state.search
     ? payments.filter(
         (v) =>
-          (v.paymentnum || "")
+          (v.vendor.name || "")
             .toLowerCase()
             .includes(state.search.toLowerCase()) ||
-          ((v.job && v.job.ro_number) || "")
-            .toLowerCase()
-            .includes(state.search.toLowerCase()) ||
-          ((v.job && v.job.ownr_fn) || "")
-            .toLowerCase()
-            .includes(state.search.toLowerCase()) ||
-          ((v.job && v.job.ownr_ln) || "")
-            .toLowerCase()
-            .includes(state.search.toLowerCase()) ||
-          ((v.job && v.job.ownr_co_nm) || "")
+          (v.invoice_number || "")
             .toLowerCase()
             .includes(state.search.toLowerCase())
       )
@@ -189,7 +180,6 @@ export function AccountingPayablesTableComponent({
             disabled={transInProgress || selectedPayments.length === 0}
             loadingCallback={setTransInProgress}
             completedCallback={setSelectedPayments}
-            refetch={refetch}
           />
           {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && (
             <QboAuthorizeComponent />

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

@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort, dateSort } from "../../utils/sorters";
+import { alphaSort } from "../../utils/sorters";
 import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component";
 import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-button.component";
 
@@ -12,10 +12,6 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
-import { DateFormatter } from "../../utils/DateFormatter";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
-
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -31,7 +27,6 @@ export function AccountingReceivablesTableComponent({
   bodyshop,
   loading,
   jobs,
-  refetch,
 }) {
   const { t } = useTranslation();
   const [selectedJobs, setSelectedJobs] = useState([]);
@@ -67,18 +62,6 @@ export function AccountingReceivablesTableComponent({
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
     },
-    {
-      title: t("jobs.fields.date_invoiced"),
-      dataIndex: "date_invoiced",
-      key: "date_invoiced",
-      sorter: (a, b) => dateSort(a.date_invoiced, b.date_invoiced),
-      sortOrder:
-        state.sortedInfo.columnKey === "date_invoiced" &&
-        state.sortedInfo.order,
-      render: (text, record) => (
-        <DateFormatter>{record.date_invoiced}</DateFormatter>
-      ),
-    },
     {
       title: t("jobs.fields.owner"),
       dataIndex: "owner",
@@ -89,12 +72,14 @@ export function AccountingReceivablesTableComponent({
       render: (text, record) => {
         return record.owner ? (
           <Link to={"/manage/owners/" + record.owner.id}>
-            <OwnerNameDisplay ownerObject={record} />
+            {`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
+              record.ownr_co_nm || ""
+            }`}
           </Link>
         ) : (
-          <span>
-            <OwnerNameDisplay ownerObject={record} />
-          </span>
+          <span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
+            record.ownr_co_nm || ""
+          }`}</span>
         );
       },
     },
@@ -141,9 +126,12 @@ export function AccountingReceivablesTableComponent({
       title: t("exportlogs.labels.attempts"),
       dataIndex: "attempts",
       key: "attempts",
-      render: (text, record) => (
-        <ExportLogsCountDisplay logs={record.exportlogs} />
-      ),
+
+      render: (text, record) => {
+        const success = record.exportlogs.filter((e) => e.successful).length;
+        const attempts = record.exportlogs.length;
+        return `${success}/${attempts}`;
+      },
     },
     {
       title: t("general.labels.actions"),
@@ -156,7 +144,6 @@ export function AccountingReceivablesTableComponent({
             jobId={record.id}
             disabled={!!record.date_exported}
             setSelectedJobs={setSelectedJobs}
-            refetch={refetch}
           />
           <Link to={`/manage/jobs/${record.id}/close`}>
             <Button>{t("jobs.labels.viewallocations")}</Button>
@@ -207,7 +194,6 @@ export function AccountingReceivablesTableComponent({
               disabled={transInProgress || selectedJobs.length === 0}
               loadingCallback={setTransInProgress}
               completedCallback={setSelectedJobs}
-              refetch={refetch}
             />
           )}
           {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && (

client/src/components/bill-cm-returns-table/bill-cm-returns-table.component.jsx

@@ -1,136 +0,0 @@
-import { Checkbox, Form, Skeleton, Typography } from "antd";
-import React, { useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import ReadOnlyFormItemComponent from "../form-items-formatted/read-only-form-item.component";
-import "./bill-cm-returns-table.styles.scss";
-export default function BillCmdReturnsTableComponent({
-  form,
-  loadOutstandingReturns,
-  returnLoading,
-  returnData,
-}) {
-  const { t } = useTranslation();
-
-  useEffect(() => {
-    if (returnData) {
-      form.setFieldsValue({
-        outstanding_returns: returnData.parts_order_lines,
-      });
-    }
-  }, [returnData, form]);
-
-  return (
-    <Form.Item
-      shouldUpdate={(prev, cur) =>
-        prev.jobid !== cur.jobid ||
-        prev.is_credit_memo !== cur.is_credit_memo ||
-        prev.vendorid !== cur.vendorid
-      }
-      noStyle
-    >
-      {() => {
-        const isReturn = form.getFieldValue("is_credit_memo");
-
-        if (!isReturn) {
-          return null;
-        }
-
-        if (returnLoading) return <Skeleton />;
-
-        return (
-          <Form.List name="outstanding_returns">
-            {(fields, { add, remove, move }) => {
-              return (
-                <>
-                  <Typography.Title level={4}>
-                    {t("bills.labels.creditsnotreceived")}
-                  </Typography.Title>
-                  <table className="bill-cm-returns-table">
-                    <thead>
-                      <tr>
-                        <th>{t("parts_orders.fields.line_desc")}</th>
-                        <th>{t("parts_orders.fields.part_type")}</th>
-                        <th>{t("parts_orders.fields.quantity")}</th>
-                        <th>{t("parts_orders.fields.act_price")}</th>
-                        <th>{t("parts_orders.fields.cost")}</th>
-                        <th>{t("parts_orders.labels.mark_as_received")}</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      {fields.map((field, index) => (
-                        <tr key={field.key}>
-                          <td>
-                            <Form.Item
-                              //   label={t("joblines.fields.line_desc")}
-                              key={`${index}line_desc`}
-                              name={[field.name, "line_desc"]}
-                            >
-                              <ReadOnlyFormItemComponent />
-                            </Form.Item>
-                          </td>
-
-                          <td>
-                            <Form.Item
-                              span={2}
-                              //label={t("joblines.fields.mod_lb_hrs")}
-                              key={`${index}part_type`}
-                              name={[field.name, "part_type"]}
-                            >
-                              <ReadOnlyFormItemComponent />
-                            </Form.Item>
-                          </td>
-                          <td>
-                            <Form.Item
-                              span={2}
-                              //label={t("joblines.fields.mod_lb_hrs")}
-                              key={`${index}quantity`}
-                              name={[field.name, "quantity"]}
-                            >
-                              <ReadOnlyFormItemComponent />
-                            </Form.Item>
-                          </td>
-                          <td>
-                            <Form.Item
-                              span={2}
-                              //label={t("joblines.fields.mod_lb_hrs")}
-                              key={`${index}act_price`}
-                              name={[field.name, "act_price"]}
-                            >
-                              <ReadOnlyFormItemComponent type="currency" />
-                            </Form.Item>
-                          </td>
-                          <td>
-                            <Form.Item
-                              span={2}
-                              //label={t("joblines.fields.mod_lb_hrs")}
-                              key={`${index}cost`}
-                              name={[field.name, "cost"]}
-                            >
-                              <ReadOnlyFormItemComponent type="currency" />
-                            </Form.Item>
-                          </td>
-
-                          <td>
-                            <Form.Item
-                              span={2}
-                              //label={t("joblines.fields.mod_lb_hrs")}
-                              key={`${index}cm_received`}
-                              name={[field.name, "cm_received"]}
-                              valuePropName="checked"
-                            >
-                              <Checkbox />
-                            </Form.Item>
-                          </td>
-                        </tr>
-                      ))}
-                    </tbody>
-                  </table>
-                </>
-              );
-            }}
-          </Form.List>
-        );
-      }}
-    </Form.Item>
-  );
-}

client/src/components/bill-cm-returns-table/bill-cm-returns-table.styles.scss

@@ -1,19 +0,0 @@
-.bill-cm-returns-table {
-    table-layout: fixed;
-    width: 100%;
-
-    th,
-    td {
-        padding: 8px;
-        text-align: left;
-        border-bottom: 1px solid #ddd;
-
-        .ant-form-item {
-            margin-bottom: 0px !important;
-        }
-    }
-
-    tr:hover {
-        background-color: #f5f5f5;
-    }
-}

client/src/components/bill-detail-edit/bill-detail-edit.container.jsx

@@ -12,29 +12,26 @@ import moment from "moment";
 import queryString from "query-string";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { useHistory, useLocation } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
+import { useLocation, useHistory } from "react-router-dom";
 import {
-  DELETE_BILL_LINE,
   INSERT_NEW_BILL_LINES,
   UPDATE_BILL_LINE,
 } from "../../graphql/bill-lines.queries";
 import { QUERY_BILL_BY_PK, UPDATE_BILL } from "../../graphql/bills.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import { setModalContext } from "../../redux/modals/modals.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import AlertComponent from "../alert/alert.component";
 import BillFormContainer from "../bill-form/bill-form.container";
-import BillMarkExportedButton from "../bill-mark-exported-button/bill-mark-exported-button.component";
-import BillReeportButtonComponent from "../bill-reexport-button/bill-reexport-button.component";
 import JobDocumentsGallery from "../jobs-documents-gallery/jobs-documents-gallery.container";
-import JobsDocumentsLocalGallery from "../jobs-documents-local-gallery/jobs-documents-local-gallery.container";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
+import BillReeportButtonComponent from "../bill-reexport-button/bill-reexport-button.component";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import BillMarkExportedButton from "../bill-mark-exported-button/bill-mark-exported-button.component";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
+  //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
@@ -51,7 +48,6 @@ export default connect(
 export function BillDetailEditcontainer({
   setPartsOrderContext,
   insertAuditTrail,
-  bodyshop,
 }) {
   const search = queryString.parse(useLocation().search);
   const history = useHistory();
@@ -62,7 +58,6 @@ export function BillDetailEditcontainer({
   const [update_bill] = useMutation(UPDATE_BILL);
   const [insertBillLine] = useMutation(INSERT_NEW_BILL_LINES);
   const [updateBillLine] = useMutation(UPDATE_BILL_LINE);
-  const [deleteBillLine] = useMutation(DELETE_BILL_LINE);
 
   const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
     .filter((screen) => !!screen[1])
@@ -112,20 +107,6 @@ export function BillDetailEditcontainer({
       })
     );
 
-    //Find bill lines that were deleted.
-    const deletedJobLines = [];
-
-    data.bills_by_pk.billlines.forEach((a) => {
-      const matchingRecord = billlines.find((b) => b.id === a.id);
-      if (!matchingRecord) {
-        deletedJobLines.push(a);
-      }
-    });
-
-    deletedJobLines.forEach((d) => {
-      updates.push(deleteBillLine({ variables: { id: d.id } }));
-    });
-
     billlines.forEach((billline) => {
       const { deductedfromlbr, jobline, ...il } = billline;
       delete il.__typename;
@@ -161,7 +142,6 @@ export function BillDetailEditcontainer({
         );
       }
     });
-
     await Promise.all(updates);
 
     insertAuditTrail({
@@ -268,21 +248,12 @@ export function BillDetailEditcontainer({
             layout="vertical"
           >
             <BillFormContainer form={form} billEdit disabled={exported} />
-
-            {bodyshop.uselocalmediaserver ? (
-              <JobsDocumentsLocalGallery
-                job={{ id: data ? data.bills_by_pk.jobid : null }}
-                invoice_number={data ? data.bills_by_pk.invoice_number : null}
-                vendorid={data ? data.bills_by_pk.vendorid : null}
-              />
-            ) : (
-              <JobDocumentsGallery
-                jobId={data ? data.bills_by_pk.jobid : null}
-                billId={search.billid}
-                documentsList={data ? data.bills_by_pk.documents : []}
-                billsCallback={refetch}
-              />
-            )}
+            <JobDocumentsGallery
+              jobId={data ? data.bills_by_pk.jobid : null}
+              billId={search.billid}
+              documentsList={data ? data.bills_by_pk.documents : []}
+              billsCallback={refetch}
+            />
           </Form>
         </>
       )}

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

@@ -11,7 +11,6 @@ import {
   QUERY_JOB_LBR_ADJUSTMENTS,
   UPDATE_JOB,
 } from "../../graphql/jobs.queries";
-import { MUTATION_MARK_RETURN_RECEIVED } from "../../graphql/parts-orders.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectBillEnterModal } from "../../redux/modals/modals.selectors";
@@ -24,7 +23,6 @@ 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";
-import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -49,7 +47,6 @@ function BillEnterModalContainer({
   const [enterAgain, setEnterAgain] = useState(false);
   const [insertBill] = useMutation(INSERT_NEW_BILL);
   const [updateJobLines] = useMutation(UPDATE_JOB_LINE);
-  const [updatePartsOrderLines] = useMutation(MUTATION_MARK_RETURN_RECEIVED);
   const [loading, setLoading] = useState(false);
   const client = useApolloClient();
 
@@ -79,8 +76,7 @@ function BillEnterModalContainer({
     }
 
     setLoading(true);
-    const { upload, location, outstanding_returns, ...remainingValues } =
-      values;
+    const { upload, location, ...remainingValues } = values;
 
     let adjustmentsToInsert = {};
 
@@ -160,25 +156,6 @@ function BillEnterModalContainer({
       });
     }
 
-    const markPolReceived =
-      outstanding_returns &&
-      outstanding_returns.filter((o) => o.cm_received === true);
-
-    if (markPolReceived && markPolReceived.length > 0) {
-      const r2 = await updatePartsOrderLines({
-        variables: { partsLineIds: markPolReceived.map((p) => p.id) },
-      });
-      if (!!r2.errors) {
-        setLoading(false);
-        setEnterAgain(false);
-        notification["error"]({
-          message: t("parts_orders.errors.updating", {
-            message: JSON.stringify(r2.errors),
-          }),
-        });
-      }
-    }
-
     if (!!r1.errors) {
       setLoading(false);
       setEnterAgain(false);
@@ -211,33 +188,19 @@ function BillEnterModalContainer({
     /////////////////////////
     if (upload && upload.length > 0) {
       //insert Each of the documents?
-
-      if (bodyshop.uselocalmediaserver) {
-        upload.forEach((u) => {
-          handleLocalUpload({
-            ev: { file: u.originFileObj },
-            context: {
-              jobid: values.jobid,
-              invoice_number: remainingValues.invoice_number,
-              vendorid: remainingValues.vendorid,
-            },
-          });
-        });
-      } else {
-        upload.forEach((u) => {
-          handleUpload(
-            { file: u.originFileObj },
-            {
-              bodyshop: bodyshop,
-              uploaded_by: currentUser.email,
-              jobId: values.jobid,
-              billId: billId,
-              tagsArray: null,
-              callback: null,
-            }
-          );
-        });
-      }
+      upload.forEach((u) => {
+        handleUpload(
+          { file: u.originFileObj },
+          {
+            bodyshop: bodyshop,
+            uploaded_by: currentUser.email,
+            jobId: values.jobid,
+            billId: billId,
+            tagsArray: null,
+            callback: null,
+          }
+        );
+      });
     }
     ///////////////////////////
     setLoading(false);

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

@@ -47,7 +47,6 @@ export function BillFormComponent({
   billEdit,
   disableInvNumber,
   job,
-  loadOutstandingReturns,
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
@@ -59,14 +58,6 @@ export function BillFormComponent({
   );
   const handleVendorSelect = (props, opt) => {
     setDiscount(opt.discount);
-
-    opt &&
-      loadOutstandingReturns({
-        variables: {
-          jobId: form.getFieldValue("jobid"),
-          vendorId: opt.value,
-        },
-      });
   };
 
   useEffect(() => {
@@ -74,8 +65,8 @@ export function BillFormComponent({
   }, [job, form]);
 
   useEffect(() => {
-    const vendorId = form.getFieldValue("vendorid");
-    if (vendorId && vendorAutoCompleteOptions) {
+    if (form.getFieldValue("vendorid") && vendorAutoCompleteOptions) {
+      const vendorId = form.getFieldValue("vendorid");
       const matchingVendors = vendorAutoCompleteOptions.filter(
         (v) => v.id === vendorId
       );
@@ -83,25 +74,10 @@ export function BillFormComponent({
         setDiscount(matchingVendors[0].discount);
       }
     }
-    const jobId = form.getFieldValue("jobid");
-    if (jobId) {
-      loadLines({ variables: { id: jobId } });
-      if (form.getFieldValue("is_credit_memo") && vendorId) {
-        loadOutstandingReturns({
-          variables: {
-            jobId: jobId,
-            vendorId: vendorId,
-          },
-        });
-      }
+    if (form.getFieldValue("jobid")) {
+      loadLines({ variables: { id: form.getFieldValue("jobid") } });
     }
-  }, [
-    form,
-    loadOutstandingReturns,
-    setDiscount,
-    vendorAutoCompleteOptions,
-    loadLines,
-  ]);
+  }, [form, setDiscount, vendorAutoCompleteOptions, loadLines]);
 
   return (
     <div>
@@ -131,13 +107,6 @@ export function BillFormComponent({
             onBlur={() => {
               if (form.getFieldValue("jobid") !== null) {
                 loadLines({ variables: { id: form.getFieldValue("jobid") } });
-                if (form.getFieldValue("vendorid") !== null)
-                  loadOutstandingReturns({
-                    variables: {
-                      jobId: form.getFieldValue("jobid"),
-                      vendorId: form.getFieldValue("vendorid"),
-                    },
-                  });
               }
             }}
           />
@@ -145,7 +114,7 @@ export function BillFormComponent({
         <Form.Item
           label={t("bills.fields.vendor")}
           name="vendorid"
-          // style={{ display: billEdit ? "none" : null }}
+          style={{ display: billEdit ? "none" : null }}
           rules={[
             {
               required: true,
@@ -260,21 +229,6 @@ export function BillFormComponent({
             ({ getFieldValue }) => ({
               validator(rule, value) {
                 if (
-                  value === true &&
-                  getFieldValue("jobid") &&
-                  getFieldValue("vendorid")
-                ) {
-                  loadOutstandingReturns({
-                    variables: {
-                      jobId: form.getFieldValue("jobid"),
-                      vendorId: form.getFieldValue("vendorid"),
-                    },
-                  });
-                }
-
-                if (
-                  !bodyshop.bill_allow_post_to_closed &&
-                  job &&
                   (job.status === bodyshop.md_ro_statuses.default_invoiced ||
                     job.status === bodyshop.md_ro_statuses.default_exported ||
                     job.status === bodyshop.md_ro_statuses.default_void) &&

client/src/components/bill-form/bill-form.container.jsx

@@ -6,8 +6,6 @@ import { GET_JOB_LINES_TO_ENTER_BILL } from "../../graphql/jobs-lines.queries";
 import { SEARCH_VENDOR_AUTOCOMPLETE } from "../../graphql/vendors.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import BillFormComponent from "./bill-form.component";
-import BillCmdReturnsTableComponent from "../bill-cm-returns-table/bill-cm-returns-table.component";
-import { QUERY_UNRECEIVED_LINES } from "../../graphql/parts-orders.queries";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -29,34 +27,20 @@ export function BillFormContainer({
     GET_JOB_LINES_TO_ENTER_BILL
   );
 
-  const [loadOutstandingReturns, { loading: returnLoading, data: returnData }] =
-    useLazyQuery(QUERY_UNRECEIVED_LINES);
-
   return (
-    <>
-      <BillFormComponent
-        disabled={disabled}
-        form={form}
-        billEdit={billEdit}
-        vendorAutoCompleteOptions={
-          VendorAutoCompleteData && VendorAutoCompleteData.vendors
-        }
-        loadLines={loadLines}
-        lineData={lineData ? lineData.joblines : []}
-        job={lineData ? lineData.jobs_by_pk : null}
-        responsibilityCenters={bodyshop.md_responsibility_centers || null}
-        disableInvNumber={disableInvNumber}
-        loadOutstandingReturns={loadOutstandingReturns}
-      />
-      {!billEdit && (
-        <BillCmdReturnsTableComponent
-          form={form}
-          loadOutstandingReturns={loadOutstandingReturns}
-          returnLoading={returnLoading}
-          returnData={returnData}
-        />
-      )}
-    </>
+    <BillFormComponent
+      disabled={disabled}
+      form={form}
+      billEdit={billEdit}
+      vendorAutoCompleteOptions={
+        VendorAutoCompleteData && VendorAutoCompleteData.vendors
+      }
+      loadLines={loadLines}
+      lineData={lineData ? lineData.joblines : []}
+      job={lineData ? lineData.jobs_by_pk : null}
+      responsibilityCenters={bodyshop.md_responsibility_centers || null}
+      disableInvNumber={disableInvNumber}
+    />
   );
 }
 export default connect(mapStateToProps, null)(BillFormContainer);

client/src/components/bills-list-table/bills-list-table.component.jsx

@@ -43,8 +43,6 @@ export function BillsListTableComponent({
   });
   // const search = queryString.parse(useLocation().search);
   // const selectedBill = search.billid;
-  const [searchText, setSearchText] = useState("");
-
   const Templates = TemplateList("bill");
   const bills = billsQuery.data ? billsQuery.data.bills : [];
   const { refetch } = billsQuery;
@@ -61,6 +59,7 @@ export function BillsListTableComponent({
           record.is_credit_memo || record.vendorid === bodyshop.inhousevendorid
         }
         onClick={() => {
+          console.log(record);
           setPartsOrderContext({
             actions: {},
             context: {
@@ -168,24 +167,6 @@ export function BillsListTableComponent({
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
-  const filteredBills = bills
-    ? searchText === ""
-      ? bills
-      : bills.filter(
-          (b) =>
-            (b.invoice_number || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (b.vendor.name || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (b.total || "")
-              .toString()
-              .toLowerCase()
-              .includes(searchText.toLowerCase())
-        )
-    : [];
-
   return (
     <Card
       title={t("bills.labels.bills")}
@@ -226,10 +207,8 @@ export function BillsListTableComponent({
 
           <Input.Search
             placeholder={t("general.labels.search")}
-            value={searchText}
             onChange={(e) => {
               e.preventDefault();
-              setSearchText(e.target.value);
             }}
           />
         </Space>
@@ -242,7 +221,7 @@ export function BillsListTableComponent({
         }}
         columns={columns}
         rowKey="id"
-        dataSource={filteredBills}
+        dataSource={bills}
         onChange={handleTableChange}
       />
     </Card>

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

@@ -7,7 +7,6 @@ import { selectSelectedConversation } from "../../redux/messaging/messaging.sele
 import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import "./chat-conversation-list.styles.scss";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
   selectedConversation: selectSelectedConversation,
@@ -41,9 +40,9 @@ export function ChatConversationListComponent({
             {item.job_conversations.length > 0 ? (
               <div className="chat-name">
                 {item.job_conversations.map((j, idx) => (
-                  <div key={idx}>
-                    <OwnerNameDisplay ownerObject={j.job} />
-                  </div>
+                  <div key={idx}>{`${j.job.ownr_fn || ""} ${
+                    j.job.ownr_ln || ""
+                  } ${j.job.ownr_co_nm || ""} `}</div>
                 ))}
               </div>
             ) : (

client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx

@@ -4,7 +4,6 @@ import React from "react";
 import { Link } from "react-router-dom";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { REMOVE_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 export default function ChatConversationTitleTags({ jobConversations }) {
   const [removeJobConversation] = useMutation(REMOVE_CONVERSATION_TAG);
@@ -46,8 +45,9 @@ export default function ChatConversationTitleTags({ jobConversations }) {
           onClose={() => handleRemoveTag(item.job.id)}
         >
           <Link to={`/manage/jobs/${item.job.id}`}>
-            {`${item.job.ro_number || "?"} | `}
-            <OwnerNameDisplay ownerObject={item.job} />
+            {`${item.job.ro_number || "?"} | ${item.job.ownr_fn || ""} ${
+              item.job.ownr_ln || ""
+            } ${item.job.ownr_co_nm || ""}`}
           </Link>
         </Tag>
       ))}

client/src/components/chat-media-selector/chat-media-selector.component.jsx

@@ -6,13 +6,12 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { GET_DOCUMENTS_BY_JOB } from "../../graphql/documents.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import JobDocumentsGalleryExternal from "../jobs-documents-gallery/jobs-documents-gallery.external.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
+  //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -20,7 +19,6 @@ const mapDispatchToProps = (dispatch) => ({
 export default connect(mapStateToProps, mapDispatchToProps)(ChatMediaSelector);
 
 export function ChatMediaSelector({
-  bodyshop,
   selectedMedia,
   setSelectedMedia,
   conversation,
@@ -29,6 +27,7 @@ export function ChatMediaSelector({
   const [visible, setVisible] = useState(false);
 
   const { loading, error, data } = useQuery(GET_DOCUMENTS_BY_JOB, {
+
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
     variables: {
@@ -67,8 +66,6 @@ export function ChatMediaSelector({
     </div>
   );
 
-  if (bodyshop.uselocalmediaserver) return null;
-
   return (
     <Popover
       content={

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

@@ -19,7 +19,7 @@ export function ChatPresetsComponent({ bodyshop, setMessage, className }) {
   const menu = (
     <Menu>
       {bodyshop.md_messaging_presets.map((i, idx) => (
-        <Menu.Item onClick={() => setMessage(i.text)} key={idx}>
+        <Menu.Item onClick={() => setMessage(i.text)} onItemHover key={idx}>
           {i.label}
         </Menu.Item>
       ))}

client/src/components/chat-tag-ro/chat-tag-ro.component.jsx

@@ -1,8 +1,7 @@
 import { CloseCircleOutlined, LoadingOutlined } from "@ant-design/icons";
-import { Empty, Select, Space } from "antd";
+import { Select, Empty, Space } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 
 export default function ChatTagRoComponent({
   roOptions,
@@ -28,7 +27,9 @@ export default function ChatTagRoComponent({
         >
           {roOptions.map((item, idx) => (
             <Select.Option key={item.id || idx}>
-              {` ${item.ro_number || ""} | ${OwnerNameDisplayFunction(item)}`}
+              {` ${item.ro_number || ""} | ${item.ownr_fn || ""} ${
+                item.ownr_ln || ""
+              } ${item.ownr_co_nm || ""}`}
             </Select.Option>
           ))}
         </Select>

client/src/components/contract-job-block/contract-job-block.component.jsx

@@ -3,7 +3,7 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import DataLabel from "../data-label/data-label.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+
 export default function ContractJobBlock({ job }) {
   const { t } = useTranslation();
   return (
@@ -23,7 +23,9 @@ export default function ContractJobBlock({ job }) {
             } ${(job && job.v_model_desc) || ""}`}
           </DataLabel>
           <DataLabel label={t("jobs.fields.owner")}>
-            <OwnerNameDisplay ownerObject={job} />
+            {`${(job && job.ownr_fn) || ""} ${(job && job.ownr_ln) || ""} ${
+              (job && job.ownr_co_nm) || ""
+            }`}
           </DataLabel>
         </div>
       </Card>

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

@@ -3,7 +3,6 @@ import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 export default function ContractsJobsComponent({
   loading,
@@ -44,7 +43,17 @@ export default function ContractsJobsComponent({
       width: "25%",
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
-      render: (text, record) => <OwnerNameDisplay ownerObject={record} />,
+      render: (text, record) => {
+        return record.owner ? (
+          <span>
+            {record.ownr_fn} {record.ownr_ln} {record.ownr_co_nm || ""}
+          </span>
+        ) : (
+          <span>{`${record.ownr_fn} ${record.ownr_ln} ${
+            record.ownr_co_nm || ""
+          }`}</span>
+        );
+      },
     },
     {
       title: t("jobs.fields.status"),

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

@@ -12,22 +12,17 @@ import { setModalContext } from "../../redux/modals/modals.actions";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import moment from "moment";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
+  //currentUser: selectCurrentUser
 });
-
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
   setContractFinderContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "contractFinder" })),
 });
-
 export default connect(mapStateToProps, mapDispatchToProps)(ContractsList);
 
 export function ContractsList({
-  bodyshop,
   loading,
   contracts,
   refetch,
@@ -77,9 +72,7 @@ export function ContractsList({
       sortOrder:
         state.sortedInfo.columnKey === "driver_ln" && state.sortedInfo.order,
       render: (text, record) =>
-        bodyshop.last_name_first
-          ? `${record.driver_ln || ""}, ${record.driver_fn || ""}`
-          : `${record.driver_fn || ""} ${record.driver_ln || ""}`,
+        `${record.driver_fn || ""} ${record.driver_ln || ""}`,
     },
     {
       title: t("contracts.labels.vehicle"),

client/src/components/courtesy-car-form/courtesy-car-form.component.jsx

@@ -9,7 +9,7 @@ import { DateFormatter } from "../../utils/DateFormatter";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
 import CourtesyCarStatus from "../courtesy-car-status-select/courtesy-car-status-select.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
-//import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
+import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
@@ -32,7 +32,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         }
       />
 
-      {/* <FormFieldsChanged form={form} /> */}
+      <FormFieldsChanged form={form} />
       <LayoutFormRow header={t("courtesycars.labels.vehicle")}>
         <Form.Item
           label={t("courtesycars.fields.make")}

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

@@ -1,11 +1,9 @@
-import { SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Input, Space, Table } from "antd";
+import { Table, Button, Input, Card, Space } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { alphaSort } from "../../utils/sorters";
-import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
-
+import { SyncOutlined } from "@ant-design/icons";
 export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
   const [state, setState] = useState({
     sortedInfo: {},
@@ -99,9 +97,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       render: (text, record) =>
         record.cccontracts.length === 1 ? (
           <Link to={`/manage/jobs/${record.cccontracts[0].job.id}`}>
-            {`${
-              record.cccontracts[0].job.ro_number
-            } - ${OwnerNameDisplayFunction(record.cccontracts[0].job)}`}
+            {record.cccontracts[0].job.ro_number}
           </Link>
         ) : null,
     },

client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx

@@ -6,7 +6,6 @@ import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 export default function CsiResponseListPaginated({
   refetch,
@@ -49,12 +48,14 @@ export default function CsiResponseListPaginated({
       render: (text, record) => {
         return record.job.owner ? (
           <Link to={"/manage/owners/" + record.job.owner.id}>
-            <OwnerNameDisplay ownerObject={record.job} />
+            {`${record.job.ownr_fn || ""} ${record.job.ownr_ln || ""} ${
+              record.job.ownr_co_nm || ""
+            }`}
           </Link>
         ) : (
-          <span>
-            <OwnerNameDisplay ownerObject={record.job} />
-          </span>
+          <span>{`${record.job.ownr_fn || ""} ${record.job.ownr_ln || ""} ${
+            record.job.ownr_co_nm || ""
+          }`}</span>
         );
       },
     },

client/src/components/documents-local-upload/documents-local-upload.component.jsx

@@ -1,70 +0,0 @@
-import { UploadOutlined } from "@ant-design/icons";
-import { Upload } from "antd";
-import React, { useState } from "react";
-
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import {
-  selectBodyshop,
-  selectCurrentUser,
-} from "../../redux/user/user.selectors";
-import { handleUpload } from "./documents-local-upload.utility";
-
-const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser,
-  bodyshop: selectBodyshop,
-});
-
-export function DocumentsLocalUploadComponent({
-  children,
-  currentUser,
-  bodyshop,
-  job,
-  vendorid,
-  invoice_number,
-  callbackAfterUpload,
-}) {
-  const [fileList, setFileList] = useState([]);
-
-  const handleDone = (uid) => {
-    setTimeout(() => {
-      setFileList((fileList) => fileList.filter((x) => x.uid !== uid));
-    }, 2000);
-  };
-
-  return (
-    <Upload.Dragger
-      multiple={true}
-      fileList={fileList}
-      onChange={(f) => {
-        if (f.event && f.event.percent === 100) handleDone(f.file.uid);
-
-        setFileList(f.fileList);
-      }}
-      customRequest={(ev) =>
-        handleUpload({
-          ev,
-          context: {
-            jobid: job.id,
-            vendorid,
-            invoice_number,
-            callback: callbackAfterUpload,
-          },
-        })
-      }
-      accept="audio/*, video/*, image/*, .pdf, .doc, .docx, .xls, .xlsx"
-    >
-      {children || (
-        <>
-          <p className="ant-upload-drag-icon">
-            <UploadOutlined />
-          </p>
-          <p className="ant-upload-text">
-            Click or drag files to this area to upload.
-          </p>
-        </>
-      )}
-    </Upload.Dragger>
-  );
-}
-export default connect(mapStateToProps, null)(DocumentsLocalUploadComponent);

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

@@ -1,65 +0,0 @@
-import cleanAxios from "../../utils/CleanAxios";
-import { store } from "../../redux/store";
-import { addMediaForJob } from "../../redux/media/media.actions";
-import normalizeUrl from "normalize-url";
-
-export const handleUpload = async ({ ev, context }) => {
-  const { onError, onSuccess, onProgress, file } = ev;
-  const { jobid, invoice_number, vendorid, callbackAfterUpload } = context;
-
-  var options = {
-    headers: { "X-Requested-With": "XMLHttpRequest" },
-    onUploadProgress: (e) => {
-      if (!!onProgress) onProgress({ percent: (e.loaded / e.total) * 100 });
-    },
-  };
-
-  const formData = new FormData();
-
-  formData.append("jobid", jobid);
-  if (invoice_number) {
-    formData.append("invoice_number", invoice_number);
-    formData.append("vendorid", vendorid);
-  }
-  formData.append("file", file);
-  const bodyshop = store.getState().user.bodyshop;
-
-  const imexMediaServerResponse = await cleanAxios.post(
-    normalizeUrl(
-      `${bodyshop.localmediaserverhttp}/${
-        invoice_number ? "bills" : "jobs"
-      }/upload`
-    ),
-    formData,
-    {
-      ...options,
-    }
-  );
-
-  if (imexMediaServerResponse.status !== 200) {
-    if (!!onError) {
-      onError(imexMediaServerResponse.statusText);
-    }
-  } else {
-    onSuccess && onSuccess(file);
-    store.dispatch(
-      addMediaForJob({
-        jobid,
-        media: imexMediaServerResponse.data.map((d) => {
-          return {
-            ...d,
-            selected: false,
-            src: normalizeUrl(`${bodyshop.localmediaserverhttp}/${d.src}`),
-            thumbnail: normalizeUrl(
-              `${bodyshop.localmediaserverhttp}/${d.thumbnail}`
-            ),
-          };
-        }),
-      })
-    );
-  }
-
-  if (callbackAfterUpload) {
-    callbackAfterUpload();
-  }
-};

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

@@ -9,7 +9,6 @@ import {
   Space,
   Menu,
   Dropdown,
-  Button,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -17,17 +16,9 @@ import EmailDocumentsComponent from "../email-documents/email-documents.componen
 import _ from "lodash";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import {
-  selectBodyshop,
-  selectCurrentUser,
-} from "../../redux/user/user.selectors";
-import { CreateExplorerLinkForJob } from "../../utils/localmedia";
-import { selectEmailConfig } from "../../redux/email/email.selectors";
-
+import { selectBodyshop } from "../../redux/user/user.selectors";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
-  currentUser: selectCurrentUser,
-  emailConfig: selectEmailConfig,
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -37,22 +28,11 @@ export default connect(
   mapDispatchToProps
 )(EmailOverlayComponent);
 
-export function EmailOverlayComponent({
-  emailConfig,
-  form,
-  selectedMediaState,
-  bodyshop,
-  currentUser,
-}) {
+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"),
-        ...(typeof email === "string" ? [email] : email),
-      ]),
-    });
+    form.setFieldsValue({ to: _.uniq([...form.getFieldValue("to"), email]) });
   };
 
   const menu = (
@@ -65,38 +45,12 @@ export function EmailOverlayComponent({
               {`${e.first_name} ${e.last_name}`}
             </Menu.Item>
           ))}
-        {bodyshop.md_to_emails.map((e, idx) => (
-          <Menu.Item value={e.emails} key={idx + "group"}>
-            {e.label}
-          </Menu.Item>
-        ))}
       </Menu>
     </div>
   );
 
   return (
     <div>
-      <Form.Item
-        label={t("emails.fields.from")}
-        name="from"
-        rules={[
-          {
-            required: true,
-            //message: t("general.validation.required"),
-          },
-        ]}
-      >
-        <Select>
-          <Select.Option key={currentUser.email}>
-            {currentUser.email}
-          </Select.Option>
-          <Select.Option key={bodyshop.email}>{bodyshop.email}</Select.Option>
-          {bodyshop.md_from_emails &&
-            bodyshop.md_from_emails.map((e) => (
-              <Select.Option key={e}>{e}</Select.Option>
-            ))}
-        </Select>
-      </Form.Item>
       <Form.Item
         label={
           <Space>
@@ -158,17 +112,10 @@ export function EmailOverlayComponent({
       </Form.Item>
 
       <Tabs>
-        {!bodyshop.uselocalmediaserver && (
-          <Tabs.TabPane tab={t("emails.labels.documents")} key="documents">
-            <EmailDocumentsComponent selectedMediaState={selectedMediaState} />
-          </Tabs.TabPane>
-        )}
+        <Tabs.TabPane tab={t("emails.labels.documents")} key="documents">
+          <EmailDocumentsComponent selectedMediaState={selectedMediaState} />
+        </Tabs.TabPane>
         <Tabs.TabPane tab={t("emails.labels.attachments")} key="attachments">
-          {bodyshop.uselocalmediaserver && emailConfig.jobid && (
-            <a href={CreateExplorerLinkForJob({ jobid: emailConfig.jobid })}>
-              <Button>{t("documents.labels.openinexplorer")}</Button>
-            </a>
-          )}
           <Form.Item
             name="fileList"
             valuePropName="fileList"

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

@@ -56,9 +56,13 @@ export function EmailOverlayContainer({
         : bodyshop.shopname,
       address: EmailSettings.fromAddress,
     },
+    ReplyTo: {
+      Email: currentUser.validemail ? currentUser.email : bodyshop.email,
+      Name: currentUser.displayName,
+    },
   };
 
-  const handleFinish = async (allValues) => {
+  const handleFinish = async (values) => {
     logImEXEvent("email_send_from_modal");
 
     //const attachments = [];
@@ -73,15 +77,10 @@ export function EmailOverlayContainer({
     //     attachments.push(t);
     //   });
 
-    const { from, ...values } = allValues;
     setSending(true);
     try {
       await axios.post("/sendemail", {
         ...defaultEmailFrom,
-        ReplyTo: {
-          Email: from,
-          Name: currentUser.displayName,
-        },
         ...values,
         html: rawHtml,
         attachments: [
@@ -139,7 +138,6 @@ export function EmailOverlayContainer({
     }
 
     form.setFieldsValue({
-      from: currentUser.validemail ? currentUser.email : bodyshop.email,
       ...emailConfig.messageOptions,
       cc:
         emailConfig.messageOptions.cc &&

client/src/components/export-logs-count-display/export-logs-count-display.component.jsx

@@ -1,25 +0,0 @@
-import React from "react";
-import { WarningOutlined } from "@ant-design/icons";
-import { Space, Tooltip } from "antd";
-import { useTranslation } from "react-i18next";
-
-const style = {
-  fontWeight: "bold",
-  color: "green",
-};
-
-export default function ExportLogsCountDisplay({ logs }) {
-  const success = logs.filter((e) => e.successful).length;
-  const attempts = logs.length;
-  const { t } = useTranslation();
-  return (
-    <Space style={success > 0 ? style : {}}>
-      {`${success}/${attempts}`}
-      {success > 0 && (
-        <Tooltip title={t("exportlogs.labels.priorsuccesfulexport")}>
-          <WarningOutlined />
-        </Tooltip>
-      )}
-    </Space>
-  );
-}

client/src/components/form-date-time-picker/form-date-time-picker.component.jsx

@@ -30,16 +30,16 @@ const DateTimePicker = (
       />
 
       <TimePicker
-      value={value ? moment(value) : null}
-      {...(onlyFuture && {
-        disabledDate: (d) => moment().isAfter(d),
-      })}
-      onChange={onChange}
-      showSecond={false}
-      minuteStep={15}
-      onBlur={onBlur}
-      format="hh:mm a"
-      {...restProps}
+        {...restProps}
+        value={value ? moment(value) : null}
+        {...(onlyFuture && {
+          disabledDate: (d) => moment().isAfter(d),
+        })}
+        onChange={onChange}
+        showSecond={false}
+        minuteStep={15}
+        onBlur={onBlur}
+        format="hh:mm a"
       />
     </div>
   );

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

@@ -1,21 +1,17 @@
 import { useLazyQuery } from "@apollo/client";
-import { LoadingOutlined } from "@ant-design/icons";
 import { AutoComplete, Divider, Space } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { Link, useHistory } from "react-router-dom";
+import { Link } from "react-router-dom";
 import { GLOBAL_SEARCH_QUERY } from "../../graphql/search.queries";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import AlertComponent from "../alert/alert.component";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
+
 export default function GlobalSearch() {
   const { t } = useTranslation();
-  const history = useHistory();
-  const [callSearch, { loading, error, data }] =
-    useLazyQuery(GLOBAL_SEARCH_QUERY);
+
+  const [callSearch, { error, data }] = useLazyQuery(GLOBAL_SEARCH_QUERY);
 
   const executeSearch = (v) => {
     if (v && v.variables.search && v.variables.search !== "") callSearch(v);
@@ -43,9 +39,9 @@ export default function GlobalSearch() {
                   <Space size="small" split={<Divider type="vertical" />}>
                     <strong>{job.ro_number || t("general.labels.na")}</strong>
                     <span>{`${job.status || ""}`}</span>
-                    <span>
-                      <OwnerNameDisplay ownerObject={job} />
-                    </span>
+                    <span>{`${job.ownr_fn || ""} ${job.ownr_ln || ""} ${
+                      job.ownr_co_nm || ""
+                    }`}</span>
                     <span>{`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${
                       job.v_model_desc || ""
                     }`}</span>
@@ -61,13 +57,15 @@ export default function GlobalSearch() {
           options: data.search_owners.map((owner) => {
             return {
               key: owner.id,
-              value: OwnerNameDisplayFunction(owner),
+              value: `${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${
+                owner.ownr_co_nm || ""
+              }`,
               label: (
                 <Link to={`/manage/owners/${owner.id}`}>
                   <Space size="small" split={<Divider type="vertical" />} wrap>
-                    <span>
-                      <OwnerNameDisplay ownerObject={owner} />
-                    </span>
+                    <span>{`${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${
+                      owner.ownr_co_nm || ""
+                    }`}</span>
                     <PhoneNumberFormatter>
                       {owner.ownr_ph1}
                     </PhoneNumberFormatter>
@@ -173,13 +171,8 @@ export default function GlobalSearch() {
     <AutoComplete
       options={options}
       onSearch={handleSearch}
-      suffixIcon={loading && <LoadingOutlined spin />}
-      defaultActiveFirstOption
       placeholder={t("general.labels.globalsearch")}
       allowClear
-      onSelect={(val, opt) => {
-        history.push(opt.label.props.to);
-      }}
     ></AutoComplete>
   );
 }

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

@@ -3,7 +3,6 @@ import Icon, {
   BarChartOutlined,
   CarFilled,
   ClockCircleFilled,
-  CheckCircleOutlined,
   DashboardFilled,
   DollarCircleFilled,
   ExportOutlined,
@@ -109,9 +108,6 @@ function Header({
           <Menu.Item key="activejobs" icon={<FileFilled />}>
             <Link to="/manage/jobs">{t("menus.header.activejobs")}</Link>
           </Menu.Item>
-          <Menu.Item key="readyjobs" icon={<CheckCircleOutlined />}>
-            <Link to="/manage/jobs/ready">{t("menus.header.readyjobs")}</Link>
-          </Menu.Item>
           <Menu.Item key="parts-queue" icon={<ToolFilled />}>
             <Link to="/manage/partsqueue">{t("menus.header.parts-queue")}</Link>
           </Menu.Item>

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

@@ -49,11 +49,11 @@ export function Jobd3RdPartyModal({ bodyshop, jobId }) {
 
     GenerateDocument(
       {
-        name: TemplateList("job_special").special_thirdpartypayer.key,
+        name: TemplateList("job_special").thirdpartypayer.key,
         variables: { id: jobId },
         context: restVals,
       },
-      { subject: TemplateList("job_special").special_thirdpartypayer.subject },
+      { subject: TemplateList("job_special").thirdpartypayer.subject },
       sendtype
     );
   };

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

@@ -31,7 +31,6 @@ import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -74,9 +73,9 @@ export function ScheduleEventComponent({
         </Space>
       ) : (
         <Space>
-          <strong>
-            <OwnerNameDisplay ownerObject={event.job} />
-          </strong>
+          <strong>{`${(event.job && event.job.ownr_fn) || ""} ${
+            (event.job && event.job.ownr_ln) || ""
+          }`}</strong>
           <span style={{ margin: 4 }}>
             {`${(event.job && event.job.v_model_yr) || ""} ${
               (event.job && event.job.v_make_desc) || ""
@@ -257,9 +256,9 @@ export function ScheduleEventComponent({
       <Space>
         {event.note && <AlertFilled className="production-alert" />}
         <strong>{`${event.job.ro_number || t("general.labels.na")}`}</strong>
-        <span>
-          <OwnerNameDisplay ownerObject={event.job} />
-        </span>
+        <span>{`${(event.job && event.job.ownr_fn) || ""} ${
+          (event.job && event.job.ownr_ln) || ""
+        } ${(event.job && event.job.ownr_co_nm) || ""}`}</span>
       </Space>
       <Space>
         <span>

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

@@ -26,8 +26,6 @@ export default function JobBillsTotalComponent({
   let billCms = Dinero();
   let lbrAdjustments = Dinero();
   let totalReturns = Dinero();
-  let totalReturnsMarkedNotReceived = Dinero();
-  let totalReturnsMarkedReceived = Dinero();
 
   partsOrders.forEach((p) =>
     p.parts_order_lines.forEach((pol) => {
@@ -37,24 +35,6 @@ export default function JobBillsTotalComponent({
             amount: Math.round((pol.act_price || 0) * 100),
           }).multiply(pol.quantity)
         );
-
-        if (pol.cm_received === null) {
-          return; // Skip this calculation for bills posted prior to the CNR change.
-        } else {
-          if (pol.cm_received === false) {
-            totalReturnsMarkedNotReceived = totalReturnsMarkedNotReceived.add(
-              Dinero({
-                amount: Math.round((pol.act_price || 0) * 100),
-              }).multiply(pol.quantity)
-            );
-          } else {
-            totalReturnsMarkedReceived = totalReturnsMarkedReceived.add(
-              Dinero({
-                amount: Math.round((pol.act_price || 0) * 100),
-              }).multiply(pol.quantity)
-            );
-          }
-        }
       }
     })
   );
@@ -84,16 +64,16 @@ export default function JobBillsTotalComponent({
     })
   );
 
-  const totalPartsSublet = Dinero(totals.parts.parts.total)
-    .add(Dinero(totals.parts.sublets.total))
-    .add(Dinero(totals.additional.towing));
+  const totalPartsSublet = Dinero(totals.parts.parts.total).add(
+    Dinero(totals.parts.sublets.total)
+  );
 
   const discrepancy = totalPartsSublet.subtract(billTotals);
 
   const discrepWithLbrAdj = discrepancy.add(lbrAdjustments);
 
   const discrepWithCms = discrepWithLbrAdj.add(totalReturns);
-  const calculatedCreditsNotReceived = totalReturns.subtract(billCms); //billCms is tracked as a negative number.
+  const creditsNotReceived = totalReturns.subtract(billCms); //billCms is tracked as a negative number.
 
   return (
     <Row gutter={16}>
@@ -233,32 +213,6 @@ export default function JobBillsTotalComponent({
                 value={totalReturns.toFormat()}
               />
             </Tooltip>
-            <Tooltip
-              title={
-                <div
-                  dangerouslySetInnerHTML={{
-                    __html: t(
-                      "jobs.labels.plitooltips.calculatedcreditsnotreceived"
-                    ),
-                  }}
-                />
-              }
-            >
-              <Statistic
-                title={t("bills.labels.calculatedcreditsnotreceived")}
-                valueStyle={{
-                  color:
-                    calculatedCreditsNotReceived.getAmount() <= 0
-                      ? "green"
-                      : "red",
-                }}
-                value={
-                  calculatedCreditsNotReceived.getAmount() >= 0
-                    ? calculatedCreditsNotReceived.toFormat()
-                    : Dinero().toFormat()
-                }
-              />
-            </Tooltip>
             <Tooltip
               title={
                 <div
@@ -271,14 +225,11 @@ export default function JobBillsTotalComponent({
               <Statistic
                 title={t("bills.labels.creditsnotreceived")}
                 valueStyle={{
-                  color:
-                    totalReturnsMarkedNotReceived.getAmount() <= 0
-                      ? "green"
-                      : "red",
+                  color: creditsNotReceived.getAmount() <= 0 ? "green" : "red",
                 }}
                 value={
-                  totalReturnsMarkedNotReceived.getAmount() >= 0
-                    ? totalReturnsMarkedNotReceived.toFormat()
+                  creditsNotReceived.getAmount() >= 0
+                    ? creditsNotReceived.toFormat()
                     : Dinero().toFormat()
                 }
               />

client/src/components/job-costing-statistics/job-costing-statistics.component.jsx

@@ -16,10 +16,6 @@ export default function JobCostingStatistics({ summaryData }) {
           value={Dinero(summaryData.totalPartsSales).toFormat()}
           title={t("jobs.labels.sale_parts")}
         />
-        <Statistic
-          value={Dinero(summaryData.totalSubletSales).toFormat()}
-          title={t("jobs.labels.sale_sublet")}
-        />
         <Statistic
           value={Dinero(summaryData.totalAdditionalSales).toFormat()}
           title={t("jobs.labels.sale_additional")}
@@ -36,10 +32,6 @@ export default function JobCostingStatistics({ summaryData }) {
           value={Dinero(summaryData.totalPartsCost).toFormat()}
           title={t("jobs.labels.cost_parts")}
         />
-        <Statistic
-          value={Dinero(summaryData.totalSubletCost).toFormat()}
-          title={t("jobs.labels.cost_sublet")}
-        />
         <Statistic
           value={Dinero(summaryData.totalAdditionalCost).toFormat()}
           title={t("jobs.labels.cost_Additional")}

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

@@ -6,10 +6,8 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useHistory, useLocation } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
 import { QUERY_JOB_CARD_DETAILS } from "../../graphql/jobs.queries";
 import { setModalContext } from "../../redux/modals/modals.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import JobSyncButton from "../job-sync-button/job-sync-button.component";
 import JobsDetailHeader from "../jobs-detail-header/jobs-detail-header.component";
@@ -22,10 +20,6 @@ import JobDetailCardsNotesComponent from "./job-detail-cards.notes.component";
 import JobDetailCardsPartsComponent from "./job-detail-cards.parts.component";
 import JobDetailCardsTotalsComponent from "./job-detail-cards.totals.component";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-});
-
 const mapDispatchToProps = (dispatch) => ({
   setPrintCenterContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "printCenter" })),
@@ -37,7 +31,7 @@ const span = {
   lg: { span: 8 },
 };
 
-export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
+export function JobDetailCards({ setPrintCenterContext }) {
   const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
     .filter((screen) => !!screen[1])
     .slice(-1)[0];
@@ -149,14 +143,12 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
                 data={data ? data.jobs_by_pk : null}
               />
             </Col>
-            {!bodyshop.uselocalmediaserver && (
-              <Col {...span}>
-                <JobDetailCardsDocumentsComponent
-                  loading={loading}
-                  data={data ? data.jobs_by_pk : null}
-                />
-              </Col>
-            )}
+            <Col {...span}>
+              <JobDetailCardsDocumentsComponent
+                loading={loading}
+                data={data ? data.jobs_by_pk : null}
+              />
+            </Col>
             <Col {...span}>
               <JobDetailCardsDamageComponent
                 loading={loading}
@@ -169,4 +161,4 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
     </Drawer>
   );
 }
-export default connect(mapStateToProps, mapDispatchToProps)(JobDetailCards);
+export default connect(null, mapDispatchToProps)(JobDetailCards);

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

@@ -1,54 +0,0 @@
-import { useQuery } from "@apollo/client";
-import { Row, Col, Timeline, Typography, Space, Divider, Skeleton } from "antd";
-import React from "react";
-import { GET_JOB_LINE_ORDERS } from "../../graphql/jobs.queries";
-import { useTranslation } from "react-i18next";
-import AlertComponent from "../alert/alert.component";
-import { DateFormatter } from "../../utils/DateFormatter";
-import { Link } from "react-router-dom";
-
-export default function JobLinesExpander({ jobline, jobid }) {
-  const { t } = useTranslation();
-  const { loading, error, data } = useQuery(GET_JOB_LINE_ORDERS, {
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-    variables: {
-      joblineid: jobline.id,
-    },
-  });
-
-  if (loading) return <Skeleton />;
-  if (error) return <AlertComponent message={error.message} type="error" />;
-
-  return (
-    <Row>
-      <Col md={24} lg={12}>
-        <Typography.Title level={4}>
-          {t("parts_orders.labels.parts_orders")}
-        </Typography.Title>
-        <Timeline>
-          {data.parts_order_lines.length > 0 ? (
-            data.parts_order_lines.map((line) => (
-              <Timeline.Item key={line.id}>
-                <Space split={<Divider type="vertical" />} wrap>
-                  <Link
-                    to={`/manage/jobs/${jobid}?partsorderid=${line.parts_order.id}`}
-                  >
-                    {line.parts_order.order_number}
-                  </Link>
-                  <DateFormatter>{line.parts_order.order_date}</DateFormatter>
-                  {line.parts_order.vendor.name}
-                </Space>
-              </Timeline.Item>
-            ))
-          ) : (
-            <Timeline.Item>
-              {t("parts_orders.labels.notyetordered")}
-            </Timeline.Item>
-          )}
-        </Timeline>
-      </Col>
-      <Col md={24} lg={12}></Col>
-    </Row>
-  );
-}

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

@@ -4,9 +4,6 @@ import {
   SyncOutlined,
   WarningFilled,
   EditFilled,
-  PlusCircleTwoTone,
-  MinusCircleTwoTone,
-  HomeOutlined,
 } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
 import {
@@ -41,12 +38,9 @@ import JobLinesBillRefernece from "../job-lines-bill-reference/job-lines-bill-re
 import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
 import _ from "lodash";
 import JobCreateIOU from "../job-create-iou/job-create-iou.component";
-import JobLinesExpander from "./job-lines-expander.component";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import moment from "moment";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
+  //currentUser: selectCurrentUser
   jobRO: selectJobReadOnly,
   technician: selectTechnician,
 });
@@ -56,12 +50,9 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setModalContext({ context: context, modal: "jobLineEdit" })),
   setPartsOrderContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "partsOrder" })),
-  setBillEnterContext: (context) =>
-    dispatch(setModalContext({ context: context, modal: "billEnter" })),
 });
 
 export function JobLinesComponent({
-  bodyshop,
   jobRO,
   technician,
   setPartsOrderContext,
@@ -72,7 +63,6 @@ export function JobLinesComponent({
   job,
   setJobLineEditContext,
   form,
-  setBillEnterContext,
 }) {
   const [deleteJobLine] = useMutation(DELETE_JOB_LINE_BY_PK);
 
@@ -82,9 +72,6 @@ export function JobLinesComponent({
     filteredInfo: {},
   });
   const { t } = useTranslation();
-  const jobIsPrivate = bodyshop.md_ins_cos.find(
-    (c) => c.name === job.ins_co_nm
-  )?.private;
 
   const columns = [
     {
@@ -296,7 +283,7 @@ export function JobLinesComponent({
       key: "actions",
       render: (text, record) => (
         <div>
-          {(record.manual_line || jobIsPrivate) && (
+          {record.manual_line && (
             <Space>
               <Button
                 disabled={jobRO}
@@ -391,62 +378,6 @@ export function JobLinesComponent({
                 </Space>
               </Tag>
             )}
-            <Button
-              disabled={
-                (job && !job.converted) ||
-                (selectedLines.length > 0 ? false : true) ||
-                jobRO ||
-                technician
-              }
-              onClick={() => {
-                // setPartsOrderContext({
-                //   actions: { refetch: refetch },
-                //   context: {
-                //     jobId: job.id,
-                //     job: job,
-                //     linesToOrder: selectedLines,
-                //   },
-                // });
-
-                setBillEnterContext({
-                  actions: { refetch: refetch },
-                  context: {
-                    disableInvNumber: true,
-                    job: { id: job.id },
-                    bill: {
-                      vendorid: bodyshop.inhousevendorid,
-                      invoice_number: "ih",
-                      isinhouse: true,
-                      date: new moment(),
-                      total: 0,
-                      billlines: selectedLines.map((p) => {
-                        return {
-                          joblineid: p.id,
-                          actual_price: p.act_price,
-                          actual_cost: 0, //p.act_price,
-                          line_desc: p.line_desc,
-                          line_remarks: p.line_remarks,
-                          part_type: p.part_type,
-                          quantity: p.quantity || 1,
-                          applicable_taxes: {
-                            local: false,
-                            state: false,
-                            federal: false,
-                          },
-                        };
-                      }),
-                    },
-                  },
-                });
-
-                //Clear out the selected lines. IO-785
-                setSelectedLines([]);
-              }}
-            >
-              <HomeOutlined />
-              {t("parts.actions.orderinhouse")}
-              {selectedLines.length > 0 && ` (${selectedLines.length})`}
-            </Button>
             <Button
               disabled={
                 (job && !job.converted) ||
@@ -518,19 +449,6 @@ export function JobLinesComponent({
         scroll={{
           x: true,
         }}
-        expandable={{
-          expandedRowRender: (record) => (
-            <JobLinesExpander jobline={record} jobid={job.id} />
-          ),
-          rowExpandable: (record) => true,
-          //expandRowByClick: true,
-          expandIcon: ({ expanded, onExpand, record }) =>
-            expanded ? (
-              <MinusCircleTwoTone onClick={(e) => onExpand(record, e)} />
-            ) : (
-              <PlusCircleTwoTone onClick={(e) => onExpand(record, e)} />
-            ),
-        }}
         onRow={(record, rowIndex) => {
           return {
             onDoubleClick: (event) => {
@@ -544,7 +462,7 @@ export function JobLinesComponent({
           };
         }}
         rowSelection={{
-          selectedRowKeys: selectedLines.map((item) => item && item.id),
+          selectedRowKeys: selectedLines.map((item) => item.id),
           onSelectAll: (selected, selectedRows, changeRows) => {
             setSelectedLines(selectedRows);
           },

client/src/components/job-employee-assignments/job-employee-assignments.component.jsx

@@ -55,17 +55,15 @@ export function JobEmployeeAssignments({
             0
           }
         >
-          {bodyshop.employees
-            .filter((emp) => emp.active)
-            .map((emp) => (
-              <Select.Option
-                value={emp.id}
-                key={emp.id}
-                name={`${emp.first_name} ${emp.last_name}`}
-              >
-                {`${emp.first_name} ${emp.last_name}`}
-              </Select.Option>
-            ))}
+          {bodyshop.employees.map((emp) => (
+            <Select.Option
+              value={emp.id}
+              key={emp.id}
+              name={`${emp.first_name} ${emp.last_name}`}
+            >
+              {`${emp.first_name} ${emp.last_name}`}
+            </Select.Option>
+          ))}
         </Select>
       </Col>
       <Col span={24}>

client/src/components/job-lines-bill-reference/job-lines-bill-reference.component.jsx

@@ -10,7 +10,7 @@ export default function JobLinesBillRefernece({ jobline }) {
       {subletRequired && <WarningFilled />}
       {`${(billLine.actual_price * billLine.quantity).toFixed(2)} (${
         billLine.bill.vendor.name
-      } #${billLine.bill.invoice_number})`}
+      })`}
     </div>
   );
 }

client/src/components/job-lines-preset-button/job-lines-preset-button.component.jsx

@@ -24,7 +24,7 @@ export function JoblinePresetButton({ bodyshop, form }) {
   const menu = (
     <Menu>
       {bodyshop.md_jobline_presets.map((i, idx) => (
-        <Menu.Item onClick={() => handleSelect(i)} key={idx}>
+        <Menu.Item onClick={() => handleSelect(i)} onItemHover key={idx}>
           {i.label}
         </Menu.Item>
       ))}

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

@@ -141,9 +141,7 @@ export function JobLinesUpsertModalComponent({
             rules={[
               ({ getFieldValue }) => ({
                 validator(rule, value) {
-                  if (
-                    !!getFieldValue("mod_lbr_ty") === (!!value || value === 0)
-                  ) {
+                  if (!!getFieldValue("mod_lbr_ty") === !!value) {
                     return Promise.resolve();
                   }
                   return Promise.reject(
@@ -218,7 +216,6 @@ export function JobLinesUpsertModalComponent({
             rules={[
               ({ getFieldValue }) => ({
                 validator(rule, value) {
-                  console.log(value);
                   if (!value || getFieldValue("part_type") !== "PAE") {
                     return Promise.resolve();
                   }
@@ -229,10 +226,7 @@ export function JobLinesUpsertModalComponent({
               }),
               ({ getFieldValue }) => ({
                 validator(rule, value) {
-                  console.log(value, !!value);
-                  if (
-                    !!getFieldValue("part_type") === (!!value || value === 0)
-                  ) {
+                  if (!!getFieldValue("part_type") === !!value) {
                     return Promise.resolve();
                   }
                   return Promise.reject(

client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx

@@ -1,80 +0,0 @@
-import React, { useMemo } from "react";
-import { Row, Col, Tag, Tooltip } from "antd";
-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)(JobPartsQueueCount);
-
-export function JobPartsQueueCount({ bodyshop, parts }) {
-  const partsStatus = useMemo(() => {
-    if (!parts) return null;
-    return parts.reduce(
-      (acc, val) => {
-        if (val.part_type === "PAS" || val.part_type === "PASL") return acc;
-        acc.total = acc.total + val.count;
-        acc[val.status] = acc[val.status] + val.count;
-
-        return acc;
-      },
-      {
-        total: 0,
-        null: 0,
-        [bodyshop.md_order_statuses.default_bo]: 0,
-        [bodyshop.md_order_statuses.default_ordered]: 0,
-        [bodyshop.md_order_statuses.default_received]: 0,
-        [bodyshop.md_order_statuses.default_returned]: 0,
-      }
-    );
-  }, [bodyshop, parts]);
-
-  if (!parts) return null;
-
-  return (
-    <Row>
-      <Col span={4}>
-        <Tooltip title="Total">
-          <Tag>{partsStatus.total}</Tag>
-        </Tooltip>
-      </Col>
-      <Col span={4}>
-        <Tooltip title="No Status">
-          <Tag color="gold">{partsStatus["null"]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col span={4}>
-        <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
-          <Tag color="blue">
-            {partsStatus[bodyshop.md_order_statuses.default_ordered]}
-          </Tag>
-        </Tooltip>
-      </Col>
-      <Col span={4}>
-        <Tooltip title={bodyshop.md_order_statuses.default_received}>
-          <Tag color="green">
-            {partsStatus[bodyshop.md_order_statuses.default_received]}
-          </Tag>
-        </Tooltip>
-      </Col>
-      <Col span={4}>
-        <Tooltip title={bodyshop.md_order_statuses.default_returned}>
-          <Tag color="orange">
-            {partsStatus[bodyshop.md_order_statuses.default_returned]}
-          </Tag>
-        </Tooltip>
-      </Col>
-      <Col span={4}>
-        <Tooltip title={bodyshop.md_order_statuses.default_bo}>
-          <Tag color="red">
-            {partsStatus[bodyshop.md_order_statuses.default_bo]}
-          </Tag>
-        </Tooltip>
-      </Col>
-    </Row>
-  );
-}

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

@@ -22,7 +22,7 @@ export default function JobReconciliationBillsTable({
       dataIndex: "line_desc",
       key: "line_desc",
       ellipsis: true,
-      width: "10rem",
+      minWidth: "65rem",
       sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
       sortOrder:
         state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
@@ -72,11 +72,11 @@ export default function JobReconciliationBillsTable({
         state.sortedInfo.columnKey === "quantity" && state.sortedInfo.order,
     },
     {
-      title: t("bills.fields.is_credit_memo_short"),
+      title: t("bills.fields.is_credit_memo"),
       dataIndex: "is_credit_memo",
       key: "is_credit_memo",
       sorter: (a, b) => a.bill.is_credit_memo - b.bill.is_credit_memo,
-      width: "3rem",
+      width: "8rem",
       sortOrder:
         state.sortedInfo.columnKey === "is_credit_memo" &&
         state.sortedInfo.order,

client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx

@@ -18,11 +18,7 @@ export default function JobReconciliationModalComponent({ job, bills }) {
       .flat() || [];
 
   const jobLineData = job.joblines.filter(
-    (j) =>
-      (j.part_type !== null && j.part_type !== "PAE") ||
-      (j.line_desc &&
-        j.line_desc.toLowerCase().includes("towing") &&
-        j.lbr_op === "OP13")
+    (j) => j.part_type !== null && j.part_type !== "PAE"
   );
 
   return (

client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx

@@ -1,23 +1,24 @@
-import { useMutation } from "@apollo/client";
-import { Checkbox, notification, Space, Spin } from "antd";
+import { Button, notification } from "antd";
 import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
+import { useMutation } from "@apollo/client";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { useTranslation } from "react-i18next";
 
-export default function JobRemoveFromPartsQueue({ checked, jobId }) {
+export default function JobRemoveFromPartsQueue({ jobId, refetch }) {
   const [updateJob] = useMutation(UPDATE_JOB);
   const { t } = useTranslation();
 
   const [loading, setLoading] = useState(false);
 
-  const handleChange = async (e) => {
+  const handleClick = async (e) => {
     setLoading(true);
     const result = await updateJob({
-      variables: { jobId: jobId, job: { queued_for_parts: e.target.checked } },
+      variables: { jobId: jobId, job: { queued_for_parts: false } },
     });
 
     if (!!!result.errors) {
       notification["success"]({ message: t("jobs.successes.save") });
+      if (refetch) refetch();
     } else {
       notification["error"]({
         message: t("jobs.errors.saving", {
@@ -29,9 +30,8 @@ export default function JobRemoveFromPartsQueue({ checked, jobId }) {
   };
 
   return (
-    <Space>
-      <Checkbox checked={checked} onChange={handleChange} />
-      {loading && <Spin size="small" />}
-    </Space>
+    <Button onClick={handleClick} loading={loading}>
+      {t("general.actions.remove")}
+    </Button>
   );
 }

client/src/components/job-search-select/job-search-select.component.jsx

@@ -9,7 +9,6 @@ import {
   SEARCH_JOBS_FOR_AUTOCOMPLETE,
 } from "../../graphql/jobs.queries";
 import AlertComponent from "../alert/alert.component";
-import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 const { Option } = Select;
 
 const JobSearchSelect = (
@@ -87,9 +86,11 @@ const JobSearchSelect = (
                   <span>
                     {`${clm_no && o.clm_no ? `${o.clm_no} | ` : ""}${
                       o.ro_number || t("general.labels.na")
-                    } | ${OwnerNameDisplayFunction(o)} | ${
-                      o.v_model_yr || ""
-                    } ${o.v_make_desc || ""} ${o.v_model_desc || ""}`}
+                    } | ${o.ownr_ln || ""} ${o.ownr_fn || ""} ${
+                      o.ownr_co_nm ? ` ${o.ownr_co_num}` : ""
+                    }| ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${
+                      o.v_model_desc || ""
+                    }`}
                   </span>
                   <Tag>
                     <strong>{o.status}</strong>

client/src/components/job-totals-table/job-totals.table.labor.component.jsx

@@ -1,4 +1,4 @@
-import { Space, Table } from "antd";
+import { Table } from "antd";
 import Dinero from "dinero.js";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -119,18 +119,7 @@ export default function JobTotalsTableLabor({ job }) {
             </Table.Summary.Cell>
           </Table.Summary.Row>
           <Table.Summary.Row>
-            <Table.Summary.Cell>
-              <Space>
-                {t("jobs.labels.mapa")}
-                {job.materials &&
-                  job.materials.mapa &&
-                  job.materials.mapa.cal_maxdlr &&
-                  job.materials.mapa.cal_maxdlr > 0 &&
-                  t("jobs.labels.threshhold", {
-                    amount: job.materials.mapa.cal_maxdlr,
-                  })}
-              </Space>
-            </Table.Summary.Cell>
+            <Table.Summary.Cell>{t("jobs.labels.mapa")}</Table.Summary.Cell>
             <Table.Summary.Cell align="right">
               <CurrencyFormatter>
                 {job.job_totals.rates.mapa.rate}
@@ -144,18 +133,7 @@ export default function JobTotalsTableLabor({ job }) {
             </Table.Summary.Cell>
           </Table.Summary.Row>
           <Table.Summary.Row>
-            <Table.Summary.Cell>
-              <Space wrap>
-                {t("jobs.labels.mash")}
-                {job.materials &&
-                  job.materials.mash &&
-                  job.materials.mash.cal_maxdlr &&
-                  job.materials.mash.cal_maxdlr > 0 &&
-                  t("jobs.labels.threshhold", {
-                    amount: job.materials.mash.cal_maxdlr,
-                  })}
-              </Space>
-            </Table.Summary.Cell>
+            <Table.Summary.Cell>{t("jobs.labels.mash")}</Table.Summary.Cell>
             <Table.Summary.Cell align="right">
               <CurrencyFormatter>
                 {job.job_totals.rates.mash.rate}

client/src/components/job-totals-table/job-totals.table.other.component.jsx

@@ -33,10 +33,10 @@ export default function JobTotalsTableOther({ job }) {
         key: t("jobs.fields.storage_payable"),
         total: job.job_totals.additional.storage,
       },
-      // {
-      //   key: t("jobs.fields.ca_bc_pvrt"),
-      //   total: job.job_totals.additional.pvrt,
-      // },
+      {
+        key: t("jobs.fields.ca_bc_pvrt"),
+        total: job.job_totals.additional.pvrt,
+      },
     ];
   }, [job.job_totals, t]);
 

client/src/components/job-totals-table/job-totals.table.totals.component.jsx

@@ -3,22 +3,7 @@ import Dinero from "dinero.js";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
-  bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(JobTotalsTableTotals);
-
-export function JobTotalsTableTotals({ bodyshop, job }) {
+export default function JobTotalsTableTotals({ job }) {
   const { t } = useTranslation();
 
   const data = useMemo(() => {
@@ -36,14 +21,6 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
         key: t("jobs.labels.state_tax_amt"),
         total: job.job_totals.totals.state_tax,
       },
-      ...(bodyshop.region_config === "CA_BC"
-        ? [
-            {
-              key: t("jobs.fields.ca_bc_pvrt"),
-              total: job.job_totals.additional.pvrt,
-            },
-          ]
-        : []),
       {
         key: t("jobs.labels.federal_tax_amt"),
         total: job.job_totals.totals.federal_tax,
@@ -81,7 +58,7 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
         bold: true,
       },
     ];
-  }, [job.job_totals, t, bodyshop.region_config]);
+  }, [job.job_totals, t]);
 
   const columns = [
     {

client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx

@@ -6,20 +6,17 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminStatus);
 
-export function JobsAdminStatus({ insertAuditTrail, bodyshop, job }) {
+export function JobsAdminStatus({ bodyshop, job }) {
   const { t } = useTranslation();
 
   const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
@@ -29,10 +26,6 @@ export function JobsAdminStatus({ insertAuditTrail, bodyshop, job }) {
     })
       .then((r) => {
         notification["success"]({ message: t("jobs.successes.save") });
-        insertAuditTrail({
-          jobid: job.id,
-          operation: AuditTrailMapping.admin_jobstatuschange(status),
-        });
         // refetch();
       })
       .catch((error) => {

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

@@ -7,27 +7,8 @@ import DateTimePicker from "../form-date-time-picker/form-date-time-picker.compo
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import moment from "moment";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-
-const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
-});
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(JobsAdminDatesChange);
-
-export function JobsAdminDatesChange({ insertAuditTrail, job }) {
+export default function JobsAdminDatesChange({ job }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   const [form] = Form.useForm();
@@ -39,23 +20,6 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
       variables: { jobId: job.id, job: values },
     });
 
-    const changedAuditFields = form.getFieldsValue(
-      true,
-      (meta) => meta && meta.touched
-    );
-
-    Object.keys(changedAuditFields).forEach((key) => {
-      insertAuditTrail({
-        jobid: job.id,
-        operation: AuditTrailMapping.admin_jobfieldchange(
-          key,
-          changedAuditFields[key] instanceof moment
-            ? moment(changedAuditFields[key]).format("MM/DD/YYYY hh:mm a")
-            : changedAuditFields[key]
-        ),
-      });
-    });
-
     if (!!!result.errors) {
       notification["success"]({ message: t("jobs.successes.save") });
     } else {
@@ -94,15 +58,6 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
           >
             <FormDatePicker format="MM/DD/YYYY" />
           </Form.Item>
-          <Form.Item label={t("jobs.fields.date_towin")} name="date_towin">
-            <DateTimePicker />
-          </Form.Item>
-          <Form.Item
-            label={t("jobs.fields.date_rentalresp")}
-            name="date_rentalresp"
-          >
-            <DateTimePicker />
-          </Form.Item>
           <Form.Item label={t("jobs.fields.date_open")} name="date_open">
             <DateTimePicker />
           </Form.Item>

client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx

@@ -8,21 +8,18 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import moment from "moment";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import { insertAuditTrail } from "../../redux/application/application.actions";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(
   mapStateToProps,
   mapDispatchToProps
 )(JobAdminMarkReexport);
 
-export function JobAdminMarkReexport({ insertAuditTrail, bodyshop, job }) {
+export function JobAdminMarkReexport({ bodyshop, job }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   const [markJobForReexport] = useMutation(gql`
@@ -81,10 +78,6 @@ export function JobAdminMarkReexport({ insertAuditTrail, bodyshop, job }) {
 
     if (!result.errors) {
       notification["success"]({ message: t("jobs.successes.save") });
-      insertAuditTrail({
-        jobid: job.id,
-        operation: AuditTrailMapping.admin_jobmarkforreexport(),
-      });
     } else {
       notification["error"]({
         message: t("jobs.errors.saving", {
@@ -103,10 +96,6 @@ export function JobAdminMarkReexport({ insertAuditTrail, bodyshop, job }) {
 
     if (!result.errors) {
       notification["success"]({ message: t("jobs.successes.save") });
-      insertAuditTrail({
-        jobid: job.id,
-        operation: AuditTrailMapping.admin_jobmarkexported(),
-      });
     } else {
       notification["error"]({
         message: t("jobs.errors.saving", {

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

@@ -4,29 +4,21 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminUnvoid);
 
-export function JobsAdminUnvoid({
-  insertAuditTrail,
-  bodyshop,
-  job,
-  currentUser,
-}) {
+export function JobsAdminUnvoid({ bodyshop, job, currentUser }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   const [updateJob] = useMutation(gql`
@@ -92,11 +84,6 @@ mutation UNVOID_JOB($jobId: uuid!) {
 
     if (!result.errors) {
       notification["success"]({ message: t("jobs.successes.save") });
-
-      insertAuditTrail({
-        jobid: job.id,
-        operation: AuditTrailMapping.admin_unvoicejob(),
-      });
     } else {
       notification["error"]({
         message: t("jobs.errors.saving", {

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

@@ -37,6 +37,7 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
   });
 
   //Wahtever is left in the existing lines, are lines that should be removed.
+
   const insertQueries = linesToInsert.reduce((acc, value, idx) => {
     return acc + generateInsertQuery(value, idx, jobId);
   }, "");
@@ -48,13 +49,6 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
   const removeQueries = existingLines.reduce((acc, value, idx) => {
     return acc + generateRemoveQuery(value, idx);
   }, "");
-  console.log(insertQueries, updateQueries, removeQueries);
-
-  if ((insertQueries + updateQueries + removeQueries).trim() === "") {
-    return new Promise((resolve, reject) => {
-      resolve(null);
-    });
-  }
 
   return new Promise((resolve, reject) => {
     resolve(gql`

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

@@ -220,13 +220,12 @@ export function JobsAvailableContainer({
       );
 
       delete supp.joblines;
-      if (suppDelta !== null) {
-        await client.mutate({
-          mutation: gql`
-            ${suppDelta}
-          `,
-        });
-      }
+      await client.mutate({
+        mutation: gql`
+          ${suppDelta}
+        `,
+      });
+
       const updateResult = await updateJob({
         variables: {
           jobId: selectedJob,

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,
@@ -26,7 +27,6 @@ export function JobsCloseExportButton({
   jobId,
   disabled,
   setSelectedJobs,
-  refetch,
 }) {
   const history = useHistory();
   const { t } = useTranslation();
@@ -46,10 +46,13 @@ export function JobsCloseExportButton({
     //Check if it's a QBO Setup.
     let PartnerResponse;
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
-      PartnerResponse = await axios.post(`/qbo/receivables`, {
-        jobIds: [jobId],
-        elgen: true,
-      });
+      PartnerResponse = await axios.post(
+        `/qbo/receivables`,
+        {
+          jobIds: [jobId],
+        },
+        
+      );
     } else {
       //Default is QBD
 
@@ -114,64 +117,58 @@ export function JobsCloseExportButton({
         });
       });
 
-      if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
-        //QBO Logs are handled server side.
-        await insertExportLog({
-          variables: {
-            logs: [
-              {
-                bodyshopid: bodyshop.id,
-                jobid: jobId,
-                successful: false,
-                message: JSON.stringify(
-                  failedTransactions.map((ft) => ft.errorMessage)
-                ),
-                useremail: currentUser.email,
-              },
-            ],
-          },
-        });
-      }
+      await insertExportLog({
+        variables: {
+          logs: [
+            {
+              bodyshopid: bodyshop.id,
+              jobid: jobId,
+              successful: false,
+              message: JSON.stringify(
+                failedTransactions.map((ft) => ft.errorMessage)
+              ),
+              useremail: currentUser.email,
+            },
+          ],
+        },
+      });
     } else {
       //Insert success export log.
-      if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
-        //QBO Logs are handled server side.
-        await insertExportLog({
-          variables: {
-            logs: [
-              {
-                bodyshopid: bodyshop.id,
-                jobid: jobId,
-                successful: true,
-                useremail: currentUser.email,
-              },
-            ],
-          },
-        });
-
-        const jobUpdateResponse = await updateJob({
-          variables: {
-            jobId: jobId,
-            job: {
-              status: bodyshop.md_ro_statuses.default_exported || "Exported*",
-              date_exported: new Date(),
+      await insertExportLog({
+        variables: {
+          logs: [
+            {
+              bodyshopid: bodyshop.id,
+              jobid: jobId,
+              successful: true,
+              useremail: currentUser.email,
             },
-          },
-        });
+          ],
+        },
+      });
 
-        if (!jobUpdateResponse.errors) {
-          notification.open({
-            type: "success",
-            key: "jobsuccessexport",
-            message: t("jobs.successes.exported"),
-          });
-        } else {
-          notification["error"]({
-            message: t("jobs.errors.exporting", {
-              error: JSON.stringify(jobUpdateResponse.error),
-            }),
-          });
-        }
+      const jobUpdateResponse = await updateJob({
+        variables: {
+          jobId: jobId,
+          job: {
+            status: bodyshop.md_ro_statuses.default_exported || "Exported*",
+            date_exported: new Date(),
+          },
+        },
+      });
+
+      if (!jobUpdateResponse.errors) {
+        notification.open({
+          type: "success",
+          key: "jobsuccessexport",
+          message: t("jobs.successes.exported"),
+        });
+      } else {
+        notification["error"]({
+          message: t("jobs.errors.exporting", {
+            error: JSON.stringify(jobUpdateResponse.error),
+          }),
+        });
       }
       if (setSelectedJobs) {
         setSelectedJobs((selectedJobs) => {
@@ -179,7 +176,7 @@ export function JobsCloseExportButton({
         });
       }
     }
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
+
     setLoading(false);
   };
 

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

@@ -18,7 +18,7 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import axios from "axios";
+
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
@@ -53,12 +53,6 @@ export function JobsConvertButton({
       variables: { jobId: job.id, ...values },
     });
 
-    if (values.ca_gst_registrant) {
-      await axios.post("/job/totalsssu", {
-        id: job.id,
-      });
-    }
-
     if (!res.errors) {
       refetch();
       notification["success"]({

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

@@ -146,11 +146,7 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
             </Form.Item>
           </LayoutFormRow>
         </Collapse.Panel>
-        <Collapse.Panel
-          forceRender
-          key="claim"
-          header={t("menus.jobsdetail.claimdetail")}
-        >
+        <Collapse.Panel forceRender key="claim" header={t("menus.jobsdetail.claimdetail")}>
           <LayoutFormRow>
             <Form.Item label={t("jobs.fields.loss_desc")} name="loss_desc">
               <Input />
@@ -197,8 +193,7 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
             </Form.Item>
           </LayoutFormRow>
         </Collapse.Panel>
-        <Collapse.Panel
-          forceRender
+        <Collapse.Panel forceRender
           key="financial"
           header={t("menus.jobsdetail.financials")}
         >
@@ -209,7 +204,7 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
               <CurrencyInput min={0} />
             </Form.Item>
             <Form.Item label={t("jobs.fields.ded_status")} name="ded_status">
-              <Select allowClear>
+              <Select>
                 <Select.Option value="W">
                   {t("jobs.labels.deductible.waived")}
                 </Select.Option>

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

@@ -39,12 +39,6 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
         <Form.Item label={t("jobs.fields.date_open")} name="date_open">
           <DateTimePicker disabled={jobRO} />
         </Form.Item>
-        <Form.Item label={t("jobs.fields.date_towin")} name="date_towin">
-          <DateTimePicker disabled={jobRO} />
-        </Form.Item>
-        <Form.Item label={t("jobs.fields.date_rentalresp")} name="date_rentalresp">
-          <DateTimePicker disabled={jobRO} />
-        </Form.Item>
       </FormRow>
 
       <FormRow header={t("jobs.forms.scheddates")}>

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

@@ -1,5 +1,6 @@
 import {
   Col,
+  Divider,
   Form,
   Input,
   InputNumber,
@@ -22,8 +23,8 @@ import FormItemPhone, {
 } 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 JobsDetailChangeFileHandler from "../jobs-detail-change-filehandler/jobs-detail-change-filehandler.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,
@@ -219,8 +220,15 @@ 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>

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

@@ -7,7 +7,6 @@ import { connect } from "react-redux";
 import { Link, useHistory } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import { CANCEL_APPOINTMENTS_BY_JOB_ID } from "../../graphql/appointments.queries";
 import { DELETE_JOB, UPDATE_JOB, VOID_JOB } from "../../graphql/jobs.queries";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
@@ -57,7 +56,6 @@ export function JobsDetailHeaderActions({
   const [deleteJob] = useMutation(DELETE_JOB);
   const [updateJob] = useMutation(UPDATE_JOB);
   const [voidJob] = useMutation(VOID_JOB);
-  const [cancelAllAppointments] = useMutation(CANCEL_APPOINTMENTS_BY_JOB_ID);
   const jobInProduction = useMemo(() => {
     return bodyshop.md_ro_statuses.production_statuses.includes(job.status);
   }, [job, bodyshop.md_ro_statuses.production_statuses]);
@@ -123,39 +121,6 @@ export function JobsDetailHeaderActions({
       >
         {t("jobs.actions.schedule")}
       </Menu.Item>
-      <Menu.Item
-        disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
-      >
-        <Popconfirm
-          title={t("general.labels.areyousure")}
-          okText="Yes"
-          cancelText="No"
-          onClick={(e) => e.stopPropagation()}
-          disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
-          onConfirm={async () => {
-            const jobUpdate = await cancelAllAppointments({
-              variables: {
-                jobid: job.id,
-                job: {
-                  date_scheduled: null,
-                  scheduled_in: null,
-                  scheduled_completion: null,
-                  status: bodyshop.md_ro_statuses.default_imported,
-                },
-              },
-            });
-            if (!jobUpdate.errors) {
-              notification["success"]({
-                message: t("appointments.successes.canceled"),
-              });
-              return;
-            }
-          }}
-          getPopupContainer={(trigger) => trigger.parentNode}
-        >
-          {t("menus.jobsactions.cancelallappointments")}
-        </Popconfirm>
-      </Menu.Item>
       <Menu.Item
         disabled={
           !!job.intakechecklist ||
@@ -436,9 +401,6 @@ export function JobsDetailHeaderActions({
                   job: {
                     status: bodyshop.md_ro_statuses.default_void,
                     voided: true,
-                    scheduled_in: null,
-                    scheduled_completion: null,
-                    inproduction: false,
                   },
                   note: [
                     {

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

@@ -22,7 +22,6 @@ import "./jobs-detail-header.styles.scss";
 import JobsRelatedRos from "../jobs-related-ros/jobs-related-ros.component";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
-import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -61,12 +60,6 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
     );
   }, [job.status, bodyshop.md_ro_statuses.post_production_statuses]);
 
-  const vehicleTitle = `${job.v_model_yr || ""} ${job.v_color || ""}
-  ${job.v_make_desc || ""} 
-  ${job.v_model_desc || ""}`.trim();
-
-  const ownerTitle = OwnerNameDisplayFunction(job).trim();
-
   return (
     <Row gutter={[16, 16]} style={{ alignItems: "stretch" }}>
       <Col {...colSpan}>
@@ -159,9 +152,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
           style={{ height: "100%" }}
           title={
             <Link to={disabled ? "#" : `/manage/owners/${job.owner.id}`}>
-              {ownerTitle.length > 0
-                ? ownerTitle
-                : t("owner.labels.noownerinfo")}
+              {`${job.ownr_fn || ""} ${job.ownr_ln || ""} ${
+                job.ownr_co_nm || ""
+              }`}
             </Link>
           }
         >
@@ -195,9 +188,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                     : job.vehicle && `/manage/vehicles/${job.vehicle.id}`
                 }
               >
-                {vehicleTitle.length > 0
-                  ? vehicleTitle
-                  : t("vehicles.labels.novehinfo")}
+                {`${job.v_model_yr || ""} ${job.v_color || ""}
+        ${job.v_make_desc || ""} 
+        ${job.v_model_desc || ""}`}
               </Link>
             ) : (
               <span></span>

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

@@ -88,33 +88,6 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
           </Form.Item>
           <CABCpvrtCalculator form={form} disabled={jobRO} />
         </Space>
-        <Form.Item
-          label={t("jobs.fields.auto_add_ats")}
-          name="auto_add_ats"
-          valuePropName="checked"
-        >
-          <Switch disabled={jobRO} />
-        </Form.Item>
-
-        <Form.Item
-          noStyle
-          shouldUpdate={(prev, cur) => prev.auto_add_ats !== cur.auto_add_ats}
-        >
-          {() => {
-            if (form.getFieldValue("auto_add_ats"))
-              return (
-                <Form.Item
-                  label={t("jobs.fields.rate_ats")}
-                  name="rate_ats"
-                  initialValue={bodyshop.shoprates.rate_atp}
-                >
-                  <CurrencyInput disabled={jobRO} />
-                </Form.Item>
-              );
-
-            return null;
-          }}
-        </Form.Item>
       </FormRow>
       <FormRow>
         <Form.Item
@@ -127,13 +100,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
           label={t("jobs.fields.state_tax_rate")}
           name="state_tax_rate"
         >
-          <InputNumber
-            min={0}
-            max={1}
-            precision={2}
-            disabled={jobRO}
-            autoComplete="new-password"
-          />
+          <InputNumber min={0} max={1} precision={2} disabled={jobRO} autoComplete="new-password"/>
         </Form.Item>
         <Form.Item
           label={t("jobs.fields.local_tax_rate")}

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

@@ -1,5 +1,5 @@
-import { EditFilled, FileExcelFilled, SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Col, Row, Space } from "antd";
+import { FileExcelFilled, EditFilled, SyncOutlined } from "@ant-design/icons";
+import { Card, Col, Row, Space, Button } from "antd";
 import React, { useEffect, useState } from "react";
 import Gallery from "react-grid-gallery";
 import { useTranslation } from "react-i18next";

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx

@@ -1,105 +0,0 @@
-import { SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Space } from "antd";
-import React, { useEffect } from "react";
-import Gallery from "react-grid-gallery";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import {
-  getBillMedia,
-  getJobMedia,
-  toggleMediaSelected,
-} from "../../redux/media/media.actions";
-import { selectAllMedia } from "../../redux/media/media.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { CreateExplorerLinkForJob } from "../../utils/localmedia";
-import DocumentsLocalUploadComponent from "../documents-local-upload/documents-local-upload.component";
-import JobsDocumentsLocalGalleryReassign from "./jobs-documents-local-gallery.reassign.component";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-  allMedia: selectAllMedia,
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  getJobMedia: (id) => dispatch(getJobMedia(id)),
-  getBillMedia: ({ jobid, invoice_number }) => {
-    dispatch(getBillMedia({ jobid, invoice_number }));
-  },
-  toggleMediaSelected: ({ jobid, filename }) =>
-    dispatch(toggleMediaSelected({ jobid, filename })),
-});
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(JobsDocumentsLocalGallery);
-
-export function JobsDocumentsLocalGallery({
-  bodyshop,
-  toggleMediaSelected,
-  getJobMedia,
-  getBillMedia,
-  allMedia,
-  job,
-  invoice_number,
-  vendorid,
-}) {
-  const { t } = useTranslation();
-  useEffect(() => {
-    if (job) {
-      if (invoice_number) {
-        getBillMedia({ jobid: job.id, invoice_number });
-      } else {
-        getJobMedia(job.id);
-      }
-    }
-  }, [job, invoice_number, getJobMedia, getBillMedia]);
-
-  return (
-    <div>
-      <Space wrap>
-        <Button
-          onClick={() => {
-            if (job) {
-              if (invoice_number) {
-                getBillMedia({ jobid: job.id, invoice_number });
-              } else {
-                getJobMedia(job.id);
-              }
-            }
-          }}
-        >
-          <SyncOutlined />
-        </Button>
-        <a href={CreateExplorerLinkForJob({ jobid: job.id })}>
-          <Button>{t("documents.labels.openinexplorer")}</Button>
-        </a>
-        <JobsDocumentsLocalGalleryReassign jobid={job.id} />
-      </Space>
-      <Card>
-        <DocumentsLocalUploadComponent
-          job={job}
-          invoice_number={invoice_number}
-          vendorid={vendorid}
-        />
-      </Card>
-      <Card title={t("jobs.labels.documents-images")}>
-        <Gallery
-          images={(allMedia && allMedia[job.id]) || []}
-          backdropClosesModal={true}
-          onSelectImage={(index, image) => {
-            toggleMediaSelected({ jobid: job.id, filename: image.filename });
-          }}
-          onClickImage={(props) => {
-            window.open(
-              props.target.src,
-              "_blank",
-              "toolbar=0,location=0,menubar=0"
-            );
-          }}
-        />
-      </Card>
-    </div>
-  );
-}

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

@@ -1,92 +0,0 @@
-import { Button, Form, Popover, Space } from "antd";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { getJobMedia } from "../../redux/media/media.actions";
-import { selectAllMedia } from "../../redux/media/media.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import cleanAxios from "../../utils/CleanAxios";
-import JobSearchSelect from "../job-search-select/job-search-select.component";
-
-const mapStateToProps = createStructuredSelector({
-  allMedia: selectAllMedia,
-  bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-  getJobMedia: (id) => dispatch(getJobMedia(id)),
-
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(JobsDocumentsLocalGalleryReassign);
-
-export function JobsDocumentsLocalGalleryReassign({
-  bodyshop,
-  jobid,
-  allMedia,
-  getJobMedia,
-}) {
-  const { t } = useTranslation();
-  const [form] = Form.useForm();
-
-  const [visible, setVisible] = useState(false);
-  const [loading, setLoading] = useState(false);
-
-  const handleFinish = async ({ jobid: newJobid }) => {
-    setLoading(true);
-    const selectedDocuments = allMedia[jobid].filter((m) => m.isSelected);
-
-    await cleanAxios.post(`${bodyshop.localmediaserverhttp}/jobs/move`, {
-      from_jobid: jobid,
-      jobid: newJobid,
-      files: selectedDocuments.map((f) => f.filename),
-    });
-
-    getJobMedia(jobid);
-    setVisible(false);
-    setLoading(false);
-  };
-
-  const popContent = (
-    <div>
-      <Form onFinish={handleFinish} layout="vertical" form={form}>
-        <Form.Item
-          label={t("documents.labels.newjobid")}
-          style={{ width: "20rem" }}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={"jobid"}
-        >
-          <JobSearchSelect />
-        </Form.Item>
-      </Form>
-      <Space>
-        <Button type="primary" onClick={() => form.submit()}>
-          {t("general.actions.submit")}
-        </Button>
-        <Button onClick={() => setVisible(false)}>
-          {t("general.actions.cancel")}
-        </Button>
-      </Space>
-    </div>
-  );
-
-  return (
-    <Popover content={popContent} visible={visible}>
-      <Button
-        //disabled={selectedImages.length < 1}
-        onClick={() => setVisible(true)}
-        loading={loading}
-      >
-        {t("documents.actions.reassign")}
-      </Button>
-    </Popover>
-  );
-}

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

@@ -26,7 +26,6 @@ export function JobsExportAllButton({
   disabled,
   loadingCallback,
   completedCallback,
-  refetch,
 }) {
   const { t } = useTranslation();
   const [updateJob] = useMutation(UPDATE_JOBS);
@@ -40,7 +39,6 @@ export function JobsExportAllButton({
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
       PartnerResponse = await axios.post(`/qbo/receivables`, {
         jobIds: jobIds,
-        elgen: true,
       });
     } else {
       let QbXmlResponse;
@@ -85,7 +83,6 @@ export function JobsExportAllButton({
         return;
       }
     }
-
     console.log("PartnerResponse", PartnerResponse);
     const groupedData = _.groupBy(
       PartnerResponse.data,
@@ -109,70 +106,61 @@ export function JobsExportAllButton({
             });
             //Call is not awaited as it is not critical to finish before proceeding.
           });
-
-          if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
-            //QBO Logs are handled server side.
-            await insertExportLog({
-              variables: {
-                logs: [
-                  {
-                    bodyshopid: bodyshop.id,
-                    jobid: key,
-                    successful: false,
-                    message: JSON.stringify(
-                      failedTransactions.map((ft) => ft.errorMessage)
-                    ),
-                    useremail: currentUser.email,
-                  },
-                ],
-              },
-            });
-          }
-        } else {
-          if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
-            //QBO Logs are handled server side.
-            await insertExportLog({
-              variables: {
-                logs: [
-                  {
-                    bodyshopid: bodyshop.id,
-                    jobid: key,
-                    successful: true,
-                    useremail: currentUser.email,
-                  },
-                ],
-              },
-            });
-
-            const jobUpdateResponse = await updateJob({
-              variables: {
-                jobIds: [key],
-                fields: {
-                  status:
-                    bodyshop.md_ro_statuses.default_exported || "Exported*",
-                  date_exported: new Date(),
+          await insertExportLog({
+            variables: {
+              logs: [
+                {
+                  bodyshopid: bodyshop.id,
+                  jobid: key,
+                  successful: false,
+                  message: JSON.stringify(
+                    failedTransactions.map((ft) => ft.errorMessage)
+                  ),
+                  useremail: currentUser.email,
                 },
-              },
-            });
+              ],
+            },
+          });
+        } else {
+          await insertExportLog({
+            variables: {
+              logs: [
+                {
+                  bodyshopid: bodyshop.id,
+                  jobid: key,
+                  successful: true,
+                  useremail: currentUser.email,
+                },
+              ],
+            },
+          });
 
-            if (!jobUpdateResponse.errors) {
-              notification.open({
-                type: "success",
-                key: "jobsuccessexport",
-                message: t("jobs.successes.exported"),
-              });
-            } else {
-              notification["error"]({
-                message: t("jobs.errors.exporting", {
-                  error: JSON.stringify(jobUpdateResponse.error),
-                }),
-              });
-            }
+          const jobUpdateResponse = await updateJob({
+            variables: {
+              jobIds: [key],
+              fields: {
+                status: bodyshop.md_ro_statuses.default_exported || "Exported*",
+                date_exported: new Date(),
+              },
+            },
+          });
+
+          if (!jobUpdateResponse.errors) {
+            notification.open({
+              type: "success",
+              key: "jobsuccessexport",
+              message: t("jobs.successes.exported"),
+            });
+          } else {
+            notification["error"]({
+              message: t("jobs.errors.exporting", {
+                error: JSON.stringify(jobUpdateResponse.error),
+              }),
+            });
           }
         }
       })
     );
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
 
     if (!!completedCallback) completedCallback([]);
     if (!!loadingCallback) loadingCallback(false);

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

@@ -4,7 +4,6 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import PhoneFormatter from "../../utils/PhoneFormatter";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 export default function JobsFindModalComponent({
   selectedJob,
@@ -44,12 +43,15 @@ export default function JobsFindModalComponent({
       render: (text, record) => {
         return record.owner ? (
           <Link to={"/manage/owners/" + record.owner.id}>
-            <OwnerNameDisplay ownerObject={record} />
+            {`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
+              record.ownr_co_nm || ""
+            }`}
           </Link>
         ) : (
-          <span>
-            <OwnerNameDisplay ownerObject={record} />
-          </span>
+          // t("jobs.errors.noowner")
+          <span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
+            record.ownr_co_nm || ""
+          }`}</span>
         );
       },
     },

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

@@ -10,7 +10,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
@@ -52,12 +52,14 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       render: (text, record) => {
         return record.ownerid ? (
           <Link to={"/manage/owners/" + record.ownerid}>
-            <OwnerNameDisplay ownerObject={record} />
+            {`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
+              record.ownr_co_nm || ""
+            }`}
           </Link>
         ) : (
-          <span>
-            <OwnerNameDisplay ownerObject={record} />
-          </span>
+          <span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
+            record.ownr_co_nm || ""
+          }`}</span>
         );
       },
     },

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

@@ -18,7 +18,6 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort } from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -142,12 +141,14 @@ export function JobsList({ bodyshop }) {
             to={"/manage/owners/" + record.owner.id}
             onClick={(e) => e.stopPropagation()}
           >
-            <OwnerNameDisplay ownerObject={record} />
+            {`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
+              record.ownr_co_nm || ""
+            }`}
           </Link>
         ) : (
-          <span>
-            <OwnerNameDisplay ownerObject={record} />
-          </span>
+          <span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
+            record.ownr_co_nm || ""
+          }`}</span>
         );
       },
     },

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

@@ -115,6 +115,7 @@ export function JobNotesComponent({
             <EditFilled />
           </Button>
           <PrintWrapperComponent
+            emailOnly
             templateObject={{
               name: Templates.individual_job_note.key,
 
@@ -123,7 +124,7 @@ export function JobNotesComponent({
             messageObject={{
               subject: Templates.individual_job_note.subject,
             }}
-            id={jobId}
+            id={record.id}
           />
         </Space>
       ),

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

@@ -1,355 +0,0 @@
-import {
-  ExclamationCircleFilled,
-  PauseCircleOutlined,
-  SyncOutlined,
-} from "@ant-design/icons";
-import { useQuery } from "@apollo/client";
-import { Button, Card, Grid, Input, Space, Table } from "antd";
-import queryString from "query-string";
-import React, { useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { Link, useHistory, useLocation } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
-import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { onlyUnique } from "../../utils/arrayHelper";
-import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort } from "../../utils/sorters";
-import AlertComponent from "../alert/alert.component";
-import ChatOpenButton from "../chat-open-button/chat-open-button.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-});
-
-export function JobsReadyList({ bodyshop }) {
-  const searchParams = queryString.parse(useLocation().search);
-  const { selected } = searchParams;
-  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
-    .filter((screen) => !!screen[1])
-    .slice(-1)[0];
-
-  const readyStatuses = useMemo(() => {
-    if (bodyshop.md_ro_statuses.ready_statuses)
-      return bodyshop.md_ro_statuses.ready_statuses;
-
-    return bodyshop.md_ro_statuses.post_production_statuses.filter(
-      (s) =>
-        s !== bodyshop.md_ro_statuses.default_invoiced &&
-        s !== bodyshop.md_ro_statuses.default_exported
-    );
-  }, [bodyshop.md_ro_statuses]);
-
-  const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
-    variables: {
-      statuses: readyStatuses,
-    },
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-  });
-
-  const [state, setState] = useState({
-    sortedInfo: {},
-    filteredInfo: { text: "" },
-  });
-
-  const { t } = useTranslation();
-  const history = useHistory();
-  const [searchText, setSearchText] = useState("");
-
-  if (error) return <AlertComponent message={error.message} type="error" />;
-
-  const jobs = data
-    ? searchText === ""
-      ? data.jobs
-      : data.jobs.filter(
-          (j) =>
-            (j.ro_number || "")
-              .toString()
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.ownr_co_nm || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.comments || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.ownr_fn || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.ownr_ln || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.clm_no || "").toLowerCase().includes(searchText.toLowerCase()) ||
-            (j.plate_no || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.v_model_desc || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.v_make_desc || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase())
-        )
-    : [];
-
-  const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
-  };
-
-  const handleOnRowClick = (record) => {
-    if (record) {
-      if (record.id) {
-        history.push({
-          search: queryString.stringify({
-            ...searchParams,
-            selected: record.id,
-          }),
-        });
-      }
-    }
-  };
-
-  const columns = [
-    {
-      title: t("jobs.fields.ro_number"),
-      dataIndex: "ro_number",
-      key: "ro_number",
-      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
-      sortOrder:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
-
-      render: (text, record) => (
-        <Link
-          to={"/manage/jobs/" + record.id}
-          onClick={(e) => e.stopPropagation()}
-        >
-          <Space>
-            {record.ro_number || t("general.labels.na")}
-            {record.production_vars && record.production_vars.alert ? (
-              <ExclamationCircleFilled className="production-alert" />
-            ) : null}
-            {record.suspended && (
-              <PauseCircleOutlined style={{ color: "orangered" }} />
-            )}
-          </Space>
-        </Link>
-      ),
-    },
-    {
-      title: t("jobs.fields.owner"),
-      dataIndex: "owner",
-      key: "owner",
-      ellipsis: true,
-
-      responsive: ["md"],
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
-      sortOrder:
-        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
-      render: (text, record) => {
-        return record.owner ? (
-          <Link
-            to={"/manage/owners/" + record.owner.id}
-            onClick={(e) => e.stopPropagation()}
-          >
-            <OwnerNameDisplay ownerObject={record} />
-          </Link>
-        ) : (
-          <span>
-            <OwnerNameDisplay ownerObject={record} />
-          </span>
-        );
-      },
-    },
-    {
-      title: t("jobs.fields.ownr_ph1"),
-      dataIndex: "ownr_ph1",
-      key: "ownr_ph1",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <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"),
-      dataIndex: "status",
-      key: "status",
-      ellipsis: true,
-
-      sorter: (a, b) => alphaSort(a.status, b.status),
-      sortOrder:
-        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
-      filters:
-        (jobs &&
-          jobs
-            .map((j) => j.status)
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "No Status*",
-                value: [s],
-              };
-            })) ||
-        [],
-      onFilter: (value, record) => value.includes(record.status),
-    },
-
-    {
-      title: t("jobs.fields.vehicle"),
-      dataIndex: "vehicle",
-      key: "vehicle",
-      ellipsis: true,
-      render: (text, record) => {
-        return record.vehicleid ? (
-          <Link
-            to={"/manage/vehicles/" + record.vehicleid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-              record.v_model_desc || ""
-            }`}
-          </Link>
-        ) : (
-          <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-            record.v_model_desc || ""
-          }`}</span>
-        );
-      },
-    },
-    {
-      title: t("vehicles.fields.plate_no"),
-      dataIndex: "plate_no",
-      key: "plate_no",
-      ellipsis: true,
-
-      responsive: ["md"],
-      sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
-      sortOrder:
-        state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
-    },
-    {
-      title: t("jobs.fields.clm_no"),
-      dataIndex: "clm_no",
-      key: "clm_no",
-      ellipsis: true,
-      responsive: ["md"],
-      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"),
-      dataIndex: "ins_co_nm",
-      key: "ins_co_nm",
-      ellipsis: true,
-      responsive: ["md"],
-    },
-    {
-      title: t("jobs.fields.clm_total"),
-      dataIndex: "clm_total",
-      key: "clm_total",
-      responsive: ["md"],
-      ellipsis: true,
-
-      sorter: (a, b) => a.clm_total - b.clm_total,
-      sortOrder:
-        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
-      render: (text, record) => (
-        <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
-      ),
-    },
-    {
-      title: t("jobs.fields.comment"),
-      dataIndex: "comment",
-      key: "comment",
-      ellipsis: true,
-      responsive: ["md"],
-    },
-    // {
-    //   title: t("jobs.fields.owner_owing"),
-    //   dataIndex: "owner_owing",
-    //   key: "owner_owing",
-    //   responsive: ["md"],
-    //   render: (text, record) => (
-    //     <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
-    //   ),
-    // },
-  ];
-
-  const scrollMapper = {
-    xs: true,
-    sm: true,
-    md: true,
-    lg: "100%",
-    xl: "100%",
-    xxl: "100%",
-  };
-
-  return (
-    <Card
-      title={t("titles.bc.jobs-ready")}
-      extra={
-        <Space wrap>
-          <span>({readyStatuses && readyStatuses.join(", ")})</span>
-          <Button onClick={() => refetch()}>
-            <SyncOutlined />
-          </Button>
-          <Input.Search
-            placeholder={t("general.labels.search")}
-            onChange={(e) => {
-              setSearchText(e.target.value);
-            }}
-            value={searchText}
-            enterButton
-          />
-        </Space>
-      }
-    >
-      <Table
-        loading={loading}
-        pagination={{ defaultPageSize: 50 }}
-        columns={columns}
-        rowKey="id"
-        dataSource={jobs}
-        scroll={{
-          x: selectedBreakpoint ? scrollMapper[selectedBreakpoint[0]] : "100%",
-        }}
-        rowSelection={{
-          onSelect: (record) => {
-            handleOnRowClick(record);
-          },
-          selectedRowKeys: [selected],
-          type: "radio",
-        }}
-        onChange={handleTableChange}
-        onRow={(record, rowIndex) => {
-          return {
-            onClick: (event) => {
-              handleOnRowClick(record);
-            },
-          };
-        }}
-      />
-    </Card>
-  );
-}
-
-export default connect(mapStateToProps, null)(JobsReadyList);

client/src/components/notes-preset-button/notes-preset-button.component.jsx

@@ -24,7 +24,7 @@ export function NotesPresetButton({ bodyshop, form }) {
   const menu = (
     <Menu>
       {bodyshop.md_notes_presets.map((i, idx) => (
-        <Menu.Item onClick={() => handleSelect(i)} key={idx}>
+        <Menu.Item onClick={() => handleSelect(i)} onItemHover key={idx}>
           {i.label}
         </Menu.Item>
       ))}

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

@@ -6,7 +6,6 @@ import { QUERY_SEARCH_OWNER_BY_IDX } from "../../graphql/owners.queries";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import OwnerFindModalComponent from "./owner-find-modal.component";
-import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 
 export default function OwnerFindModalContainer({
   loading,
@@ -31,7 +30,9 @@ export default function OwnerFindModalContainer({
 
   useEffect(() => {
     if (modalProps.visible && owner) {
-      const s = OwnerNameDisplayFunction(owner);
+      const s = `${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${
+        owner.ownr_co_nm || ""
+      }`;
 
       setSearchText(s.trim());
       callSearchowners({ variables: { search: s.trim() } });

client/src/components/owner-name-display/owner-name-display.component.jsx

@@ -1,47 +0,0 @@
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { store } from "../../redux/store";
-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)(OwnerNameDisplay);
-
-export function OwnerNameDisplay({ bodyshop, ownerObject }) {
-  const emptyTest =
-    ownerObject.ownr_fn + ownerObject.ownr_ln + ownerObject.ownr_co_nm;
-
-  if (!emptyTest || emptyTest === "null" || emptyTest.trim() === "")
-    return "N/A";
-
-  if (bodyshop.last_name_first)
-    return `${ownerObject.ownr_ln || ""}, ${ownerObject.ownr_fn || ""} ${
-      ownerObject.ownr_co_nm || ""
-    }`.trim();
-
-  return `${ownerObject.ownr_fn || ""} ${ownerObject.ownr_ln || ""} ${
-    ownerObject.ownr_co_nm || ""
-  }`.trim();
-}
-
-export function OwnerNameDisplayFunction(ownerObject) {
-  const emptyTest =
-    ownerObject.ownr_fn + ownerObject.ownr_ln + ownerObject.ownr_co_nm;
-
-  if (!emptyTest || emptyTest === "null" || emptyTest.trim() === "")
-    return "N/A";
-
-  const rdxStore = store.getState();
-
-  if (rdxStore.user.bodyshop.last_name_first)
-    return `${ownerObject.ownr_ln || ""}, ${ownerObject.ownr_fn || ""} ${
-      ownerObject.ownr_co_nm || ""
-    }`.trim();
-
-  return `${ownerObject.ownr_fn || ""} ${ownerObject.ownr_ln || ""} ${
-    ownerObject.ownr_co_nm || ""
-  }`.trim();
-}

client/src/components/owner-search-select/owner-search-select.component.jsx

@@ -8,7 +8,6 @@ import {
   SEARCH_OWNERS_FOR_AUTOCOMPLETE,
 } from "../../graphql/owners.queries";
 import AlertComponent from "../alert/alert.component";
-import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 
 const { Option } = Select;
 
@@ -17,8 +16,10 @@ const OwnerSearchSelect = ({ value, onChange, onBlur, disabled }, ref) => {
     SEARCH_OWNERS_FOR_AUTOCOMPLETE
   );
 
-  const [callIdSearch, { loading: idLoading, error: idError, data: idData }] =
-    useLazyQuery(SEARCH_OWNERS_BY_ID_FOR_AUTOCOMPLETE);
+  const [
+    callIdSearch,
+    { loading: idLoading, error: idError, data: idData },
+  ] = useLazyQuery(SEARCH_OWNERS_BY_ID_FOR_AUTOCOMPLETE);
 
   const executeSearch = (v) => {
     callSearch(v);
@@ -77,7 +78,9 @@ const OwnerSearchSelect = ({ value, onChange, onBlur, disabled }, ref) => {
         {theOptions
           ? theOptions.map((o) => (
               <Option key={o.id} value={o.id}>
-                {`${OwnerNameDisplayFunction(o)} | ${o.ownr_addr1 || ""} `}
+                {`${o.ownr_ln || ""} ${o.ownr_fn || ""} ${
+                  o.ownr_co_nm ? ` ${o.ownr_co_num}` : ""
+                }| ${o.ownr_addr1 || ""} `}
               </Option>
             ))
           : null}

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

@@ -3,10 +3,6 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import PhoneFormatter from "../../utils/PhoneFormatter";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
-
 export default function OwnerTagPopoverComponent({ job }) {
   const { t } = useTranslation();
   const content = (
@@ -14,9 +10,9 @@ export default function OwnerTagPopoverComponent({ job }) {
       <Row>
         <Col span={12}>
           <Descriptions title={t("owners.labels.fromclaim")} column={1}>
-            <Descriptions.Item key="1" label={t("jobs.fields.owner")}>
-              <OwnerNameDisplay ownerObject={job} />
-            </Descriptions.Item>
+            <Descriptions.Item key="1" label={t("jobs.fields.owner")}>{`${
+              job.ownr_fn || ""
+            } ${job.ownr_ln || ""} ${job.ownr_co_nm || ""}`}</Descriptions.Item>
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
               <PhoneFormatter>{job.ownr_ph1 || ""}</PhoneFormatter>
             </Descriptions.Item>
@@ -35,9 +31,11 @@ export default function OwnerTagPopoverComponent({ job }) {
         </Col>
         <Col span={12}>
           <Descriptions title={t("owners.labels.fromowner")} column={1}>
-            <Descriptions.Item key="1" label={t("jobs.fields.owner")}>
-              <OwnerNameDisplay ownerObject={job.owner} />
-            </Descriptions.Item>
+            <Descriptions.Item key="1" label={t("jobs.fields.owner")}>{`${
+              job.owner.ownr_fn || ""
+            } ${job.owner.ownr_ln || ""} ${
+              job.owner.ownr_co_nm || ""
+            }`}</Descriptions.Item>
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
               <PhoneFormatter>{job.owner.ownr_ph1 || ""}</PhoneFormatter>
             </Descriptions.Item>
@@ -70,7 +68,9 @@ export default function OwnerTagPopoverComponent({ job }) {
     <Popover placement="bottom" content={content}>
       <Tag color="cyan">
         <Link to={`/manage/owners/${job.owner.id}`}>
-          {job.owner ? OwnerNameDisplayFunction(job) : t("jobs.errors.noowner")}
+          {job.owner
+            ? `${job.ownr_co_nm || ""}${job.ownr_fn || ""} ${job.ownr_ln || ""}`
+            : t("jobs.errors.noowner")}
         </Link>
       </Tag>
     </Popover>

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

@@ -5,7 +5,6 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import PhoneFormatter from "../../utils/PhoneFormatter";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 export default function OwnersListComponent({
   loading,
@@ -34,7 +33,9 @@ export default function OwnersListComponent({
       key: "name",
       render: (text, record) => (
         <Link to={"/manage/owners/" + record.id}>
-          <OwnerNameDisplay ownerObject={record} />
+          {`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
+            record.ownr_co_nm || ""
+          }`}
         </Link>
       ),
     },

client/src/components/partner-ping/partner-ping.component.jsx

@@ -1,10 +1,13 @@
+import { notification } from "antd";
 import axios from "axios";
 import React, { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setPartnerVersion } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import {store} from '../../redux/store'
+
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
@@ -18,48 +21,45 @@ export default connect(
   mapDispatchToProps
 )(PartnerPingComponent);
 
-export function PartnerPingComponent({ bodyshop,  }) {
+export function PartnerPingComponent({ bodyshop, setPartnerVersion }) {
+  const { t } = useTranslation();
+
   useEffect(() => {
     // Create an scoped async function in the hook
-
+    async function checkPartnerStatus() {
+      if (!bodyshop) return;
+      try {
+        //if (process.env.NODE_ENV === "development") return;
+        const PartnerResponse = await axios.post("http://localhost:1337/ping/");
+        const { appver, qbpath } = PartnerResponse.data;
+        setPartnerVersion(appver);
+        console.log({ appver, qbpath });
+        if (
+          !qbpath &&
+          !(
+            bodyshop &&
+            (bodyshop.cdk_dealerid ||
+              bodyshop.pbs_serialnumber ||
+              bodyshop.accountingconfig.qbo)
+          )
+        ) {
+          notification["error"]({
+            title: "",
+            message: t("general.messages.noacctfilepath"),
+          });
+        }
+      } catch (error) {
+        console.log(error);
+        notification["error"]({
+          title: "",
+          message: t("general.messages.partnernotrunning"),
+        });
+      }
+    }
     // Execute the created function directly
-    checkPartnerStatus(bodyshop);
+    checkPartnerStatus();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [bodyshop]);
 
   return <></>;
 }
-
-export async function checkPartnerStatus(bodyshop) {
-  if (!bodyshop) return;
-  try {
-    //if (process.env.NODE_ENV === "development") return;
-    const PartnerResponse = await axios.post("http://localhost:1337/ping/");
-    // const {
-    //   appver, //qbpath
-    // } = PartnerResponse.data;
-    console.log(PartnerResponse.data)
-    store.dispatch(setPartnerVersion(PartnerResponse.data));
-    // if (
-    //   checkAcctPath &&
-    //   !qbpath &&
-    //   !(
-    //     bodyshop &&
-    //     (bodyshop.cdk_dealerid ||
-    //       bodyshop.pbs_serialnumber ||
-    //       bodyshop.accountingconfig.qbo)
-    //   )
-    // ) {
-    //   notification["error"]({
-    //     title: "",
-    //     message: i18n.t("general.messages.noacctfilepath"),
-    //   });
-    // }
-  } catch (error) {
-    console.log("ImEX Online Partner is not running.", error);
-    // notification["error"]({
-    //   title: "",
-    //   message: i18n.t("general.messages.partnernotrunning"),
-    // });
-  }
-}

client/src/components/parts-order-cm-received/parts-order-cm-received.component.jsx

@@ -1,66 +0,0 @@
-import { useMutation } from "@apollo/client";
-import { Checkbox, notification, Space, Spin } from "antd";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { MUTATION_UPDATE_PO_CM_REECEIVED } from "../../graphql/parts-orders.queries";
-
-export default function PartsOrderCmReceived({
-  checked,
-  orderLineId,
-  partsOrderId,
-}) {
-  const [updateLine] = useMutation(MUTATION_UPDATE_PO_CM_REECEIVED);
-  const { t } = useTranslation();
-
-  const [loading, setLoading] = useState(false);
-
-  const handleChange = async (e) => {
-    setLoading(true);
-    const result = await updateLine({
-      variables: {
-        partsLineId: orderLineId,
-        partsOrder: { cm_received: e.target.checked },
-      },
-      update(cache) {
-        cache.modify({
-          id: cache.identify({
-            id: partsOrderId,
-            __typename: "parts_orders",
-          }),
-
-          fields: {
-            parts_order_lines(ex, { readField }) {
-              console.log(ex);
-              return ex.map((lineref) => {
-                if (orderLineId.id !== readField("id", lineref)) {
-                  lineref.cm_received = e.target.checked;
-                }
-                return lineref;
-              });
-            },
-          },
-        });
-      },
-    });
-
-    if (!!!result.errors) {
-      notification["success"]({
-        message: t("parts_orders.successes.line_updated"),
-      });
-    } else {
-      notification["error"]({
-        message: t("parts_orders.errors.saving", {
-          error: JSON.stringify(result.errors),
-        }),
-      });
-    }
-    setLoading(false);
-  };
-
-  return (
-    <Space>
-      <Checkbox checked={checked} onChange={handleChange} />
-      {loading && <Spin size="small" />}
-    </Space>
-  );
-}

client/src/components/parts-order-delete-line/parts-order-delete-line.component.jsx

@@ -1,47 +0,0 @@
-import React from "react";
-import { Button, Popconfirm } from "antd";
-import { DeleteFilled } from "@ant-design/icons";
-import { useTranslation } from "react-i18next";
-import { DELETE_PARTS_ORDER_LINE } from "../../graphql/parts-orders.queries";
-import { useMutation } from "@apollo/client";
-
-export default function PartsOrderDeleteLine({
-  disabled,
-  partsLineId,
-  partsOrderId,
-}) {
-  const { t } = useTranslation();
-  const [deletePartsOrderLine] = useMutation(DELETE_PARTS_ORDER_LINE);
-  return (
-    <Popconfirm
-      title={t("parts_orders.labels.confirmdelete")}
-      disabled={disabled}
-      onConfirm={async () => {
-        //Delete the parts return.!
-
-        await deletePartsOrderLine({
-          variables: { partsOrderLineId: partsLineId },
-          update(cache) {
-            cache.modify({
-              id: cache.identify({
-                __typename: "parts_orders",
-                id: partsOrderId,
-              }),
-              fields: {
-                parts_order_lines(cached, { readField }) {
-                  return cached.filter((c) => {
-                    return readField("id", c) !== partsLineId;
-                  });
-                },
-              },
-            });
-          },
-        });
-      }}
-    >
-      <Button disabled={disabled}>
-        <DeleteFilled />
-      </Button>
-    </Popconfirm>
-  );
-}

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

@@ -29,8 +29,6 @@ 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 PartsOrderCmReceived from "../parts-order-cm-received/parts-order-cm-received.component";
-import PartsOrderDeleteLine from "../parts-order-delete-line/parts-order-delete-line.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";
 import PrintWrapper from "../print-wrapper/print-wrapper.component";
@@ -79,7 +77,6 @@ export function PartsOrderListTableComponent({
   });
   const search = queryString.parse(useLocation().search);
   const selectedpartsorder = search.partsorderid;
-  const [searchText, setSearchText] = useState("");
 
   const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);
 
@@ -349,23 +346,6 @@ export function PartsOrderListTableComponent({
         dataIndex: "status",
         key: "status",
       },
-
-      ...(selectedPartsOrderRecord && selectedPartsOrderRecord.return
-        ? [
-            {
-              title: t("parts_orders.fields.cm_received"),
-              dataIndex: "cm_received",
-              key: "cm_received",
-              render: (text, record) => (
-                <PartsOrderCmReceived
-                  orderLineId={record.id}
-                  checked={record.cm_received}
-                  partsorderid={selectedPartsOrderRecord.id}
-                />
-              ),
-            },
-          ]
-        : []),
       {
         title: t("parts_orders.fields.backordered_on"),
         dataIndex: "backordered_on",
@@ -392,21 +372,12 @@ export function PartsOrderListTableComponent({
         dataIndex: "actions",
         key: "actions",
         render: (text, record) => (
-          <Space wrap>
-            <PartsOrderDeleteLine
-              disabled={jobRO}
-              partsOrderStatus={record.status}
-              partsLineId={record.id}
-              partsOrderId={selectedpartsorder}
-              jobLineId={record.job_line_id}
-            />
-            <PartsOrderLineBackorderButton
-              disabled={jobRO}
-              partsOrderStatus={record.status}
-              partsLineId={record.id}
-              jobLineId={record.job_line_id}
-            />
-          </Space>
+          <PartsOrderLineBackorderButton
+            disabled={jobRO}
+            partsOrderStatus={record.status}
+            partsLineId={record.id}
+            jobLineId={record.job_line_id}
+          />
         ),
       },
     ];
@@ -432,21 +403,6 @@ export function PartsOrderListTableComponent({
     );
   };
 
-  const filteredPartsOrders = parts_orders
-    ? searchText === ""
-      ? parts_orders
-      : parts_orders.filter(
-          (b) =>
-            (b.order_number || "")
-              .toString()
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (b.vendor.name || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase())
-        )
-    : [];
-
   return (
     <Card
       title={t("parts_orders.labels.parts_orders")}
@@ -457,10 +413,8 @@ export function PartsOrderListTableComponent({
           </Button>
           <Input.Search
             placeholder={t("general.labels.search")}
-            value={searchText}
             onChange={(e) => {
               e.preventDefault();
-              setSearchText(e.target.value);
             }}
           />
         </Space>
@@ -471,6 +425,8 @@ export function PartsOrderListTableComponent({
         placement="right"
         onClose={() => handleOnRowClick(null)}
         visible={selectedpartsorder}
+        //getContainer={false}
+        style={{ position: "absolute" }}
         closable
         width={drawerPercentage}
       >
@@ -484,7 +440,7 @@ export function PartsOrderListTableComponent({
         }}
         columns={columns}
         rowKey="id"
-        dataSource={filteredPartsOrders}
+        dataSource={parts_orders}
         onChange={handleTableChange}
       />
     </Card>

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

@@ -1,4 +1,4 @@
-import { DeleteFilled, WarningFilled, DownOutlined } from "@ant-design/icons";
+import { DeleteFilled, WarningFilled } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import {
   Divider,
@@ -9,8 +9,6 @@ import {
   Space,
   Tag,
   Select,
-  Menu,
-  Dropdown,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -41,7 +39,6 @@ export function PartsOrderModalComponent({
   isReturn,
   preferredMake,
   job,
-  form,
 }) {
   const [sendType, setSendType] = sendTypeState;
   const { OEConnection } = useTreatments(
@@ -55,21 +52,6 @@ export function PartsOrderModalComponent({
     bodyshop.imexshopid
   );
   const { t } = useTranslation();
-  const handleClick = ({ item, key, keyPath }) => {
-    form.setFieldsValue({ comments: item.props.value });
-  };
-
-  const menu = (
-    <div>
-      <Menu onClick={handleClick}>
-        {bodyshop.md_parts_order_comment.map((comment, idx) => (
-          <Menu.Item value={comment.comment} key={idx}>
-            {comment.label}
-          </Menu.Item>
-        ))}
-      </Menu>
-    </div>
-  );
 
   return (
     <div>
@@ -91,7 +73,6 @@ export function PartsOrderModalComponent({
             options={vendorList}
             disabled={isReturn}
             preferredMake={preferredMake}
-            showPhone
           />
         </Form.Item>
         <Form.Item
@@ -261,23 +242,7 @@ export function PartsOrderModalComponent({
           );
         }}
       </Form.List>
-      <Form.Item
-        name="comments"
-        label={
-          <Space>
-            {t("parts_orders.fields.comments")}
-            <Dropdown overlay={menu}>
-              <a
-                className="ant-dropdown-link"
-                href=" #"
-                onClick={(e) => e.preventDefault()}
-              >
-                <DownOutlined />
-              </a>
-            </Dropdown>
-          </Space>
-        }
-      >
+      <Form.Item name="comments" label={t("parts_orders.fields.comments")}>
         <Input.TextArea rows={3} />
       </Form.Item>
       <Radio.Group

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

@@ -196,11 +196,6 @@ export function PartsOrderModalContainer({
         (item) => item.id === values.vendorid
       )[0];
 
-      let vendorEmails =
-        matchingVendor &&
-        matchingVendor.email &&
-        matchingVendor.email.split(RegExp("[;,]"));
-
       GenerateDocument(
         {
           name: isReturn
@@ -211,7 +206,7 @@ export function PartsOrderModalContainer({
           },
         },
         {
-          to: matchingVendor ? vendorEmails : null,
+          to: matchingVendor ? [matchingVendor.email] : null,
           replyTo: bodyshop.email,
           subject: isReturn
             ? Templates.parts_return_slip.subject
@@ -305,7 +300,6 @@ export function PartsOrderModalContainer({
               quantity: value.part_qty,
               job_line_id: isReturn ? value.joblineid : value.id,
               part_type: value.part_type,
-              ...(isReturn && { cm_received: false }),
             });
             return acc;
           }, [])
@@ -347,7 +341,6 @@ export function PartsOrderModalContainer({
           <LoadingSpinner />
         ) : (
           <PartsOrderModalComponent
-            form={form}
             vendorList={(data && data.vendors) || []}
             sendTypeState={sendTypeState}
             isReturn={isReturn}

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

@@ -27,7 +27,6 @@ export function PayableExportAll({
   disabled,
   loadingCallback,
   completedCallback,
-  refetch,
 }) {
   const { t } = useTranslation();
   const [updateBill] = useMutation(UPDATE_BILLS);
@@ -43,7 +42,6 @@ export function PayableExportAll({
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
       PartnerResponse = await axios.post(`/qbo/payables`, {
         bills: billids,
-        elgen: true,
       });
     } else {
       let QbXmlResponse;
@@ -106,62 +104,57 @@ export function PayableExportAll({
                 }),
               })
             );
-            if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
-              //QBO Logs are handled server side.
-              await insertExportLog({
-                variables: {
-                  logs: [
-                    {
-                      bodyshopid: bodyshop.id,
-                      billid: key,
-                      successful: false,
-                      message: JSON.stringify(
-                        failedTransactions.map((ft) => ft.errorMessage)
-                      ),
-                      useremail: currentUser.email,
-                    },
-                  ],
-                },
-              });
-            }
-          } else {
-            if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
-              //QBO Logs are handled server side.
-              await insertExportLog({
-                variables: {
-                  logs: [
-                    {
-                      bodyshopid: bodyshop.id,
-                      billid: key,
-                      successful: true,
-                      useremail: currentUser.email,
-                    },
-                  ],
-                },
-              });
 
-              const billUpdateResponse = await updateBill({
-                variables: {
-                  billIdList: [key],
-                  bill: {
-                    exported: true,
-                    exported_at: new Date(),
+            await insertExportLog({
+              variables: {
+                logs: [
+                  {
+                    bodyshopid: bodyshop.id,
+                    billid: key,
+                    successful: false,
+                    message: JSON.stringify(
+                      failedTransactions.map((ft) => ft.errorMessage)
+                    ),
+                    useremail: currentUser.email,
                   },
+                ],
+              },
+            });
+          } else {
+            await insertExportLog({
+              variables: {
+                logs: [
+                  {
+                    bodyshopid: bodyshop.id,
+                    billid: key,
+                    successful: true,
+                    useremail: currentUser.email,
+                  },
+                ],
+              },
+            });
+
+            const billUpdateResponse = await updateBill({
+              variables: {
+                billIdList: [key],
+                bill: {
+                  exported: true,
+                  exported_at: new Date(),
                 },
+              },
+            });
+            if (!!!billUpdateResponse.errors) {
+              notification.open({
+                type: "success",
+                key: "billsuccessexport",
+                message: t("bills.successes.exported"),
+              });
+            } else {
+              notification["error"]({
+                message: t("bills.errors.exporting", {
+                  error: JSON.stringify(billUpdateResponse.error),
+                }),
               });
-              if (!!!billUpdateResponse.errors) {
-                notification.open({
-                  type: "success",
-                  key: "billsuccessexport",
-                  message: t("bills.successes.exported"),
-                });
-              } else {
-                notification["error"]({
-                  message: t("bills.errors.exporting", {
-                    error: JSON.stringify(billUpdateResponse.error),
-                  }),
-                });
-              }
             }
           }
         })()
@@ -171,8 +164,6 @@ export function PayableExportAll({
     await Promise.all(proms);
     if (!!completedCallback) completedCallback([]);
     if (!!loadingCallback) loadingCallback(false);
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
-
     setLoading(false);
   };
 

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

@@ -26,7 +26,6 @@ export function PayableExportButton({
   disabled,
   loadingCallback,
   setSelectedBills,
-  refetch,
 }) {
   const { t } = useTranslation();
   const [updateBill] = useMutation(UPDATE_BILLS);
@@ -44,7 +43,6 @@ export function PayableExportButton({
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
       PartnerResponse = await axios.post(`/qbo/payables`, {
         bills: [billId],
-        elgen: true,
       });
     } else {
       //Default is QBD
@@ -102,72 +100,64 @@ export function PayableExportButton({
           }),
         })
       );
-      if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
-        //QBO Logs are handled server side.
-        await insertExportLog({
-          variables: {
-            logs: [
-              {
-                bodyshopid: bodyshop.id,
-                billid: billId,
-                successful: false,
-                message: JSON.stringify(
-                  failedTransactions.map((ft) => ft.errorMessage)
-                ),
-                useremail: currentUser.email,
-              },
-            ],
-          },
-        });
-      }
+      await insertExportLog({
+        variables: {
+          logs: [
+            {
+              bodyshopid: bodyshop.id,
+              billid: billId,
+              successful: false,
+              message: JSON.stringify(
+                failedTransactions.map((ft) => ft.errorMessage)
+              ),
+              useremail: currentUser.email,
+            },
+          ],
+        },
+      });
     }
     if (successfulTransactions.length > 0) {
-      if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
-        //QBO Logs are handled server side.
-        await insertExportLog({
-          variables: {
-            logs: [
-              {
-                bodyshopid: bodyshop.id,
-                billid: billId,
-                successful: true,
-                useremail: currentUser.email,
-              },
-            ],
-          },
-        });
-        const billUpdateResponse = await updateBill({
-          variables: {
-            billIdList: successfulTransactions.map(
-              (st) =>
-                st[
-                  bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
-                    ? "billid"
-                    : "id"
-                ]
-            ),
-            bill: {
-              exported: true,
-              exported_at: new Date(),
+      await insertExportLog({
+        variables: {
+          logs: [
+            {
+              bodyshopid: bodyshop.id,
+              billid: billId,
+              successful: true,
+              useremail: currentUser.email,
             },
+          ],
+        },
+      });
+      const billUpdateResponse = await updateBill({
+        variables: {
+          billIdList: successfulTransactions.map(
+            (st) =>
+              st[
+                bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                  ? "billid"
+                  : "id"
+              ]
+          ),
+          bill: {
+            exported: true,
+            exported_at: new Date(),
           },
+        },
+      });
+      if (!!!billUpdateResponse.errors) {
+        notification.open({
+          type: "success",
+          key: "billsuccessexport",
+          message: t("bills.successes.exported"),
+        });
+      } else {
+        notification["error"]({
+          message: t("bills.errors.exporting", {
+            error: JSON.stringify(billUpdateResponse.error),
+          }),
         });
-        if (!!!billUpdateResponse.errors) {
-          notification.open({
-            type: "success",
-            key: "billsuccessexport",
-            message: t("bills.successes.exported"),
-          });
-        } else {
-          notification["error"]({
-            message: t("bills.errors.exporting", {
-              error: JSON.stringify(billUpdateResponse.error),
-            }),
-          });
-        }
       }
-      if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
-
       if (setSelectedBills) {
         setSelectedBills((selectedBills) => {
           return selectedBills.filter((i) => i !== billId);

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

@@ -26,7 +26,6 @@ export function PaymentExportButton({
   disabled,
   loadingCallback,
   setSelectedPayments,
-  refetch,
 }) {
   const { t } = useTranslation();
   const [updatePayment] = useMutation(UPDATE_PAYMENTS);
@@ -41,7 +40,6 @@ export function PaymentExportButton({
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
       PartnerResponse = await axios.post(`/qbo/payments`, {
         payments: [paymentId],
-        elgen: true,
       });
     } else {
       //Default is QBD
@@ -102,68 +100,63 @@ export function PaymentExportButton({
           }),
         })
       );
-      if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
-        //QBO Logs are handled server side.
-        await insertExportLog({
-          variables: {
-            logs: [
-              {
-                bodyshopid: bodyshop.id,
-                paymentid: paymentId,
-                successful: false,
-                message: JSON.stringify(
-                  failedTransactions.map((ft) => ft.errorMessage)
-                ),
-                useremail: currentUser.email,
-              },
-            ],
-          },
-        });
-      }
-    } else {
-      if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
-        //QBO Logs are handled server side.
-        await insertExportLog({
-          variables: {
-            logs: [
-              {
-                bodyshopid: bodyshop.id,
-                paymentid: paymentId,
-                successful: true,
-                useremail: currentUser.email,
-              },
-            ],
-          },
-        });
 
-        const paymentUpdateResponse = await updatePayment({
-          variables: {
-            paymentIdList: successfulTransactions.map(
-              (st) =>
-                st[
-                  bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
-                    ? "paymentid"
-                    : "id"
-                ]
-            ),
-            payment: {
-              exportedat: new Date(),
+      await insertExportLog({
+        variables: {
+          logs: [
+            {
+              bodyshopid: bodyshop.id,
+              paymentid: paymentId,
+              successful: false,
+              message: JSON.stringify(
+                failedTransactions.map((ft) => ft.errorMessage)
+              ),
+              useremail: currentUser.email,
             },
+          ],
+        },
+      });
+    } else {
+      await insertExportLog({
+        variables: {
+          logs: [
+            {
+              bodyshopid: bodyshop.id,
+              paymentid: paymentId,
+              successful: true,
+              useremail: currentUser.email,
+            },
+          ],
+        },
+      });
+
+      const paymentUpdateResponse = await updatePayment({
+        variables: {
+          paymentIdList: successfulTransactions.map(
+            (st) =>
+              st[
+                bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                  ? "paymentid"
+                  : "id"
+              ]
+          ),
+          payment: {
+            exportedat: new Date(),
           },
+        },
+      });
+      if (!!!paymentUpdateResponse.errors) {
+        notification.open({
+          type: "success",
+          key: "paymentsuccessexport",
+          message: t("payments.successes.exported"),
+        });
+      } else {
+        notification["error"]({
+          message: t("payments.errors.exporting", {
+            error: JSON.stringify(paymentUpdateResponse.error),
+          }),
         });
-        if (!!!paymentUpdateResponse.errors) {
-          notification.open({
-            type: "success",
-            key: "paymentsuccessexport",
-            message: t("payments.successes.exported"),
-          });
-        } else {
-          notification["error"]({
-            message: t("payments.errors.exporting", {
-              error: JSON.stringify(paymentUpdateResponse.error),
-            }),
-          });
-        }
       }
 
       if (setSelectedPayments) {
@@ -172,7 +165,7 @@ export function PaymentExportButton({
         });
       }
     }
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
+
     if (!!loadingCallback) loadingCallback(false);
     setLoading(false);
   };

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

@@ -25,7 +25,6 @@ export function PaymentsExportAllButton({
   disabled,
   loadingCallback,
   completedCallback,
-  refetch
 }) {
   const { t } = useTranslation();
   const [updatePayments] = useMutation(UPDATE_PAYMENTS);
@@ -39,7 +38,6 @@ export function PaymentsExportAllButton({
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
       PartnerResponse = await axios.post(`/qbo/payments`, {
         payments: paymentIds,
-        elgen: true,
       });
     } else {
       let QbXmlResponse;
@@ -94,61 +92,54 @@ export function PaymentsExportAllButton({
                 }),
               })
             );
-            if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
-              //QBO Logs are handled server side.
-              await insertExportLog({
-                variables: {
-                  logs: [
-                    {
-                      bodyshopid: bodyshop.id,
-                      paymentid: key,
-                      successful: false,
-                      message: JSON.stringify(
-                        failedTransactions.map((ft) => ft.errorMessage)
-                      ),
-                      useremail: currentUser.email,
-                    },
-                  ],
-                },
-              });
-            }
-          } else {
-            if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
-              //QBO Logs are handled server side.
-
-              await insertExportLog({
-                variables: {
-                  logs: [
-                    {
-                      bodyshopid: bodyshop.id,
-                      paymentid: key,
-                      successful: true,
-                      useremail: currentUser.email,
-                    },
-                  ],
-                },
-              });
-              const paymentUpdateResponse = await updatePayments({
-                variables: {
-                  paymentIdList: [key],
-                  payment: {
-                    exportedat: new Date(),
+            await insertExportLog({
+              variables: {
+                logs: [
+                  {
+                    bodyshopid: bodyshop.id,
+                    paymentid: key,
+                    successful: false,
+                    message: JSON.stringify(
+                      failedTransactions.map((ft) => ft.errorMessage)
+                    ),
+                    useremail: currentUser.email,
                   },
+                ],
+              },
+            });
+          } else {
+            await insertExportLog({
+              variables: {
+                logs: [
+                  {
+                    bodyshopid: bodyshop.id,
+                    paymentid: key,
+                    successful: true,
+                    useremail: currentUser.email,
+                  },
+                ],
+              },
+            });
+            const paymentUpdateResponse = await updatePayments({
+              variables: {
+                paymentIdList: [key],
+                payment: {
+                  exportedat: new Date(),
                 },
+              },
+            });
+            if (!!!paymentUpdateResponse.errors) {
+              notification.open({
+                type: "success",
+                key: "paymentsuccessexport",
+                message: t("payments.successes.exported"),
+              });
+            } else {
+              notification["error"]({
+                message: t("payments.errors.exporting", {
+                  error: JSON.stringify(paymentUpdateResponse.error),
+                }),
               });
-              if (!!!paymentUpdateResponse.errors) {
-                notification.open({
-                  type: "success",
-                  key: "paymentsuccessexport",
-                  message: t("payments.successes.exported"),
-                });
-              } else {
-                notification["error"]({
-                  message: t("payments.errors.exporting", {
-                    error: JSON.stringify(paymentUpdateResponse.error),
-                  }),
-                });
-              }
             }
           }
         })()
@@ -157,7 +148,6 @@ export function PaymentsExportAllButton({
     await Promise.all(proms);
     if (!!completedCallback) completedCallback([]);
     if (!!loadingCallback) loadingCallback(false);
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
     setLoading(false);
   };
 

client/src/components/payments-list-paginated/payment-list-paginated.component.jsx

@@ -14,7 +14,6 @@ import { alphaSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
 import CaBcEtfTableModalContainer from "../ca-bc-etf-table-modal/ca-bc-etf-table-modal.container";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 const stripeTestEnv = process.env.REACT_APP_STRIPE_PUBLIC_KEY; //.includes("test");
 
@@ -79,12 +78,14 @@ export function PaymentsListPaginated({
       render: (text, record) => {
         return record.job.owner ? (
           <Link to={"/manage/owners/" + record.job.owner.id}>
-            <OwnerNameDisplay ownerObject={record} />
+            {`${record.job.ownr_fn || ""} ${record.job.ownr_ln || ""} ${
+              record.job.ownr_co_nm || ""
+            }`}
           </Link>
         ) : (
-          <span>
-            <OwnerNameDisplay ownerObject={record} />
-          </span>
+          <span>{`${record.job.ownr_fn || ""} ${record.job.ownr_ln || ""} ${
+            record.job.ownr_co_nm || ""
+          }`}</span>
         );
       },
     },

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

@@ -1,7 +1,6 @@
 import {
   CalendarOutlined,
   EyeFilled,
-  DownloadOutlined,
   PauseCircleOutlined,
 } from "@ant-design/icons";
 import { Card, Col, Row, Space } from "antd";
@@ -14,8 +13,6 @@ import ProductionListColumnProductionNote from "../production-list-columns/produ
 import ProductionSubletsManageComponent from "../production-sublets-manage/production-sublets-manage.component";
 import "./production-board-card.styles.scss";
 import moment from "moment";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
 
 export default function ProductionBoardCard(
   technician,
@@ -25,7 +22,7 @@ export default function ProductionBoardCard(
 ) {
   const { t } = useTranslation();
 
-  let employee_body, employee_prep, employee_refinish, employee_csr;
+  let employee_body, employee_prep, employee_refinish; //employee_csr;
   if (card.employee_body) {
     employee_body = bodyshop.employees.find((e) => e.id === card.employee_body);
   }
@@ -37,9 +34,6 @@ export default function ProductionBoardCard(
       (e) => e.id === card.employee_refinish
     );
   }
-  if (card.employee_csr) {
-    employee_csr = bodyshop.employees.find((e) => e.id === card.employee_csr);
-  }
   // if (card.employee_csr) {
   //   employee_csr = bodyshop.employees.find((e) => e.id === card.employee_csr);
   // }
@@ -64,22 +58,20 @@ export default function ProductionBoardCard(
             <PauseCircleOutlined style={{ color: "orangered" }} />
           )}
           <span style={{ fontWeight: "bolder" }}>
-            <Link
-              to={
-                technician
-                  ? `/tech/joblookup?selected=${card.id}`
-                  : `/manage/jobs/${card.id}`
-              }
-            >
-              {card.ro_number || t("general.labels.na")}
-            </Link>
+            {card.ro_number || t("general.labels.na")}
           </span>
         </Space>
       }
       extra={
-        <Link to={{ search: `?selected=${card.id}` }}>
-          <EyeFilled />
-        </Link>
+        technician ? (
+          <Link to={`/tech/joblookup?selected=${card.id}`}>
+            <EyeFilled />
+          </Link>
+        ) : (
+          <Link to={`/manage/jobs/${card.id}`}>
+            <EyeFilled />
+          </Link>
+        )
       }
     >
       <Row>
@@ -90,9 +82,9 @@ export default function ProductionBoardCard(
                 card.ownr_co_nm || ""
               }`}</div>
             ) : (
-              <div className="ellipses">
-                <OwnerNameDisplay ownerObject={card} />
-              </div>
+              <div className="ellipses">{`${card.ownr_ln || ""}, ${
+                card.ownr_fn || ""
+              } ${card.ownr_co_nm || ""}`}</div>
             )}
           </Col>
         )}
@@ -139,11 +131,11 @@ export default function ProductionBoardCard(
                     )} ${employee_refinish.last_name.charAt(0)}`
                   : ""
               } ${card.larhrs.aggregate.sum.mod_lb_hrs || "?"}h`}</Col>
-              <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`C: ${
+              {/* <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`C: ${
                 employee_csr
                   ? `${employee_csr.first_name} ${employee_csr.last_name}`
                   : ""
-              }`}</Col>
+              }`}</Col> */}
             </Row>
           </Col>
         )}
@@ -159,16 +151,6 @@ export default function ProductionBoardCard(
             </Row>
           </Col>
         )} */}
-        {cardSettings && cardSettings.actual_in && card.actual_in && (
-          <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
-            <Space>
-              <DownloadOutlined />
-              <DateTimeFormatter format="MM/DD">
-                {card.actual_in}
-              </DateTimeFormatter>
-            </Space>
-          </Col>
-        )}
         {cardSettings &&
           cardSettings.scheduled_completion &&
           card.scheduled_completion && (
@@ -200,11 +182,6 @@ export default function ProductionBoardCard(
             )}
           </Col>
         )}
-        {cardSettings && cardSettings.partsstatus && (
-          <Col span={24}>
-            <JobPartsQueueCount parts={card.joblines_status} />
-          </Col>
-        )}
       </Row>
     </Card>
   );

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

@@ -97,13 +97,6 @@ export default function ProductionBoardKanbanCardSettings({
               >
                 <Switch />
               </Form.Item>
-              <Form.Item
-                valuePropName="checked"
-                label={t("production.labels.actual_in")}
-                name="actual_in"
-              >
-                <Switch />
-              </Form.Item>
             </Col>
             <Col span={12}>
               <Form.Item
@@ -138,20 +131,6 @@ export default function ProductionBoardKanbanCardSettings({
               >
                 <Switch />
               </Form.Item>
-              <Form.Item
-                valuePropName="checked"
-                label={t("production.labels.partsstatus")}
-                name="partsstatus"
-              >
-                <Switch />
-              </Form.Item>
-              <Form.Item
-                valuePropName="checked"
-                label={t("production.labels.stickyheader")}
-                name="stickyheader"
-              >
-                <Switch />
-              </Form.Item>
             </Col>
           </Row>
         </Form>

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

@@ -1,27 +1,26 @@
-import { SyncOutlined } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
 import Board, { moveCard } from "@asseinfo/react-kanban";
-import { Button, Grid, notification, PageHeader, Space, Statistic } from "antd";
+//import "@asseinfo/react-kanban/dist/styles.css";
+import "./production-board-kanban.styles.scss";
+import { SyncOutlined } from "@ant-design/icons";
+import { Grid, notification, Button, PageHeader, Space, Statistic } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { Sticky, StickyContainer } from "react-sticky";
 import { createStructuredSelector } from "reselect";
-import styled from "styled-components";
-import { logImEXEvent } from "../../firebase/firebase.utils";
 import { generate_UPDATE_JOB_KANBAN } from "../../graphql/jobs.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import IndefiniteLoading from "../indefinite-loading/indefinite-loading.component";
-import ProductionBoardFilters from "../production-board-filters/production-board-filters.component";
 import ProductionBoardCard from "../production-board-kanban-card/production-board-kanban-card.component";
-import ProductionListDetailComponent from "../production-list-detail/production-list-detail.component";
-import ProductionBoardKanbanCardSettings from "./production-board-kanban.card-settings.component";
-//import "@asseinfo/react-kanban/dist/styles.css";
-import "./production-board-kanban.styles.scss";
 import { createBoardData } from "./production-board-kanban.utils.js";
+import IndefiniteLoading from "../indefinite-loading/indefinite-loading.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import ProductionBoardFilters from "../production-board-filters/production-board-filters.component";
+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,
   technician: selectTechnician,
@@ -51,10 +50,7 @@ export function ProductionBoardKanbanComponent({
   const { t } = useTranslation();
   useEffect(() => {
     const boardData = createBoardData(
-      [
-        ...bodyshop.md_ro_statuses.production_statuses,
-        ...(bodyshop.md_ro_statuses.additional_board_statuses || []),
-      ],
+      bodyshop.md_ro_statuses.production_statuses,
       data,
       filter
     );
@@ -64,7 +60,13 @@ export function ProductionBoardKanbanComponent({
     });
     setBoardLanes(boardData);
     setIsMoving(false);
-  }, [data, setBoardLanes, setIsMoving, bodyshop.md_ro_statuses, filter]);
+  }, [
+    data,
+    setBoardLanes,
+    setIsMoving,
+    bodyshop.md_ro_statuses.production_statuses,
+    filter,
+  ]);
 
   const client = useApolloClient();
 
@@ -181,52 +183,9 @@ export function ProductionBoardKanbanComponent({
       : standardSizes[selectedBreakpoint[0]]
     : "250";
 
-  const stickyHeader = {
-    renderColumnHeader: ({ title }) => (
-      <Sticky>
-        {({
-          style,
-
-          // the following are also available but unused in this example
-          isSticky,
-          wasSticky,
-          distanceFromTop,
-          distanceFromBottom,
-          calculatedHeight,
-        }) => (
-          <div
-            className="react-kanban-column-header"
-            style={{ ...style, zIndex: "99", backgroundColor: "#ddd" }}
-          >
-            {title}
-          </div>
-        )}
-      </Sticky>
-    ),
-  };
-
-  const cardSettings =
-    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,
-          stickyheader: false,
-        };
-
   return (
     <Container width={width}>
       <IndefiniteLoading loading={isMoving} />
-
       <PageHeader
         title={
           <Space>
@@ -256,19 +215,34 @@ export function ProductionBoardKanbanComponent({
           </Space>
         }
       />
-      <ProductionListDetailComponent jobs={data} />
-      <StickyContainer>
-        <Board
-          style={{ height: "100%" }}
-          children={boardLanes}
-          disableCardDrag={isMoving}
-          {...(cardSettings.stickyheader && stickyHeader)}
-          renderCard={(card) =>
-            ProductionBoardCard(technician, card, bodyshop, cardSettings)
-          }
-          onCardDragEnd={handleDragEnd}
-        />
-      </StickyContainer>
+
+      <Board
+        children={boardLanes}
+        disableCardDrag={isMoving}
+        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}
+      />
     </Container>
   );
 }

client/src/components/production-board-kanban/production-board-kanban.utils.js

@@ -66,7 +66,6 @@ export const createBoardData = (AllStatuses, Jobs, filter) => {
               include ||
               j.employee_body === employeeId ||
               j.employee_prep === employeeId ||
-              j.employee_csr === employeeId ||
               j.employee_refinish === employeeId;
           }
 
@@ -77,8 +76,9 @@ export const createBoardData = (AllStatuses, Jobs, filter) => {
 
   Object.keys(DataGroupedByStatus).map((statusGroupKey) => {
     try {
-      boardLanes.columns.find((l) => l.id === statusGroupKey).cards =
-        sortByParentId(DataGroupedByStatus[statusGroupKey]);
+      boardLanes.columns.find(
+        (l) => l.id === statusGroupKey
+      ).cards = sortByParentId(DataGroupedByStatus[statusGroupKey]);
     } catch (error) {
       console.log("Error while creating board card", error);
     }

client/src/components/production-list-columns/production-list-columns.data.js

@@ -21,9 +21,6 @@ import ProductionListColumnStatus from "./production-list-columns.status.compone
 import ProductionListColumnCategory from "./production-list-columns.status.category";
 import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
 import ProductionListColumnComment from "./production-list-columns.comment.component";
-import ProductionListColumnPartsReceived from "./production-list-columns.partsreceived.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
 
 const r = ({ technician, state, activeStatuses, bodyshop }) => {
   return [
@@ -70,7 +67,11 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       dataIndex: "ownr",
       key: "ownr",
       ellipsis: true,
-      render: (text, record) => <OwnerNameDisplay ownerObject={record} />,
+      render: (text, record) => (
+        <span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
+          record.ownr_co_nm || ""
+        }`}</span>
+      ),
       sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
       sortOrder:
         state.sortedInfo.columnKey === "ownr" && state.sortedInfo.order,
@@ -80,13 +81,6 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       dataIndex: "vehicle",
       key: "vehicle",
       ellipsis: true,
-      sorter: (a, b) =>
-        alphaSort(
-          a.v_make_desc + a.v_model_desc,
-          b.v_make_desc + b.v_model_desc
-        ),
-      sortOrder:
-        state.sortedInfo.columnKey === "ownr" && state.sortedInfo.order,
       render: (text, record) => (
         <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
           record.v_model_desc || ""
@@ -102,7 +96,7 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       sortOrder:
         state.sortedInfo.columnKey === "actual_in" && state.sortedInfo.order,
       render: (text, record) => (
-        <ProductionListDate record={record} field="actual_in" time />
+        <ProductionListDate record={record} field="actual_in" time/>
       ),
     },
     {
@@ -483,22 +477,6 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         />
       ),
     },
-    {
-      title: i18n.t("jobs.labels.parts_received"),
-      dataIndex: "parts_received",
-      key: "parts_received",
-      render: (text, record) => (
-        <ProductionListColumnPartsReceived record={record} />
-      ),
-    },
-    {
-      title: i18n.t("jobs.fields.partsstatus"),
-      dataIndex: "partsstatus",
-      key: "partsstatus",
-      render: (text, record) => (
-        <JobPartsQueueCount parts={record.joblines_status} record={record} />
-      ),
-    },
   ];
 };
 export default r;

client/src/components/production-list-columns/production-list-columns.date.component.jsx

@@ -74,7 +74,6 @@ export default function ProductionListDate({
                 onClick={(e) => e.stopPropagation()}
                 value={(record[field] && moment(record[field])) || null}
                 onChange={handleChange}
-                minuteStep={15}
                 format="hh:mm a"
               />
             )}

client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx

@@ -116,17 +116,15 @@ export function ProductionListEmpAssignment({
             0
           }
         >
-          {bodyshop.employees
-            .filter((emp) => emp.active)
-            .map((emp) => (
-              <Select.Option
-                value={emp.id}
-                key={emp.id}
-                name={`${emp.first_name} ${emp.last_name}`}
-              >
-                {`${emp.first_name} ${emp.last_name}`}
-              </Select.Option>
-            ))}
+          {bodyshop.employees.map((emp) => (
+            <Select.Option
+              value={emp.id}
+              key={emp.id}
+              name={`${emp.first_name} ${emp.last_name}`}
+            >
+              {`${emp.first_name} ${emp.last_name}`}
+            </Select.Option>
+          ))}
         </Select>
       </Col>
       <Col span={24}>

client/src/components/production-list-columns/production-list-columns.partsreceived.component.jsx

@@ -1,41 +0,0 @@
-import { useMemo } from "react";
-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
-)(ProductionListColumnPartsReceived);
-
-export function ProductionListColumnPartsReceived({ bodyshop, record }) {
-  const amount = useMemo(() => {
-    const amount = record.joblines_status.reduce(
-      (acc, val) => {
-        acc.total += val.count;
-        acc.received =
-          val.status === bodyshop.md_order_statuses.default_received
-            ? acc.received + val.count
-            : acc.received;
-        return acc;
-      },
-      { total: 0, received: 0 }
-    );
-
-    return {
-      ...amount,
-      percent:
-        amount.total !== 0
-          ? ((amount.received / amount.total) * 100).toFixed(0) + "%"
-          : "N/A",
-    };
-  }, [record, bodyshop.md_order_statuses]);
-
-  return `${amount.percent} (${amount.received}/${amount.total})`;
-}

client/src/components/production-list-detail/production-list-detail.component.jsx

@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client";
-import { Descriptions, Drawer, Space, PageHeader, Button } from "antd";
+import { Descriptions, Drawer, Space } from "antd";
 import queryString from "query-string";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -16,31 +16,8 @@ import JobEmployeeAssignments from "../job-employee-assignments/job-employee-ass
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import ProductionRemoveButton from "../production-remove-button/production-remove-button.component";
 import JobAtChange from "../job-at-change/job-at-change.component";
-import { PrinterFilled } from "@ant-design/icons";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { setModalContext } from "../../redux/modals/modals.actions";
-import ScoreboardAddButton from "../job-scoreboard-add-button/job-scoreboard-add-button.component";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-  setPrintCenterContext: (context) =>
-    dispatch(setModalContext({ context: context, modal: "printCenter" })),
-});
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(ProductionListDetail);
-
-export function ProductionListDetail({
-  bodyshop,
-  jobs,
-  setPrintCenterContext,
-}) {
+export default function ProductionListDetail({ jobs }) {
   const search = queryString.parse(useLocation().search);
   const history = useHistory();
   const { selected } = search;
@@ -62,30 +39,11 @@ export function ProductionListDetail({
   return (
     <Drawer
       title={
-        <PageHeader
-          title={theJob.ro_number}
-          extra={
-            <Space wrap>
-              <ProductionRemoveButton jobId={theJob.id} />{" "}
-              <Button
-                onClick={() => {
-                  setPrintCenterContext({
-                    actions: { refetch: refetch },
-                    context: {
-                      id: theJob.id,
-                      job: theJob,
-                      type: "job",
-                    },
-                  });
-                }}
-              >
-                <PrinterFilled />
-                {t("jobs.actions.printCenter")}
-              </Button>
-              <ScoreboardAddButton job={data ? data.jobs_by_pk : {}} />
-            </Space>
-          }
-        />
+        <Space>
+          <span>{t("production.labels.jobdetail")}</span>
+          <span>{theJob.ro_number}</span>
+          <ProductionRemoveButton jobId={theJob.id} />
+        </Space>
       }
       placement="right"
       width={"33%"}
@@ -114,7 +72,9 @@ export function ProductionListDetail({
               {theJob.ins_co_nm || ""}
             </Descriptions.Item>
             <Descriptions.Item label={t("jobs.fields.owner")}>
-              <OwnerNameDisplay ownerObject={theJob} />
+              {`${theJob.ownr_fn || ""} ${theJob.ownr_ln || ""} ${
+                theJob.ownr_co_nm || ""
+              }`}
               <StartChatButton
                 phone={data.jobs_by_pk.ownr_ph1}
                 jobid={data.jobs_by_pk.id}
@@ -149,12 +109,11 @@ export function ProductionListDetail({
             loading={loading}
             data={data ? data.jobs_by_pk : null}
           />
-          {!bodyshop.uselocalmediaserver && (
-            <JobDetailCardsDocumentsComponent
-              loading={loading}
-              data={data ? data.jobs_by_pk : null}
-            />
-          )}
+
+          <JobDetailCardsDocumentsComponent
+            loading={loading}
+            data={data ? data.jobs_by_pk : null}
+          />
         </div>
       )}
     </Drawer>