Merged in hotfix/2021-08-12 (pull request #178 )

hotfix/2021-08-12 Approved-by: Patrick Fic
2021-08-12 20:43:16 +00:00
135 changed files with 4442 additions and 34342 deletions
--- a/_reference/Responsibility
+++ b/_reference/Responsibility
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
--- a/client/craco.config.js
+++ b/client/craco.config.js
@@ -1,25 +1,9 @@
 // craco.config.js
 const TerserPlugin = require("terser-webpack-plugin");
 const CracoLessPlugin = require("craco-less");
-const SentryWebpackPlugin = require("@sentry/webpack-plugin");

 module.exports = {
  plugins: [
-    {
-      plugin: SentryWebpackPlugin,
-      options: {
-        // sentry-cli configuration
-        authToken:
-          "6b45b028a02342db97a9a2f92c0959058665443d379d4a3a876430009e744260",
-        org: "snapt-software",
-        project: "imexonline",
-        release: process.env.REACT_APP_GIT_SHA,
-
-        // webpack-specific configuration
-        include: ".",
-        ignore: ["node_modules", "webpack.config.js"],
-      },
-    },
    {
      plugin: CracoLessPlugin,
      options: {
@@ -69,5 +53,4 @@ module.exports = {
      },
    }),
  },
-  devtool: "source-map",
 };
--- a/client/package.json
+++ b/client/package.json
@@ -4,87 +4,81 @@
  "private": true,
  "proxy": "http://localhost:5000",
  "dependencies": {
-    "@apollo/client": "^3.4.10",
+    "@apollo/client": "^3.3.21",
    "@craco/craco": "^6.2.0",
-    "@fingerprintjs/fingerprintjs": "^3.3.0",
+    "@fingerprintjs/fingerprintjs": "^3.2.0",
    "@lourenci/react-kanban": "^2.1.0",
-    "@openreplay/tracker": "^3.2.5",
-    "@openreplay/tracker-assist": "^3.0.4",
-    "@openreplay/tracker-graphql": "^3.0.0",
-    "@openreplay/tracker-redux": "^3.0.0",
-    "@sentry/react": "^6.11.0",
-    "@sentry/tracing": "^6.11.0",
+    "@sentry/react": "^6.10.0",
+    "@sentry/tracing": "^6.10.0",
    "@stripe/react-stripe-js": "^1.4.0",
-    "@stripe/stripe-js": "^1.17.1",
-    "@tanem/react-nprogress": "^3.0.79",
-    "antd": "^4.16.13",
+    "@stripe/stripe-js": "^1.16.0",
+    "@tanem/react-nprogress": "^3.0.74",
+    "antd": "^4.16.8",
    "apollo-link-logger": "^2.0.0",
    "axios": "^0.21.1",
-    "craco-less": "^1.20.0",
+    "craco-less": "^1.18.0",
    "dinero.js": "^1.9.0",
    "dotenv": "^10.0.0",
    "enquire-js": "^0.2.1",
    "env-cmd": "^10.1.0",
-    "exifr": "^7.1.3",
-    "firebase": "^9.0.0",
-    "graphql": "^15.5.2",
-    "i18next": "^20.4.0",
+    "exifr": "^7.1.2",
+    "firebase": "^8.7.1",
+    "graphql": "^15.5.1",
+    "i18next": "^20.3.4",
    "i18next-browser-languagedetector": "^6.1.2",
-    "jsoneditor": "^9.5.4",
+    "jsoneditor": "^9.5.2",
    "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.9.25",
-    "logrocket": "^2.0.0",
-    "markerjs2": "^2.11.2",
+    "libphonenumber-js": "^1.9.22",
+    "logrocket": "^1.2.0",
+    "markerjs2": "^2.9.0",
    "moment-business-days": "^1.2.0",
-    "phone": "^3.1.6",
+    "phone": "^3.1.2",
    "preval.macro": "^5.0.0",
    "prop-types": "^15.7.2",
    "query-string": "^7.0.1",
    "rc-queue-anim": "^2.0.0",
    "rc-scroll-anim": "^2.7.6",
    "react": "^17.0.1",
-    "react-big-calendar": "^0.35.0",
+    "react-big-calendar": "^0.33.2",
    "react-color": "^2.19.3",
-    "react-cookie": "^4.1.1",
    "react-dom": "^17.0.1",
    "react-drag-listview": "^0.1.8",
    "react-grid-gallery": "^0.5.5",
-    "react-grid-layout": "^1.3.0",
-    "react-i18next": "^11.11.4",
+    "react-grid-layout": "^1.2.5",
+    "react-i18next": "^11.11.3",
    "react-icons": "^4.2.0",
-    "react-number-format": "^4.7.3",
+    "react-number-format": "^4.6.4",
    "react-redux": "^7.2.4",
    "react-resizable": "^3.0.4",
-    "react-router-dom": "^5.2.1",
+    "react-router-dom": "^5.2.0",
    "react-scripts": "^4.0.3",
    "react-sublime-video": "^0.2.5",
    "react-virtualized": "^9.22.3",
-    "recharts": "^2.1.2",
-    "redux": "^4.1.1",
+    "recharts": "^2.0.10",
+    "redux": "^4.1.0",
    "redux-persist": "^6.0.0",
    "redux-saga": "^1.1.3",
    "redux-state-sync": "^3.1.2",
    "reselect": "^4.0.0",
-    "sass": "^1.38.2",
-    "socket.io-client": "^4.2.0",
-    "styled-components": "^5.3.1",
+    "sass": "^1.35.2",
+    "socket.io-client": "^4.1.3",
+    "styled-components": "^5.3.0",
    "subscriptions-transport-ws": "^0.9.18",
    "web-vitals": "^2.1.0",
-    "workbox-background-sync": "^6.2.4",
-    "workbox-broadcast-update": "^6.2.4",
-    "workbox-cacheable-response": "^6.2.4",
-    "workbox-core": "^6.2.4",
-    "workbox-expiration": "^6.2.4",
-    "workbox-google-analytics": "^6.2.4",
-    "workbox-navigation-preload": "^6.2.4",
-    "workbox-precaching": "^6.2.4",
-    "workbox-range-requests": "^6.2.4",
-    "workbox-routing": "^6.2.4",
-    "workbox-strategies": "^6.2.4",
-    "workbox-streams": "^6.2.4"
+    "workbox-background-sync": "^6.1.5",
+    "workbox-broadcast-update": "^6.1.5",
+    "workbox-cacheable-response": "^6.1.5",
+    "workbox-core": "^6.1.5",
+    "workbox-expiration": "^6.1.5",
+    "workbox-google-analytics": "^6.1.5",
+    "workbox-navigation-preload": "^6.1.5",
+    "workbox-precaching": "^6.1.5",
+    "workbox-range-requests": "^6.1.5",
+    "workbox-routing": "^6.1.5",
+    "workbox-strategies": "^6.1.5",
+    "workbox-streams": "^6.1.5"
  },
  "scripts": {
-    "postinstall": "patch-package",
    "analyze": "source-map-explorer 'build/static/js/*.js'",
    "start": "craco start",
    "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
@@ -114,8 +108,6 @@
    ]
  },
  "devDependencies": {
-    "@sentry/webpack-plugin": "^1.17.1",
-    "patch-package": "^6.4.7",
    "redux-logger": "^3.0.6",
    "source-map-explorer": "^2.5.2"
  }
--- a/client/patches/peerjs+1.3.2.patch
+++ b/client/patches/peerjs+1.3.2.patch
--- a/client/src/App/App.container.jsx
+++ b/client/src/App/App.container.jsx
@@ -8,27 +8,8 @@ import { useTranslation } from "react-i18next";
 import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
 import client from "../utils/GraphQLClient";
 import App from "./App";
-import trackerGraphQL from "@openreplay/tracker-graphql";
-//import trackerRedux from "@openreplay/tracker-redux";
-import Tracker from "@openreplay/tracker";
-//import trackerAssist from "@openreplay/tracker-assist";
 moment.locale("en-US");

-export const tracker = new Tracker({
-  projectKey: "trDmOZlEXUpjGsMtHroA",
-  ingestPoint: "https://replay.imex.online/ingest",
-  ...(process.env.NODE_ENV === null || process.env.NODE_ENV === "development"
-    ? { __DISABLE_SECURE_MODE: true }
-    : {}),
-  // beaconSize: 10485760,
-  onStart: ({ sessionID }) => console.log("ORS SESSION ", sessionID),
-});
-
-// tracker.use(
-//   trackerAssist({ confirmText: "Technical support is about to assist you." })
-// ); // check the list of available options below
-export const recordGraphQL = tracker.use(trackerGraphQL());
-tracker.start();
 if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");

 export default function AppContainer() {
--- a/client/src/components/_test/test.component.jsx
+++ b/client/src/components/_test/test.component.jsx
@@ -1,9 +1,25 @@
+import Axios from "axios";
 import React from "react";
-import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 export default function Test() {
+  const handleQbSignIn = async () => {
+    const result = await Axios.post("/qbo/authorize", { userId: "1234" });
+    console.log("handleQbSignIn -> result", result.data);
+    // window.open(result.data, "_blank", "toolbar=0,location=0,menubar=0");
+
+    var parameters = "location=1,width=800,height=650";
+    parameters +=
+      ",left=" +
+      (window.screen.width - 800) / 2 +
+      ",top=" +
+      (window.screen.height - 650) / 2;
+
+    // Launch Popup
+    window.open(result.data, "connectPopup", parameters);
+  };
+
  return (
    <div>
-      <QboAuthorizeComponent />
+      <button onClick={handleQbSignIn}>Sign Into Qb.</button>
    </div>
  );
 }
--- a/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx
+++ b/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx
@@ -109,17 +109,6 @@ export default function AccountingPayablesTableComponent({ loading, bills }) {
        <Checkbox disabled checked={record.is_credit_memo} />
      ),
    },
-    {
-      title: t("exportlogs.labels.attempts"),
-      dataIndex: "attempts",
-      key: "attempts",
-
-      render: (text, record) => {
-        const success = record.exportlogs.filter((e) => e.successful).length;
-        const attempts = record.exportlogs.length;
-        return `${success}/${attempts}`;
-      },
-    },
    {
      title: t("general.labels.actions"),
      dataIndex: "actions",
--- a/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
+++ b/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
@@ -108,17 +108,7 @@ export default function AccountingPayablesTableComponent({
        <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
      ),
    },
-    {
-      title: t("exportlogs.labels.attempts"),
-      dataIndex: "attempts",
-      key: "attempts",

-      render: (text, record) => {
-        const success = record.exportlogs.filter((e) => e.successful).length;
-        const attempts = record.exportlogs.length;
-        return `${success}/${attempts}`;
-      },
-    },
    {
      title: t("general.labels.actions"),
      dataIndex: "actions",
--- a/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
+++ b/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
@@ -114,21 +114,11 @@ export default function AccountingReceivablesTableComponent({ loading, jobs }) {
        );
      },
    },
-    {
-      title: t("exportlogs.labels.attempts"),
-      dataIndex: "attempts",
-      key: "attempts",
-
-      render: (text, record) => {
-        const success = record.exportlogs.filter((e) => e.successful).length;
-        const attempts = record.exportlogs.length;
-        return `${success}/${attempts}`;
-      },
-    },
    {
      title: t("general.labels.actions"),
      dataIndex: "actions",
      key: "actions",
+      sorter: (a, b) => a.clm_total - b.clm_total,

      render: (text, record) => (
        <Space wrap>
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -72,11 +72,9 @@ export function BillEnterModalLinesComponent({
                        quantity: opt.part_qty || 1,
                        actual_price: opt.cost,
                        cost_center: opt.part_type
-                          ? responsibilityCenters.defaults &&
-                            (responsibilityCenters.defaults.costs[
+                          ? responsibilityCenters.defaults.costs[
                              opt.part_type
-                            ] ||
-                              null)
+                            ] || null
                          : null,
                      };
                    }
--- a/client/src/components/bill-form/bill-form.totals.utility.js
+++ b/client/src/components/bill-form/bill-form.totals.utility.js
@@ -1,8 +1,13 @@
 import Dinero from "dinero.js";

 export const CalculateBillTotal = (invoice) => {
-  const { total, billlines, federal_tax_rate, local_tax_rate, state_tax_rate } =
-    invoice;
+  const {
+    total,
+    billlines,
+    federal_tax_rate,
+    local_tax_rate,
+    state_tax_rate,
+  } = invoice;

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

      subtotal = subtotal.add(itemTotal);
--- a/client/src/components/contracts-list/contracts-list.component.jsx
+++ b/client/src/components/contracts-list/contracts-list.component.jsx
@@ -83,10 +83,8 @@ export function ContractsList({
      render: (text, record) => (
        <Link to={`/manage/courtesycars/${record.courtesycar.id}`}>{`${
          record.courtesycar.year
-        } ${record.courtesycar.make} ${record.courtesycar.model}${
-          record.courtesycar.plate ? ` (${record.courtesycar.plate})` : ""
-        }${
-          record.courtesycar.fleetnumber ? ` (${record.courtesycar.fleetnumber})` : ""
+        } ${record.courtesycar.make} ${record.courtesycar.model} ${
+          record.courtesycar.plate ? `(${record.courtesycar.plate})` : ""
        }`}</Link>
      ),
    },
--- a/client/src/components/dashboard-grid/dashboard-grid.component.jsx
+++ b/client/src/components/dashboard-grid/dashboard-grid.component.jsx
@@ -244,7 +244,7 @@ const componentList = {
    h: 3,
  },
  MonthlyPartsSales: {
-    label: i18next.t("dashboard.titles.monthlypartssales"),
+    label: i18next.t("dashboard.titles.productiondollars"),
    component: DashboardMonthlyPartsSales,
    gqlFragment: null,
    minW: 2,
@@ -253,7 +253,7 @@ const componentList = {
    h: 2,
  },
  MonthlyLaborSales: {
-    label: i18next.t("dashboard.titles.monthlylaborsales"),
+    label: i18next.t("dashboard.titles.monthlypartssales"),
    component: DashboardMonthlyLaborSales,
    gqlFragment: null,
    minW: 2,
--- a/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
+++ b/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
@@ -1,128 +0,0 @@
-import { Button, Table, Typography } from "antd";
-import React, { useState, useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import Dinero from "dinero.js";
-import { SyncOutlined } from "@ant-design/icons";
-
-const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
-  bodyshop: selectBodyshop,
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(DmsAllocationsSummary);
-
-export function DmsAllocationsSummary({ socket, bodyshop, jobId }) {
-  const { t } = useTranslation();
-  const [allocationsSummary, setAllocationsSummary] = useState([]);
-
-  useEffect(() => {
-    if (socket.connected) {
-      socket.emit("cdk-calculate-allocations", jobId, (ack) =>
-        setAllocationsSummary(ack)
-      );
-    }
-  }, [socket, socket.connected, jobId]);
-
-  const columns = [
-    {
-      title: t("jobs.fields.dms.center"),
-      dataIndex: "center",
-      key: "center",
-    },
-    {
-      title: t("jobs.fields.dms.sale"),
-      dataIndex: "sale",
-      key: "sale",
-      render: (text, record) => Dinero(record.sale).toFormat(),
-    },
-    {
-      title: t("jobs.fields.dms.cost"),
-      dataIndex: "cost",
-      key: "cost",
-      render: (text, record) => Dinero(record.cost).toFormat(),
-    },
-    {
-      title: t("jobs.fields.dms.sale_dms_acctnumber"),
-      dataIndex: "sale_dms_acctnumber",
-      key: "sale_dms_acctnumber",
-      render: (text, record) =>
-        record.profitCenter && record.profitCenter.dms_acctnumber,
-    },
-    {
-      title: t("jobs.fields.dms.cost_dms_acctnumber"),
-      dataIndex: "cost_dms_acctnumber",
-      key: "cost_dms_acctnumber",
-      render: (text, record) =>
-        record.costCenter && record.costCenter.dms_acctnumber,
-    },
-    {
-      title: t("jobs.fields.dms.dms_wip_acctnumber"),
-      dataIndex: "dms_wip_acctnumber",
-      key: "dms_wip_acctnumber",
-      render: (text, record) =>
-        record.costCenter && record.costCenter.dms_wip_acctnumber,
-    },
-  ];
-
-  return (
-    <Table
-      title={() => (
-        <Button
-          onClick={() => {
-            socket.emit("cdk-calculate-allocations", jobId, (ack) =>
-              setAllocationsSummary(ack)
-            );
-          }}
-        >
-          <SyncOutlined />
-        </Button>
-      )}
-      pagination={{ position: "top", defaultPageSize: 50 }}
-      columns={columns}
-      rowKey="center"
-      dataSource={allocationsSummary}
-      summary={() => {
-        const totals = allocationsSummary.reduce(
-          (acc, val) => {
-            return {
-              totalSale: acc.totalSale.add(Dinero(val.sale)),
-              totalCost: acc.totalCost.add(Dinero(val.cost)),
-            };
-          },
-          {
-            totalSale: Dinero(),
-            totalCost: Dinero(),
-          }
-        );
-
-        return (
-          <Table.Summary.Row>
-            <Table.Summary.Cell>
-              <Typography.Title level={4}>
-                {t("general.labels.totals")}
-              </Typography.Title>
-            </Table.Summary.Cell>
-            <Table.Summary.Cell>
-              {totals.totalSale.toFormat()}
-            </Table.Summary.Cell>
-            <Table.Summary.Cell>
-              {totals.totalCost.toFormat()}
-            </Table.Summary.Cell>
-            <Table.Summary.Cell></Table.Summary.Cell>
-            <Table.Summary.Cell></Table.Summary.Cell>
-          </Table.Summary.Row>
-        );
-      }}
-    />
-  );
-}
--- a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
+++ b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
@@ -1,109 +0,0 @@
-import React, { useState } from "react";
-import { Modal, Button, Table, Input } from "antd";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useTranslation } from "react-i18next";
-import { useLazyQuery } from "@apollo/client";
-import { SEARCH_DMS_VEHICLES } from "../../graphql/dms.queries";
-import AlertComponent from "../alert/alert.component";
-
-const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
-  bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(mapStateToProps, mapDispatchToProps)(DmsCdkVehicles);
-
-export function DmsCdkVehicles({ bodyshop, form, socket, job }) {
-  const [visible, setVisible] = useState(false);
-  const [selectedModel, setSelectedModel] = useState(null);
-  const { t } = useTranslation();
-
-  const [callSearch, { loading, error, data }] =
-    useLazyQuery(SEARCH_DMS_VEHICLES);
-  const columns = [
-    {
-      title: t("jobs.fields.dms.make"),
-      dataIndex: "make",
-      key: "make",
-    },
-    {
-      title: t("jobs.fields.dms.model"),
-      dataIndex: "model",
-      key: "model",
-    },
-    {
-      title: t("jobs.fields.dms.makecode"),
-      dataIndex: "makecode",
-      key: "makecode",
-    },
-    {
-      title: t("jobs.fields.dms.modelcode"),
-      dataIndex: "modelcode",
-      key: "modelcode",
-    },
-  ];
-
-  console.log(
-    "🚀  ~ file: dms-cdk-makes.component.jsx  ~ line 95  ~ selectedModel",
-    selectedModel
-  );
-  return (
-    <div>
-      <Modal
-        width={"90%"}
-        visible={visible}
-        onCancel={() => setVisible(false)}
-        onOk={() => {
-          form.setFieldsValue({
-            dms_make: selectedModel.makecode,
-            dms_model: selectedModel.modelcode,
-          });
-          setVisible(false);
-        }}
-      >
-        {error && <AlertComponent error={error.message} />}
-        <Table
-          title={() => (
-            <Input.Search
-              onSearch={(val) => callSearch({ variables: { search: val } })}
-              placeholder={t("general.labels.search")}
-            />
-          )}
-          columns={columns}
-          loading={loading}
-          rowKey="id"
-          dataSource={data ? data.search_dms_vehicles : []}
-          onRow={(record) => {
-            return {
-              onClick: () => setSelectedModel(record),
-            };
-          }}
-          rowSelection={{
-            onSelect: (record) => {
-              setSelectedModel(record);
-            },
-
-            type: "radio",
-            selectedRowKeys: [selectedModel && selectedModel.id],
-          }}
-        />
-      </Modal>
-      <Button
-        onClick={() => {
-          setVisible(true);
-          callSearch({
-            variables: {
-              search: job && job.v_model_desc && job.v_model_desc.substr(0, 3),
-            },
-          });
-        }}
-      >
-        {t("jobs.actions.dms.getmakes")}
-      </Button>
-    </div>
-  );
-}
--- a/client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx
+++ b/client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx
@@ -1,32 +0,0 @@
-import { Button } from "antd";
-import axios from "axios";
-import React, { useState } from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
-  bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(mapStateToProps, mapDispatchToProps)(DmsCdkMakesRefetch);
-
-export function DmsCdkMakesRefetch({ bodyshop, form, socket }) {
-  const [loading, setLoading] = useState(false);
-  const handleRefetch = async () => {
-    setLoading(true);
-    const response = await axios.post("/cdk/getvehicles", {
-      cdk_dealerid: bodyshop.cdk_dealerid,
-      bodyshopid: bodyshop.id,
-    });
-    console.log(response);
-    setLoading(false);
-  };
-  return (
-    <Button loading={loading} onClick={handleRefetch}>
-      Refetch Models
-    </Button>
-  );
-}
--- a/client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
+++ b/client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
@@ -1,105 +0,0 @@
-import { Button, Table } from "antd";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { socket } from "../../pages/dms/dms.container";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { alphaSort } from "../../utils/sorters";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(DmsCustomerSelector);
-
-export function DmsCustomerSelector({ bodyshop }) {
-  const { t } = useTranslation();
-  const [customerList, setcustomerList] = useState([]);
-  const [visible, setVisible] = useState(false);
-  const [selectedCustomer, setSelectedCustomer] = useState(null);
-
-  socket.on("cdk-select-customer", (customerList, callback) => {
-    setVisible(true);
-    setcustomerList(customerList);
-  });
-
-  const onUseSelected = () => {
-    setVisible(false);
-    socket.emit("cdk-selected-customer", selectedCustomer);
-  };
-
-  const onUseGeneric = () => {
-    setVisible(false);
-    socket.emit(
-      "cdk-selected-customer",
-      bodyshop.cdk_configuration.generic_customer_number
-    );
-  };
-
-  const onCreateNew = () => {
-    setVisible(false);
-    socket.emit("cdk-selected-customer", null);
-  };
-
-  const columns = [
-    {
-      title: t("dms.fields.name1"),
-      dataIndex: ["name1", "fullName"],
-      key: "name1",
-      sorter: (a, b) => alphaSort(a.name1?.fullName, b.name1?.fullName),
-    },
-
-    {
-      title: t("dms.fields.address"),
-      //dataIndex: ["name2", "fullName"],
-      key: "address",
-      render: (record, value) =>
-        `${record?.address?.addressLine[0]}, ${record.address?.city} ${record.address?.stateOrProvince} ${record.address?.postalCode}`,
-    },
-  ];
-
-  if (!visible) return <></>;
-  return (
-    <Table
-      title={() => (
-        <div>
-          <Button onClick={onUseSelected} disabled={!selectedCustomer}>
-            {t("jobs.actions.dms.useselected")}
-          </Button>
-          <Button
-            onClick={onUseGeneric}
-            disabled={
-              !(
-                bodyshop.cdk_configuration &&
-                bodyshop.cdk_configuration.generic_customer_number
-              )
-            }
-          >
-            {t("jobs.actions.dms.usegeneric")}
-          </Button>
-          <Button onClick={onCreateNew}>
-            {t("jobs.actions.dms.createnewcustomer")}
-          </Button>
-        </div>
-      )}
-      pagination={{ position: "top" }}
-      columns={columns}
-      rowKey={(record) => record.id.value}
-      dataSource={customerList}
-      //onChange={handleTableChange}
-      rowSelection={{
-        onSelect: (props) => {
-          setSelectedCustomer(props.id.value);
-        },
-        type: "radio",
-        selectedRowKeys: [selectedCustomer],
-      }}
-    />
-  );
-}
--- a/client/src/components/dms-log-events/dms-log-events.component.jsx
+++ b/client/src/components/dms-log-events/dms-log-events.component.jsx
@@ -1,55 +0,0 @@
-import { Divider, Space, Tag, Timeline } from "antd";
-import moment from "moment";
-import React from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import {
-  setBreadcrumbs,
-  setSelectedHeader,
-} from "../../redux/application/application.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
-  setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(DmsLogEvents);
-
-export function DmsLogEvents({ socket, logs, bodyshop }) {
-  return (
-    <Timeline pending reverse={true}>
-      {logs.map((log, idx) => (
-        <Timeline.Item key={idx} color={LogLevelHierarchy(log.level)}>
-          <Space wrap align="start" style={{}}>
-            <Tag color={LogLevelHierarchy(log.level)}>{log.level}</Tag>
-            <span>{moment(log.timestamp).format("MM/DD/YYYY HH:MM:ss")}</span>
-            <Divider type="vertical" />
-            <span>{log.message}</span>
-          </Space>
-        </Timeline.Item>
-      ))}
-    </Timeline>
-  );
-}
-
-function LogLevelHierarchy(level) {
-  switch (level) {
-    case "TRACE":
-      return "pink";
-    case "DEBUG":
-      return "orange";
-    case "INFO":
-      return "blue";
-    case "WARNING":
-      return "yellow";
-    case "ERROR":
-      return "red";
-    default:
-      return 0;
-  }
-}
--- a/client/src/components/dms-post-form/dms-post-form.component.jsx
+++ b/client/src/components/dms-post-form/dms-post-form.component.jsx
@@ -1,308 +0,0 @@
-import { DeleteFilled } from "@ant-design/icons";
-import {
-  Button,
-  Form,
-  Input,
-  InputNumber,
-  Select,
-  Space,
-  Statistic,
-} from "antd";
-import React from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component";
-import CurrencyInput from "../form-items-formatted/currency-form-item.component";
-import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-import Dinero from "dinero.js";
-import { determineDmsType } from "../../pages/dms/dms.container";
-import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component";
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(mapStateToProps, mapDispatchToProps)(DmsPostForm);
-
-export function DmsPostForm({ bodyshop, socket, job }) {
-  const [form] = Form.useForm();
-  const { t } = useTranslation();
-
-  const handlePayerSelect = (value, index) => {
-    form.setFieldsValue({
-      payers: form.getFieldValue("payers").map((payer, mapIndex) => {
-        if (index !== mapIndex) return payer;
-        const cdkPayer =
-          bodyshop.cdk_configuration.payers &&
-          bodyshop.cdk_configuration.payers.find((i) => i.name === value);
-
-        if (!cdkPayer) return payer;
-
-        return {
-          ...cdkPayer,
-          dms_acctnumber: cdkPayer.dms_acctnumber,
-          controlnumber: job && job[cdkPayer.control_type],
-        };
-      }),
-    });
-  };
-
-  const handleFinish = (values) => {
-    socket.emit(`${determineDmsType(bodyshop)}-export-job`, {
-      jobid: job.id,
-      txEnvelope: values,
-    });
-  };
-
-  return (
-    <Form form={form} layout="vertical" onFinish={handleFinish}>
-      <LayoutFormRow>
-        <Form.Item
-          name="journal"
-          label={t("jobs.fields.dms.journal")}
-          initialValue={
-            bodyshop.cdk_configuration &&
-            bodyshop.cdk_configuration.default_journal
-          }
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          name="story"
-          label={t("jobs.fields.dms.story")}
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <Input.TextArea />
-        </Form.Item>
-        <Form.Item
-          name="kmin"
-          label={t("jobs.fields.kmin")}
-          initialValue={job && job.kmin}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <InputNumber disabled />
-        </Form.Item>
-        <Form.Item
-          name="kmout"
-          label={t("jobs.fields.kmout")}
-          initialValue={job && job.kmout}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <InputNumber disabled />
-        </Form.Item>
-        <Form.Item
-          name="dms_make"
-          label={t("jobs.fields.dms.dms_make")}
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <Input disabled />
-        </Form.Item>
-        <Form.Item
-          name="dms_model"
-          label={t("jobs.fields.dms.dms_model")}
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <Input disabled />
-        </Form.Item>
-        <DmsCdkMakes form={form} socket={socket} job={job} />
-        <DmsCdkMakesRefetch />
-      </LayoutFormRow>
-
-      <Form.List name={["payers"]}>
-        {(fields, { add, remove }) => {
-          return (
-            <div>
-              {fields.map((field, index) => (
-                <Form.Item key={field.key}>
-                  <LayoutFormRow>
-                    <Form.Item
-                      label={t("jobs.fields.dms.payer.name")}
-                      key={`${index}name`}
-                      name={[field.name, "name"]}
-                      rules={[
-                        {
-                          required: true,
-                        },
-                      ]}
-                    >
-                      <Select
-                        onSelect={(value) => handlePayerSelect(value, index)}
-                      >
-                        {bodyshop.cdk_configuration &&
-                          bodyshop.cdk_configuration.payers &&
-                          bodyshop.cdk_configuration.payers.map((payer) => (
-                            <Select.Option key={payer.name}>
-                              {payer.name}
-                            </Select.Option>
-                          ))}
-                      </Select>
-                    </Form.Item>
-
-                    <Form.Item
-                      label={t("jobs.fields.dms.payer.dms_acctnumber")}
-                      key={`${index}dms_acctnumber`}
-                      name={[field.name, "dms_acctnumber"]}
-                      rules={[
-                        {
-                          required: true,
-                        },
-                      ]}
-                    >
-                      <Input disabled />
-                    </Form.Item>
-
-                    <Form.Item
-                      label={t("jobs.fields.dms.payer.amount")}
-                      key={`${index}amount`}
-                      name={[field.name, "amount"]}
-                      rules={[
-                        {
-                          required: true,
-                        },
-                      ]}
-                    >
-                      <CurrencyInput min={0} />
-                    </Form.Item>
-
-                    <Form.Item
-                      label={t("jobs.fields.dms.payer.controlnumber")}
-                      key={`${index}controlnumber`}
-                      name={[field.name, "controlnumber"]}
-                      rules={[
-                        {
-                          required: true,
-                        },
-                      ]}
-                    >
-                      <Input />
-                    </Form.Item>
-
-                    <Form.Item shouldUpdate>
-                      {() => {
-                        const payers = form.getFieldValue("payers");
-
-                        const row = payers && payers[index];
-
-                        const cdkPayer =
-                          bodyshop.cdk_configuration.payers &&
-                          bodyshop.cdk_configuration.payers.find(
-                            (i) => i && row && i.name === row.name
-                          );
-
-                        return (
-                          <div>
-                            {cdkPayer &&
-                              t(`jobs.fields.${cdkPayer.control_type}`)}
-                          </div>
-                        );
-                      }}
-                    </Form.Item>
-
-                    <DeleteFilled
-                      onClick={() => {
-                        remove(field.name);
-                      }}
-                    />
-                  </LayoutFormRow>
-                </Form.Item>
-              ))}
-              <Form.Item>
-                <Button
-                  type="dashed"
-                  disabled={!(fields.length < 3)}
-                  onClick={() => {
-                    if (fields.length < 3) add();
-                  }}
-                  style={{ width: "100%" }}
-                >
-                  {t("dms.actions.addpayer")}
-                </Button>
-              </Form.Item>
-            </div>
-          );
-        }}
-      </Form.List>
-      <Form.Item shouldUpdate>
-        {() => {
-          //Perform Calculation to determine discrepancy.
-          let totalAllocated = Dinero();
-
-          const payers = form.getFieldValue("payers");
-          payers &&
-            payers.forEach((payer) => {
-              totalAllocated = totalAllocated.add(
-                Dinero({ amount: Math.round((payer?.amount || 0) * 100) })
-              );
-            });
-          const discrep = Dinero(job.job_totals.totals.total_repairs).subtract(
-            totalAllocated
-          );
-          return (
-            <Space>
-              <Statistic
-                title={t("jobs.labels.dms.totalallocated")}
-                value={totalAllocated.toFormat()}
-              />
-              <Statistic
-                title={t("jobs.fields.subtotal")}
-                value={Dinero(job.job_totals.totals.total_repairs).toFormat()}
-              />
-              <Statistic
-                title={t("jobs.labels.dms.notallocated")}
-                valueStyle={{
-                  color: discrep.getAmount() === 0 ? "green" : "red",
-                }}
-                value={discrep.toFormat()}
-              />
-              <Button //disabled={discrep.getAmount() !== 0} //TODO: REMOVE THIS COMMENT.
-                htmlType="submit"
-              >
-                {t("jobs.actions.dms.post")}
-              </Button>
-              <Button
-                onClick={() => {
-                  socket.emit(`${determineDmsType(bodyshop)}-export-job`, {
-                    jobid: job.id,
-                  });
-                }}
-              >
-                Bypass
-              </Button>
-            </Space>
-          );
-        }}
-      </Form.Item>
-    </Form>
-  );
-}
--- a/client/src/components/fcm-notification/fcm-notification.component.jsx
+++ b/client/src/components/fcm-notification/fcm-notification.component.jsx
@@ -2,7 +2,7 @@ import { withApollo } from "@apollo/client/react/hoc";
 import React, { Component } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-//import { logImEXEvent, messaging } from "../../firebase/firebase.utils";
+import { logImEXEvent, messaging } from "../../firebase/firebase.utils";
 import { selectCurrentUser } from "../../redux/user/user.selectors";

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

  render() {
--- a/client/src/components/global-search/global-search.component.jsx
+++ b/client/src/components/global-search/global-search.component.jsx
@@ -168,6 +168,7 @@ export default function GlobalSearch() {
    <AutoComplete
      options={options}
      onSearch={handleSearch}
+      allowClear
      placeholder={t("general.labels.globalsearch")}
    >
      <Input.Search loading={loading} />
--- a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
+++ b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
@@ -64,16 +64,14 @@ export function JobChecklistForm({
          ...(type === "intake" && { actual_in: new Date() }),
          ...(type === "intake" && {
            production_vars: {
-              ...(job ? job.production_vars : {}),
-
+              ...job.production_vars,
+              ...values.production_vars,
              note:
                values.production_vars &&
                values.production_vars.note &&
                values.production_vars.note !== ""
-                  ? values &&
-                    values.production_vars &&
-                    values.production_vars.note
-                  : job && job.production_vars && job.production_vars.note,
+                  ? job.production_vars && values.production_vars.note
+                  : job.production_vars && job.production_vars.note,
            },
          }),
          ...(type === "intake" && {
@@ -247,7 +245,6 @@ export function JobChecklistForm({
              name={["production_vars", "note"]}
              label={t("jobs.fields.production_vars.note")}
              disabled={readOnly}
-              trigger="onChange"
            >
              <Input.TextArea rows={3} disabled={readOnly} />
            </Form.Item>
--- a/client/src/components/job-line-status-popup/job-line-status-popup.component.jsx
+++ b/client/src/components/job-line-status-popup/job-line-status-popup.component.jsx
@@ -72,7 +72,7 @@ export function JobLineStatusPopup({ bodyshop, jobline, disabled }) {
    );
  return (
    <div
-      style={{ width: "100%", minHeight: "1rem", cursor: "pointer" }}
+      style={{ width: "100%", minHeight: "2rem", cursor: "pointer" }}
      onClick={() => !disabled && setEditing(true)}
    >
      {jobline.status}
--- a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
+++ b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
@@ -1,11 +1,12 @@
 import { useMutation } from "@apollo/client";
-import { Button, Card, Form, InputNumber, notification, Popover } from "antd";
+import { Button, Card, Form, notification, Popover } from "antd";
 import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
+import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";

 export default function ScoreboardAddButton({
  job,
@@ -72,7 +73,7 @@ export default function ScoreboardAddButton({
              },
            ]}
          >
-            <InputNumber precision={1} />
+            <InputNumberCalculator precision={1} />
          </Form.Item>
          <Form.Item
            label={t("scoreboard.fields.painthrs")}
@@ -84,7 +85,7 @@ export default function ScoreboardAddButton({
              },
            ]}
          >
-            <InputNumber precision={1} />
+            <InputNumberCalculator precision={1} />
          </Form.Item>

          <Button type="primary" htmlType="submit">
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -97,24 +97,6 @@ export function JobsAvailableContainer({
      });
      return;
    }
-    //IO-539 Check for Parts Rate on PAL for SGI use case.
-
-    if (
-      estData.est_data.parts_tax_rates &&
-      estData.est_data.parts_tax_rates.PAL &&
-      (estData.est_data.parts_tax_rates.PAL.prt_tax_rt === null ||
-        estData.est_data.parts_tax_rates.PAL.prt_tax_rt === 0)
-    ) {
-      console.log("checking");
-      const res = await confirmDialog(
-        `ImEX Online has detected that there is a missing tax rate for used parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}%.`
-      );
-      if (res) {
-        estData.est_data.parts_tax_rates.PAL.prt_tax_rt =
-          bodyshop.bill_tax_rates.state_tax_rate / 100;
-        estData.est_data.parts_tax_rates.PAL.prt_tax_in = true;
-      }
-    }

    const newTotals = (
      await Axios.post("/job/totals", {
@@ -214,24 +196,6 @@ export function JobsAvailableContainer({
        message: t("jobs.errors.creating", { error: "No job data present." }),
      });
    } else {
-      //IO-539 Check for Parts Rate on PAL for SGI use case.
-      if (
-        estData.est_data.parts_tax_rates &&
-        estData.est_data.parts_tax_rates.PAL &&
-        (estData.est_data.parts_tax_rates.PAL.prt_tax_rt === null ||
-          estData.est_data.parts_tax_rates.PAL.prt_tax_rt === 0)
-      ) {
-        console.log("checking");
-        const res = await confirmDialog(
-          `ImEX Online has detected that there is a missing tax rate for used parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}%.`
-        );
-        if (res) {
-          estData.est_data.parts_tax_rates.PAL.prt_tax_rt =
-            bodyshop.bill_tax_rates.state_tax_rate / 100;
-          estData.est_data.parts_tax_rates.PAL.prt_tax_in = true;
-        }
-      }
-
      //create upsert job
      let supp = replaceEmpty({ ...estData.est_data });

@@ -424,11 +388,3 @@ function replaceEmpty(someObj, replaceValue = null) {
  console.log("Parsed", JSON.parse(temp));
  return JSON.parse(temp);
 }
-
-function confirmDialog(msg) {
-  return new Promise(function (resolve, reject) {
-    let confirmed = window.confirm(msg);
-
-    return confirmed ? resolve(true) : resolve(false);
-  });
-}
--- a/client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx
+++ b/client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx
@@ -1,4 +1,4 @@
-import { Button, Dropdown, Menu } from "antd";
+import { Button } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -12,8 +12,11 @@ const mapStateToProps = createStructuredSelector({

 export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
  const { t } = useTranslation();
+  const handleAllocate = () => {
+    logImEXEvent("jobs_close_allocate_auto");
+
+    const { defaults } = bodyshop.md_responsibility_centers;

-  const handleAllocate = (defaults) => {
    form.setFieldsValue({
      joblines: joblines.map((jl) => {
        const ret = _.cloneDeep(jl);
@@ -45,36 +48,8 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
    });
  };

-  const handleAutoAllocateClick = () => {
-    logImEXEvent("jobs_close_allocate_auto");
-
-    const { defaults } = bodyshop.md_responsibility_centers;
-    handleAllocate(defaults);
-  };
-
-  const handleMenuClick = ({ item, key, keyPath, domEvent }) => {
-    logImEXEvent("jobs_close_allocate_auto_dms");
-    handleAllocate(
-      bodyshop.md_responsibility_centers.dms_defaults.find(
-        (x) => x.name === key
-      )
-    );
-  };
-
-  const overlay = bodyshop.cdk_dealerid && (
-    <Menu onClick={handleMenuClick}>
-      {bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => (
-        <Menu.Item key={mapping.name}>{mapping.name}</Menu.Item>
-      ))}
-    </Menu>
-  );
-
-  return bodyshop.cdk_dealerid ? (
-    <Dropdown overlay={overlay}>
-      <Button disabled={disabled}>{t("jobs.actions.dmsautoallocate")}</Button>
-    </Dropdown>
-  ) : (
-    <Button onClick={handleAutoAllocateClick} disabled={disabled}>
+  return (
+    <Button onClick={handleAllocate} disabled={disabled}>
      {t("jobs.actions.autoallocate")}
    </Button>
  );
--- a/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
+++ b/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
@@ -150,7 +150,7 @@ export function JobsCloseExportButton({
      }
      if (setSelectedJobs) {
        setSelectedJobs((selectedJobs) => {
-          return selectedJobs.filter((i) => i !== jobId);
+          return selectedJobs.filter((i) => i.id !== jobId);
        });
      }
    }
--- a/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
+++ b/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
@@ -10,7 +10,7 @@ import { alphaSort } from "../../utils/sorters";
 import LaborAllocationsAdjustmentEdit from "../labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component";
 import "./labor-allocations-table.styles.scss";
 import { CalculateAllocationsTotals } from "./labor-allocations-table.utility";
-import _ from "lodash";
+
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  technician: selectTechnician,
@@ -113,7 +113,7 @@ export function LaborAllocationsTable({
            color: record.difference >= 0 ? "green" : "red",
          }}
        >
-          {_.round(record.difference, 1)}
+          {record.difference}
        </strong>
      ),
    },
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -106,12 +106,6 @@ export default function PartsOrderModalComponent({
                      label={t("parts_orders.fields.quantity")}
                      key={`${index}quantity`}
                      name={[field.name, "quantity"]}
-                      rules={[
-                        {
-                          required: true,
-                          //message: t("general.validation.required"),
-                        },
-                      ]}
                    >
                      <InputNumber />
                    </Form.Item>
--- a/client/src/components/payable-export-button/payable-export-button.component.jsx
+++ b/client/src/components/payable-export-button/payable-export-button.component.jsx
@@ -145,7 +145,7 @@ export function PayableExportButton({
      }
      if (setSelectedBills) {
        setSelectedBills((selectedBills) => {
-          return selectedBills.filter((i) => i !== billId);
+          return selectedBills.filter((i) => i.id !== billId);
        });
      }
    }
--- a/client/src/components/payment-export-button/payment-export-button.component.jsx
+++ b/client/src/components/payment-export-button/payment-export-button.component.jsx
@@ -145,7 +145,7 @@ export function PaymentExportButton({

      if (setSelectedPayments) {
        setSelectedPayments((selectedBills) => {
-          return selectedBills.filter((i) => i !== paymentId);
+          return selectedBills.filter((i) => i.id !== paymentId);
        });
      }
    }
--- a/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx
+++ b/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx
@@ -6,6 +6,7 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { auth } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_PAYMENTS } from "../../graphql/payments.queries";
 import {
@@ -36,9 +37,15 @@ export function PaymentsExportAllButton({

    let QbXmlResponse;
    try {
-      QbXmlResponse = await axios.post("/accounting/qbxml/payments", {
-        payments: paymentIds,
-      });
+      QbXmlResponse = await axios.post(
+        "/accounting/qbxml/payments",
+        { payments: paymentIds },
+        {
+          headers: {
+            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
+          },
+        }
+      );
    } catch (error) {
      console.log("Error getting QBXML from Server.", error);
      notification["error"]({
--- a/client/src/components/qbo-authorize/qbo-authorize.component.jsx
+++ b/client/src/components/qbo-authorize/qbo-authorize.component.jsx
@@ -1,76 +0,0 @@
-import { Button, Space } from "antd";
-import Axios from "axios";
-import React, { useEffect } from "react";
-//import QboImg from "./qbo_signin.png";
-import queryString from "query-string";
-import { useLocation } from "react-router-dom";
-import { useCookies } from "react-cookie";
-
-export default function QboAuthorizeComponent() {
-  const location = useLocation();
-
-  const [, setCookie] = useCookies(["access_token", "refresh_token"]);
-
-  const handleQbSignIn = async () => {
-    const result = await Axios.post("/qbo/authorize");
-    console.log("pushing to history", result.data);
-    window.location.href = result.data;
-  };
-  const qs = queryString.parse(location.search);
-
-  const { error } = qs;
-
-  useEffect(() => {
-    const { code, state, realmId } = qs;
-    const hasBeenCalledBack = code && realmId && state;
-
-    if (hasBeenCalledBack) {
-      setCookie("qbo_code", code, { path: "/" });
-      setCookie("qbo_state", state, { path: "/" });
-
-      let expires = new Date();
-      expires.setTime(expires.getTime() + 8726400 * 1000);
-
-      setCookie("qbo_realmId", realmId, {
-        path: "/",
-        expires,
-      });
-    }
-  }, [qs, location, setCookie]);
-
-  return (
-    <div>
-      <Space wrap>
-        <Button onClick={handleQbSignIn}>
-          {/* <img
-            src={QboImg}
-            alt="Sign in with Intuit"
-            onClick={handleQbSignIn}
-          /> */}
-          auth
-        </Button>
-        <Button
-          onClick={async () => {
-            const response = await Axios.get(`/qbo/refresh`, {
-              withCredentials: true,
-            });
-            console.log(response);
-          }}
-        >
-          Refresh Token
-        </Button>
-        <Button
-          onClick={async () => {
-            const response = await Axios.post(`/qbo/receivables`, {
-              withCredentials: true,
-            });
-            console.log(response);
-          }}
-        >
-          REC
-        </Button>
-      </Space>
-      {error && JSON.parse(decodeURIComponent(error)).error_description}
-    </div>
-  );
-}
--- a/client/src/components/qbo-authorize/qbo_signin.png
+++ b/client/src/components/qbo-authorize/qbo_signin.png
--- a/client/src/components/rbac-wrapper/rbac-defaults.js
+++ b/client/src/components/rbac-wrapper/rbac-defaults.js
@@ -52,9 +52,8 @@ const ret = {

  "shiftclock:view": 2,

-  "shop:config": 4,
-  "shop:rbac": 5,
  "shop:vendors": 2,
+  "shop:rbac": 1,
  "shop:dashboard": 3,
  "shop:templates": 4,

--- a/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx
+++ b/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx
@@ -17,7 +17,7 @@ import {
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import * as Utils from "../scoreboard-targets-table/scoreboard-targets-table.util";
-import _ from "lodash";
+
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
 });
@@ -52,22 +52,17 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) {

    const theValue = {
      date: moment(val).format("D dd"),
-      paintHrs: _.round(dayhrs.painthrs, 1),
-      bodyHrs: _.round(dayhrs.bodyhrs, 1),
-      accTargetHrs: _.round(
-        Utils.AsOfDateTargetHours(
-          bodyshop.scoreboard_target.dailyBodyTarget +
-            bodyshop.scoreboard_target.dailyPaintTarget,
-          val
-        ),
-        1
+      paintHrs: dayhrs.painthrs,
+      bodyHrs: dayhrs.bodyhrs,
+      accTargetHrs: Utils.AsOfDateTargetHours(
+        bodyshop.scoreboard_target.dailyBodyTarget +
+          bodyshop.scoreboard_target.dailyPaintTarget,
+        val
      ),
-      accHrs: _.round(
+      accHrs:
        acc.length > 0
          ? acc[acc.length - 1].accHrs + dayhrs.painthrs + dayhrs.bodyhrs
          : dayhrs.painthrs + dayhrs.bodyhrs,
-        1
-      ),
    };

    return [...acc, theValue];
--- a/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
+++ b/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
@@ -1,9 +1,10 @@
-import { useMutation } from "@apollo/client";
-import { Button, Card, Dropdown, Form, InputNumber, notification } from "antd";
+import { Button, Card, Dropdown, Form, notification } from "antd";
 import React, { useState } from "react";
+import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
 import { UPDATE_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
+import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";

 export default function ScoreboardEntryEdit({ entry }) {
  const [visible, setVisible] = useState(false);
@@ -63,7 +64,7 @@ export default function ScoreboardEntryEdit({ entry }) {
            },
          ]}
        >
-          <InputNumber precision={1} />
+          <InputNumberCalculator precision={1} />
        </Form.Item>
        <Form.Item
          label={t("scoreboard.fields.painthrs")}
@@ -75,7 +76,7 @@ export default function ScoreboardEntryEdit({ entry }) {
            },
          ]}
        >
-          <InputNumber precision={1} />
+          <InputNumberCalculator precision={1} />
        </Form.Item>

        <Button type="primary" loading={loading} htmlType="submit">
--- a/client/src/components/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -1,9 +1,6 @@
 import { Button, Card, Tabs } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import ShopInfoGeneral from "./shop-info.general.component";
 import ShopInfoIntakeChecklistComponent from "./shop-info.intake.component";
 import ShopInfoLaborRates from "./shop-info.laborrates.component";
@@ -14,15 +11,7 @@ import ShopInfoROStatusComponent from "./shop-info.rostatus.component";
 import ShopInfoSchedulingComponent from "./shop-info.scheduling.component";
 import ShopInfoSpeedPrint from "./shop-info.speedprint.component";

-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoComponent);
-
-export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
+export default function ShopInfoComponent({ form, saveLoading }) {
  const { t } = useTranslation();
  return (
    <Card
@@ -64,7 +53,6 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
        >
          <ShopInfoResponsibilityCenterComponent form={form} />
        </Tabs.TabPane>
-
        <Tabs.TabPane key="checklists" tab={t("bodyshop.labels.checklists")}>
          <ShopInfoIntakeChecklistComponent form={form} />
        </Tabs.TabPane>
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -165,20 +165,6 @@ export default function ShopInfoGeneral({ form }) {
            );
          }}
        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.labels.printlater")}
-          valuePropName="checked"
-          name={["accountingconfig", "printlater"]}
-        >
-          <Switch />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.labels.emaillater")}
-          valuePropName="checked"
-          name={["accountingconfig", "emaillater"]}
-        >
-          <Switch />
-        </Form.Item>
        <Form.Item
          label={t("bodyshop.fields.inhousevendorid")}
          name={"inhousevendorid"}
--- a/client/src/components/shop-info/shop-info.rbac.component.jsx
+++ b/client/src/components/shop-info/shop-info.rbac.component.jsx
@@ -513,18 +513,6 @@ export default function ShopInfoRbacComponent({ form }) {
        >
          <InputNumber />
        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.shop.config")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "shop:config"]}
-        >
-          <InputNumber />
-        </Form.Item>
        <Form.Item
          label={t("bodyshop.fields.rbac.shop.rbac")}
          rules={[
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
--- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx
+++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
@@ -1,10 +1,9 @@
-import { EditFilled } from "@ant-design/icons";
 import { Card, Space, Table } from "antd";
+import { EditFilled } from "@ant-design/icons";
 import moment from "moment";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import {
  selectAuthLevel,
@@ -17,6 +16,8 @@ import RbacWrapper, {
  HasRbacAccess,
 } from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketEnterButton from "../time-ticket-enter-button/time-ticket-enter-button.component";
+import { Link } from "react-router-dom";
+
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  authLevel: selectAuthLevel,
@@ -267,12 +268,8 @@ export function TimeTicketList({
              <Table.Summary.Cell />
              <Table.Summary.Cell />
              <Table.Summary.Cell />
-              <Table.Summary.Cell>
-                {totals.productivehrs.toFixed(1)}
-              </Table.Summary.Cell>
-              <Table.Summary.Cell>
-                {totals.actualhrs.toFixed(1)}
-              </Table.Summary.Cell>
+              <Table.Summary.Cell>{totals.productivehrs}</Table.Summary.Cell>
+              <Table.Summary.Cell>{totals.actualhrs}</Table.Summary.Cell>
              <Table.Summary.Cell>
                {totals.actualhrs === 0 || !totals.actualhrs
                  ? "∞"
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client";
-import { Form, Input, InputNumber, Select, Switch } from "antd";
+import { Form, Input, InputNumber, Select } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -48,9 +48,7 @@ export function TimeTicketModalComponent({
        {emps &&
          emps.rates.map((item) => (
            <Select.Option key={item.cost_center}>
-              {item.cost_center === "timetickets.labels.shift"
-                ? t(item.cost_center)
-                : item.cost_center}
+              {item.cost_center}
            </Select.Option>
          ))}
      </Select>
@@ -113,17 +111,7 @@ export function TimeTicketModalComponent({
            },
          ]}
        >
-          <EmployeeSearchSelect
-            options={employeeAutoCompleteOptions}
-            onSelect={(value) => {
-              console.log(value);
-              const emps =
-                employeeAutoCompleteOptions &&
-                employeeAutoCompleteOptions.filter((e) => e.id === value)[0];
-              console.log(emps);
-              form.setFieldsValue({ flat_rate: emps && emps.flat_rate });
-            }}
-          />
+          <EmployeeSearchSelect options={employeeAutoCompleteOptions} />
        </Form.Item>
        <Form.Item
          shouldUpdate={(prev, cur) => prev.employeeid !== cur.employeeid}
@@ -150,14 +138,6 @@ export function TimeTicketModalComponent({
            );
          }}
        </Form.Item>
-
-        <Form.Item
-          name="flat_rate"
-          label={t("timetickets.fields.flat_rate")}
-          valuePropName="checked"
-        >
-          <Switch />
-        </Form.Item>
      </LayoutFormRow>

      <LayoutFormRow>
--- a/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx
+++ b/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx
@@ -7,7 +7,6 @@ import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import ImEXOnlineLogo from "../../assets/logo192.png";
 import { auth } from "../../firebase/firebase.utils";
-import { checkActionCode } from "@firebase/auth";
 import { validatePasswordResetStart } from "../../redux/user/user.actions";
 import { selectPasswordReset } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
@@ -36,7 +35,7 @@ export function UserValidatePwReset({
  useEffect(() => {
    async function checkCodeValid() {
      try {
-        const codeValid = await checkActionCode(auth, oobCode);
+        const codeValid = await auth.checkActionCode(oobCode);
        console.log("codeValid :>> ", codeValid);
        setCodeValid({ loading: false, ...codeValid });
      } catch (error) {
--- a/client/src/firebase/firebase.utils.js
+++ b/client/src/firebase/firebase.utils.js
@@ -1,18 +1,20 @@
-import { getAnalytics, logEvent } from "firebase/analytics";
-import { initializeApp } from "firebase/app";
-import { getAuth } from "firebase/auth";
-import { getFirestore } from "firebase/firestore";
-//import { getMessaging } from "firebase/messaging";
+import "firebase/analytics";
+import firebase from "firebase/app";
+import "firebase/auth";
+import "firebase/database";
+import "firebase/firestore";
+import "firebase/messaging";
 import { store } from "../redux/store";

 const config = JSON.parse(process.env.REACT_APP_FIREBASE_CONFIG);
-initializeApp(config);
+firebase.initializeApp(config);

-export const auth = getAuth();
-export const firestore = getFirestore();
-export const analytics = getAnalytics();
+export const auth = firebase.auth();
+export const firestore = firebase.firestore();
+export const analytics = firebase.analytics();
+
+export default firebase;

-//export default firebase;
 export const getCurrentUser = () => {
  return new Promise((resolve, reject) => {
    const unsubscribe = auth.onAuthStateChanged((userAuth) => {
@@ -51,17 +53,17 @@ export const updateCurrentPassword = async (password) => {
  // });
 };

-//let messaging;
-// try {
-//   messaging = getMessaging();
-//   // Project Settings => Cloud Messaging => Web Push certificates
-//   messaging.usePublicVapidKey(process.env.REACT_APP_FIREBASE_PUBLIC_VAPID_KEY);
-//   console.log("[FCM UTIL] FCM initialized successfully.");
-// } catch {
-//   console.log("[FCM UTIL] Firebase Messaging is likely unsupported.");
-// }
+let messaging;
+try {
+  messaging = firebase.messaging();
+  // Project Settings => Cloud Messaging => Web Push certificates
+  messaging.usePublicVapidKey(process.env.REACT_APP_FIREBASE_PUBLIC_VAPID_KEY);
+  console.log("[FCM UTIL] FCM initialized successfully.");
+} catch {
+  console.log("[FCM UTIL] Firebase Messaging is likely unsupported.");
+}

-// export { messaging };
+export { messaging };

 export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
  const state = stateProp || store.getState();
@@ -80,59 +82,59 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
    eventName,
    eventParams
  );
-  logEvent(analytics, eventName, eventParams);
+  analytics.logEvent(eventName, eventParams);
 };

-// if (messaging) {
-//   onMessage(async (payload) => {
-//     console.log("[FCM] UTILS Message received. ", payload);
-//     navigator.serviceWorker.getRegistration().then((registration) => {
-//       return registration.showNotification(
-//         "[UTIL]" + payload.notification.title,
-//         payload.notification
-//       );
-//     });
+if (messaging) {
+  messaging.onMessage(async (payload) => {
+    console.log("[FCM] UTILS Message received. ", payload);
+    navigator.serviceWorker.getRegistration().then((registration) => {
+      return registration.showNotification(
+        "[UTIL]" + payload.notification.title,
+        payload.notification
+      );
+    });

-//     // if (!payload.clientId) return;
+    // if (!payload.clientId) return;

-//     // // Get the client.
-//     // const client = await clients.get(payload.clientId);
-//     // // Exit early if we don't get the client.
-//     // // Eg, if it closed.
-//     // if (!client) return;
+    // // Get the client.
+    // const client = await clients.get(payload.clientId);
+    // // Exit early if we don't get the client.
+    // // Eg, if it closed.
+    // if (!client) return;

-//     // // Send a message to the client.
-//     // console.log("Posting to client.");
-//     // client.postMessage({
-//     //   msg: "Hey I just got a fetch from you!",
-//     //   url: payload.request.url,
-//     // });
+    // // Send a message to the client.
+    // console.log("Posting to client.");
+    // client.postMessage({
+    //   msg: "Hey I just got a fetch from you!",
+    //   url: payload.request.url,
+    // });

-//     // [START_EXCLUDE]
-//     // Update the UI to include the received message.
-//     //appendMessage(payload);
+    // [START_EXCLUDE]
+    // Update the UI to include the received message.
+    //appendMessage(payload);

-//     // [END_EXCLUDE]
-//   });
+    // [END_EXCLUDE]
+  });

-//   messaging.onTokenRefresh(() => {
-//     messaging
-//       .getToken()
-//       .then((refreshedToken) => {
-//         console.log("[FCM] Token refreshed.");
-//         // Indicate that the new Instance ID token has not yet been sent to the
-//         // app server.
-//         // setTokenSentToServer(false);
-//         // // Send Instance ID token to app server.
-//         // sendTokenToServer(refreshedToken);
-//         // // [START_EXCLUDE]
-//         // // Display new Instance ID token and clear UI of all previous messages.
-//         // resetUI();
-//         // [END_EXCLUDE]
-//       })
-//       .catch((err) => {
-//         console.log("[FCM] Unable to retrieve refreshed token ", err);
-//         // showToken("Unable to retrieve refreshed token ", err);
-//       });
-//   });
-// }
+  messaging.onTokenRefresh(() => {
+    messaging
+      .getToken()
+      .then((refreshedToken) => {
+        console.log("[FCM] Token refreshed.");
+        // Indicate that the new Instance ID token has not yet been sent to the
+        // app server.
+        // setTokenSentToServer(false);
+        // // Send Instance ID token to app server.
+        // sendTokenToServer(refreshedToken);
+        // // [START_EXCLUDE]
+        // // Display new Instance ID token and clear UI of all previous messages.
+        // resetUI();
+        // [END_EXCLUDE]
+      })
+      .catch((err) => {
+        console.log("[FCM] Unable to retrieve refreshed token ", err);
+        // showToken("Unable to retrieve refreshed token ", err);
+      });
+  });
+}
--- a/client/src/graphql/accounting.queries.js
+++ b/client/src/graphql/accounting.queries.js
@@ -24,10 +24,6 @@ export const QUERY_JOBS_FOR_EXPORT = gql`
      clm_total
      clm_no
      ins_co_nm
-      exportlogs {
-        id
-        successful
-      }
    }
  }
 `;
@@ -41,10 +37,6 @@ export const QUERY_BILLS_FOR_EXPORT = gql`
      invoice_number
      is_credit_memo
      total
-      exportlogs {
-        id
-        successful
-      }
      job {
        id
        ro_number
@@ -81,10 +73,6 @@ export const QUERY_PAYMENTS_FOR_EXPORT = gql`
      transactionid
      paymentnum
      date
-      exportlogs {
-        id
-        successful
-      }
    }
  }
 `;
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -93,7 +93,6 @@ export const QUERY_BODYSHOP = gql`
      features
      attach_pdf_to_email
      tt_allow_post_to_invoiced
-      cdk_configuration
      employees {
        id
        active
@@ -183,7 +182,6 @@ export const UPDATE_SHOP = gql`
        cdk_dealerid
        attach_pdf_to_email
        tt_allow_post_to_invoiced
-        cdk_configuration
        employees {
          id
          first_name
--- a/client/src/graphql/dms.queries.js
+++ b/client/src/graphql/dms.queries.js
@@ -1,13 +0,0 @@
-import { gql } from "@apollo/client";
-
-export const SEARCH_DMS_VEHICLES = gql`
-  query SEARCH_DMS_VEHICLES($search: String) {
-    search_dms_vehicles(args: { search: $search }) {
-      id
-      make
-      makecode
-      model
-      modelcode
-    }
-  }
-`;
--- a/client/src/graphql/jobs-lines.queries.js
+++ b/client/src/graphql/jobs-lines.queries.js
@@ -58,7 +58,6 @@ export const GET_LINE_TICKET_BY_PK = gql`
      jobid
      employeeid
      memo
-      flat_rate
      employee {
        id
        first_name
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -318,7 +318,6 @@ export const QUERY_JOB_COSTING_DETAILS = gql`
        cost_center
        actualhrs
        productivehrs
-        flat_rate
      }
    }
  }
@@ -1726,8 +1725,6 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
      actual_delivery
      scheduled_in
      actual_in
-      kmin
-      kmout
      joblines(where: { removed: { _eq: false } }) {
        id
        removed
@@ -1878,18 +1875,3 @@ export const FIND_JOBS_BY_CLAIM = gql`
    }
  }
 `;
-
-export const QUERY_JOB_EXPORT_DMS = gql`
-  query QUERY_JOB_EXPORT_DMS($id: uuid!) {
-    jobs_by_pk(id: $id) {
-      id
-      ro_number
-      po_number
-      clm_no
-      job_totals
-      kmin
-      kmout
-      v_model_desc
-    }
-  }
-`;
--- a/client/src/graphql/scoreboard.queries.js
+++ b/client/src/graphql/scoreboard.queries.js
@@ -2,10 +2,7 @@ import { gql } from "@apollo/client";

 export const SUBSCRIPTION_SCOREBOARD = gql`
  subscription SUBSCRIPTION_SCOREBOARD($start: date!, $end: date!) {
-    scoreboard(
-      where: { _and: { date: { _gte: $start, _lte: $end } } }
-      order_by: { date: asc }
-    ) {
+    scoreboard(where: { _and: { date: { _gte: $start, _lte: $end } } }) {
      id
      painthrs
      bodyhrs
--- a/client/src/graphql/timetickets.queries.js
+++ b/client/src/graphql/timetickets.queries.js
@@ -14,7 +14,6 @@ export const QUERY_TICKETS_BY_JOBID = gql`
      id
      memo
      jobid
-      flat_rate
      employee {
        employee_number
        first_name
@@ -43,7 +42,6 @@ export const QUERY_TIME_TICKETS_IN_RANGE = gql`
      productivehrs
      memo
      jobid
-      flat_rate
      job {
        id
        ro_number
@@ -74,7 +72,6 @@ export const INSERT_NEW_TIME_TICKET = gql`
        ciecacode
        date
        memo
-        flat_rate
      }
    }
  }
@@ -101,7 +98,6 @@ export const UPDATE_TIME_TICKET = gql`
        updated_at
        jobid
        date
-        flat_rate
        memo
      }
    }
@@ -125,7 +121,6 @@ export const QUERY_ACTIVE_TIME_TICKETS = gql`
      clockon
      memo
      cost_center
-      flat_rate
      jobid
      job {
        id
--- a/client/src/pages/accounting-qbo/accounting-qbo.page.jsx
+++ b/client/src/pages/accounting-qbo/accounting-qbo.page.jsx
@@ -1,47 +0,0 @@
-import React, { useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import QboAuthorizeComponent from "../../components/qbo-authorize/qbo-authorize.component";
-import {
-  setBreadcrumbs,
-  setSelectedHeader,
-} from "../../redux/application/application.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
-  setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
-});
-export function AccountingReceivablesContainer({
-  bodyshop,
-  setBreadcrumbs,
-  setSelectedHeader,
-}) {
-  const { t } = useTranslation();
-
-  useEffect(() => {
-    document.title = t("titles.accounting-qbo");
-    setSelectedHeader("qbo");
-    setBreadcrumbs([
-      {
-        link: "/manage/accounting/qbo",
-        label: t("titles.bc.accounting-qbo"),
-      },
-    ]);
-  }, [t, setBreadcrumbs, setSelectedHeader]);
-
-  return (
-    <div>
-      <QboAuthorizeComponent />
-    </div>
-  );
-}
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(AccountingReceivablesContainer);
--- a/client/src/pages/dms/dms.container.jsx
+++ b/client/src/pages/dms/dms.container.jsx
@@ -1,25 +1,16 @@
-import { useQuery } from "@apollo/client";
-import { Button, Col, Result, Row, Select, Space } from "antd";
-import queryString from "query-string";
+import { Result, Timeline, Space, Tag, Divider, Button } from "antd";
 import React, { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import SocketIO from "socket.io-client";
-import AlertComponent from "../../components/alert/alert.component";
-import DmsAllocationsSummary from "../../components/dms-allocations-summary/dms-allocations-summary.component";
-import DmsCustomerSelector from "../../components/dms-customer-selector/dms-customer-selector.component";
-import DmsLogEvents from "../../components/dms-log-events/dms-log-events.component";
-import DmsPostForm from "../../components/dms-post-form/dms-post-form.component";
-import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
-import { auth } from "../../firebase/firebase.utils";
-import { QUERY_JOB_EXPORT_DMS } from "../../graphql/jobs.queries";
 import {
  setBreadcrumbs,
  setSelectedHeader,
 } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
+import SocketIO from "socket.io-client";
+import { auth } from "../../firebase/firebase.utils";
+import moment from "moment";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -47,15 +38,7 @@ export const socket = SocketIO(

 export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
  const { t } = useTranslation();
-  const [logLevel, setLogLevel] = useState("TRACE");
  const [logs, setLogs] = useState([]);
-  const search = queryString.parse(useLocation().search);
-  const { jobId } = search;
-
-  const { loading, error, data } = useQuery(QUERY_JOB_EXPORT_DMS, {
-    variables: { id: jobId },
-    skip: !jobId,
-  });

  useEffect(() => {
    document.title = t("titles.dms");
@@ -72,18 +55,6 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
    socket.on("connected", () => {
      console.log("Connected again.");
    });
-    socket.on("reconnect", () => {
-      setLogs((logs) => {
-        return [
-          ...logs,
-          {
-            timestamp: new Date(),
-            level: "WARNING",
-            message: "Reconnected to CDK Export Service",
-          },
-        ];
-      });
-    });

    socket.on("log-event", (payload) => {
      setLogs((logs) => {
@@ -92,63 +63,75 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
    });

    socket.connect();
-    socket.emit("set-log-level", logLevel);
+    socket.emit("set-log-level", "TRACE");

    return () => {
      socket.removeAllListeners();
      socket.disconnect();
    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, []);

-  if (!jobId || !bodyshop.cdk_dealerid || !(data && data.jobs_by_pk))
-    return <Result status="404" />;
+  if (!bodyshop.cdk_dealerid) return <Result status="404" />;

-  if (loading) return <LoadingSpinner />;
-  if (error) return <AlertComponent message={error.message} type="error" />;
+  const dmsType = determineDmsType(bodyshop);

  return (
    <div>
-      <Row gutter={32}>
-        <Col span={18}>
-          {data && data.jobs_by_pk && data.jobs_by_pk.ro_number}
-          <DmsAllocationsSummary socket={socket} jobId={jobId} />
-          <DmsPostForm
-            socket={socket}
-            jobId={jobId}
-            job={data && data.jobs_by_pk}
-          />
-        </Col>
-        <Col span={6}>
-          <Space>
-            <Select
-              placeholder="Log Level"
-              value={logLevel}
-              onChange={(value) => {
-                setLogLevel(value);
-                socket.emit("set-log-level", value);
-              }}
-            >
-              <Select.Option key="TRACE">TRACE</Select.Option>
-              <Select.Option key="DEBUG">DEBUG</Select.Option>
-              <Select.Option key="INFO">INFO</Select.Option>
-              <Select.Option key="WARNING">WARNING</Select.Option>
-              <Select.Option key="ERROR">ERROR</Select.Option>
-            </Select>
-            <Button onClick={() => setLogs([])}>Clear Logs</Button>
-          </Space>
-          <div style={{ maxHeight: "500px", overflowY: "auto" }}>
-            <DmsLogEvents socket={socket} logs={logs} />
-          </div>
-        </Col>
-      </Row>
+      <Button
+        onClick={() => {
+          socket.emit(
+            `${dmsType}-export-job`,
+            "752a4f5f-22ab-414b-b182-98d4e62227ef"
+          );
+        }}
+      >
+        Export
+      </Button>

-      <DmsCustomerSelector />
+      <Button
+        onClick={() => {
+          setLogs([]);
+          socket.disconnect();
+          socket.connect();
+        }}
+      >
+        reconnect
+      </Button>
+
+      <Timeline pending={socket.connected && "Processing..."} reverse={true}>
+        {logs.map((log, idx) => (
+          <Timeline.Item key={idx} color={LogLevelHierarchy(log.level)}>
+            <Space wrap align="start" style={{}}>
+              <Tag color={LogLevelHierarchy(log.level)}>{log.level}</Tag>
+              <span>{moment(log.timestamp).format("MM/DD/YYYY HH:MM:ss")}</span>
+              <Divider type="vertical" />
+              <span>{log.message}</span>
+            </Space>
+          </Timeline.Item>
+        ))}
+      </Timeline>
    </div>
  );
 }

-export const determineDmsType = (bodyshop) => {
+function LogLevelHierarchy(level) {
+  switch (level) {
+    case "TRACE":
+      return "pink";
+    case "DEBUG":
+      return "orange";
+    case "INFO":
+      return "blue";
+    case "WARNING":
+      return "yellow";
+    case "ERROR":
+      return "red";
+    default:
+      return 0;
+  }
+}
+
+const determineDmsType = (bodyshop) => {
  if (bodyshop.cdk_dealerid) return "cdk";
  else {
    return "pbs";
--- a/client/src/pages/jobs-close/jobs-close.component.jsx
+++ b/client/src/pages/jobs-close/jobs-close.component.jsx
@@ -8,7 +8,6 @@ import {
  Alert,
  Divider,
  PageHeader,
-  InputNumber,
 } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -57,8 +56,6 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
          actual_in: values.actual_in,
          actual_completion: values.actual_completion,
          actual_delivery: values.actual_delivery,
-          kmin: values.kmin,
-          kmout: values.kmout,
        },
      },
      refetchQueries: ["QUERY_JOB_CLOSE_DETAILS"],
@@ -66,7 +63,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
    });

    if (!result.errors) {
-      // notification["success"]({ message: t("jobs.successes.save") });
+      notification["success"]({ message: t("jobs.successes.save") });
      //  form.resetFields();
    } else {
      notification["error"]({
@@ -115,8 +112,6 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
          actual_delivery: job.actual_delivery
            ? moment(job.actual_delivery)
            : job.scheduled_delivery && moment(job.scheduled_delivery),
-          kmin: job.kmin,
-          kmout: job.kmout,
        }}
        scrollToFirstError
      >
@@ -208,45 +203,6 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
          >
            <DateTimePicker disabled={jobRO} />
          </Form.Item>
-          {bodyshop.cdk_dealerid && (
-            <Form.Item
-              label={t("jobs.fields.kmin")}
-              name="kmin"
-              rules={[
-                {
-                  required: true,
-                },
-              ]}
-            >
-              <InputNumber disabled={jobRO} />
-            </Form.Item>
-          )}
-          {bodyshop.cdk_dealerid && (
-            <Form.Item
-              label={t("jobs.fields.kmout")}
-              name="kmout"
-              dependencies={["kmin"]}
-              hasFeedback
-              rules={[
-                {
-                  required: true,
-                },
-                ({ getFieldValue }) => ({
-                  validator(_, value) {
-                    if (!value || getFieldValue("kmin") <= value) {
-                      return Promise.resolve();
-                    }
-
-                    return Promise.reject(
-                      new Error(t("jobs.labels.dms.kmoutnotgreaterthankmin"))
-                    );
-                  },
-                }),
-              ]}
-            >
-              <InputNumber disabled={jobRO} />
-            </Form.Item>
-          )}
        </LayoutFormRow>
        <Divider />
        <JobsCloseLines job={job} />
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -116,9 +116,6 @@ const JobChecklistView = lazy(() =>
 const JobDeliver = lazy(() =>
  import("../jobs-deliver/jobs-delivery.page.container")
 );
-const AccountingQboCallback = lazy(() =>
-  import("../accounting-qbo/accounting-qbo.page")
-);
 const AccountingReceivables = lazy(() =>
  import("../accounting-receivables/accounting-receivables.container")
 );
@@ -336,13 +333,6 @@ export function Manage({ match, conflict, bodyshop }) {
        path={`${match.path}/shop/csi`}
        component={ShopCsiPageContainer}
      />
-
-      <Route
-        exact
-        path={`${match.path}/accounting/qbo`}
-        component={AccountingQboCallback}
-      />
-
      <Route
        exact
        path={`${match.path}/accounting/receivables`}
--- a/client/src/pages/shop/shop.page.component.jsx
+++ b/client/src/pages/shop/shop.page.component.jsx
@@ -4,7 +4,6 @@ import { useTranslation } from "react-i18next";
 import ShopEmployeesContainer from "../../components/shop-employees/shop-employees.container";
 import ShopInfoContainer from "../../components/shop-info/shop-info.container";
 import ShopCsiConfig from "../../components/shop-csi-config/shop-csi-config.component";
-import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";

 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -36,22 +35,20 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
  }, [t, setSelectedHeader, setBreadcrumbs, bodyshop.shopname]);

  return (
-    <RbacWrapper action="shop:config">
-      <Tabs>
-        <Tabs.TabPane tab={t("bodyshop.labels.shopinfo")} key="info">
-          <ShopInfoContainer />
-        </Tabs.TabPane>
-        <Tabs.TabPane tab={t("bodyshop.labels.employees")} key="employees">
-          <ShopEmployeesContainer />
-        </Tabs.TabPane>
-        <Tabs.TabPane tab={t("bodyshop.labels.licensing")} key="licensing">
-          <ShopInfoUsersComponent />
-        </Tabs.TabPane>
-        <Tabs.TabPane tab={t("bodyshop.labels.csiq")} key="csiq">
-          <ShopCsiConfig />
-        </Tabs.TabPane>
-      </Tabs>
-    </RbacWrapper>
+    <Tabs>
+      <Tabs.TabPane tab={t("bodyshop.labels.shopinfo")} key="info">
+        <ShopInfoContainer />
+      </Tabs.TabPane>
+      <Tabs.TabPane tab={t("bodyshop.labels.employees")} key="employees">
+        <ShopEmployeesContainer />
+      </Tabs.TabPane>
+      <Tabs.TabPane tab={t("bodyshop.labels.licensing")} key="licensing">
+        <ShopInfoUsersComponent />
+      </Tabs.TabPane>
+      <Tabs.TabPane tab={t("bodyshop.labels.csiq")} key="csiq">
+        <ShopCsiConfig />
+      </Tabs.TabPane>
+    </Tabs>
  );
 }
 export default connect(mapStateToProps, mapDispatchToProps)(ShopPage);
--- a/client/src/redux/dms/dms.actions.js
+++ b/client/src/redux/dms/dms.actions.js
@@ -0,0 +1,6 @@
+import DmsActions from "./dms.types";
+
+export const endLoading = (options) => ({
+  //  type: DmsActions.END_LOADING,
+  payload: options,
+});
--- a/client/src/redux/dms/dms.reducer.js
+++ b/client/src/redux/dms/dms.reducer.js
@@ -0,0 +1,20 @@
+import DmsActionTypes from "./dms.types";
+
+const INITIAL_STATE = {
+  eventLog: [],
+};
+
+const dmsReducer = (state = INITIAL_STATE, action) => {
+  switch (action.type) {
+    // case ApplicationActionTypes.SET_SELECTED_HEADER:
+    //   return {
+    //     ...state,
+    //     selectedHeader: action.payload,
+    //   };
+
+    default:
+      return state;
+  }
+};
+
+export default dmsReducer;
--- a/client/src/redux/dms/dms.sagas.js
+++ b/client/src/redux/dms/dms.sagas.js
@@ -0,0 +1,14 @@
+import { all, call } from "redux-saga/effects";
+//import DmsActionTypes from "./dms.types";
+
+export function* onCalculateScheduleLoad() {
+  //   yield takeLatest(
+  //     DmsActionTypes.CALCULATE_SCHEDULE_LOAD,
+  //     calculateScheduleLoad
+  //   );
+}
+export function* calculateScheduleLoad({ payload: end }) {}
+
+export function* dmsSagas() {
+  yield all([call()]);
+}
--- a/client/src/redux/dms/dms.selectors.js
+++ b/client/src/redux/dms/dms.selectors.js
@@ -0,0 +1,8 @@
+import { createSelector } from "reselect";
+
+const selectDms = (state) => state.dms;
+
+export const selectEventLog = createSelector(
+  [selectDms],
+  (dms) => dms.eventLog
+);
--- a/client/src/redux/dms/dms.types.js
+++ b/client/src/redux/dms/dms.types.js
@@ -0,0 +1,4 @@
+const DmsActionTypes = {
+  ADD_EVENT: "ADD_EVENT",
+};
+export default DmsActionTypes;
--- a/client/src/redux/store.js
+++ b/client/src/redux/store.js
@@ -27,7 +27,7 @@ const middlewares = [
 if (process.env.NODE_ENV === "development") {
  middlewares.push(createLogger({ collapsed: true, diff: true }));
 }
-//middlewares.push(Tracker.use(trackerRedux()));
+
 const composeEnhancers =
  typeof window === "object" && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
    ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -1,20 +1,12 @@
 import Fingerprint2 from "@fingerprintjs/fingerprintjs";
-import * as Sentry from "@sentry/browser";
 import { notification } from "antd";
-import { auth, analytics, firestore } from "../../firebase/firebase.utils";
-import { setUserId, setUserProperties } from "firebase/analytics";
-import {
-  checkActionCode,
-  confirmPasswordReset,
-  signInWithEmailAndPassword,
-  signOut,
-} from "firebase/auth";
-import { doc } from "firebase/firestore";
 import i18next from "i18next";
 import LogRocket from "logrocket";
 import { all, call, delay, put, select, takeLatest } from "redux-saga/effects";
-import { tracker } from "../../App/App.container";
 import {
+  analytics,
+  auth,
+  firestore,
  getCurrentUser,
  logImEXEvent,
  updateCurrentUser,
@@ -36,6 +28,7 @@ import {
  validatePasswordResetSuccess,
 } from "./user.actions";
 import UserActionTypes from "./user.types";
+import * as Sentry from "@sentry/browser";

 export function* onEmailSignInStart() {
  yield takeLatest(UserActionTypes.EMAIL_SIGN_IN_START, signInWithEmail);
@@ -44,7 +37,7 @@ export function* signInWithEmail({ payload: { email, password } }) {
  try {
    logImEXEvent("redux_sign_in_attempt", { user: email });

-    const { user } = yield signInWithEmailAndPassword(auth, email, password);
+    const { user } = yield auth.signInWithEmailAndPassword(email, password);

    yield put(
      signInSuccess({
@@ -75,7 +68,6 @@ export function* isUserAuthenticated() {
    }

    LogRocket.identify(user.email);
-    tracker.setUserID(user.email);
    yield put(
      signInSuccess({
        uid: user.uid,
@@ -96,7 +88,7 @@ export function* signOutStart() {
  try {
    logImEXEvent("redux_sign_out");

-    yield signOut(auth);
+    yield auth.signOut();
    yield put(signOutSuccess());
    localStorage.removeItem("token");
  } catch (error) {
@@ -110,7 +102,10 @@ export function* onUpdateUserDetails() {
 export function* updateUserDetails(userDetails) {
  try {
    const updatedDetails = yield updateCurrentUser(userDetails.payload);
-
+    console.log(
+      "🚀  ~ file: user.sagas.js  ~ line 104  ~ updatedDetails",
+      updatedDetails
+    );
    yield put(updateUserDetailsSuccess(updatedDetails));
    notification.open({
      type: "success",
@@ -125,7 +120,7 @@ export function* onSetInstanceId() {
 }
 export function* setInstanceIdSaga({ payload: uid }) {
  try {
-    const userInstanceRef = doc(firestore, `userInstance/${uid}`);
+    const userInstanceRef = firestore.doc(`userInstance/${uid}`);

    const fingerprint = Fingerprint2.x64hash128(
      (yield Fingerprint2.getPromise({})).map((c) => c.value).join(""),
@@ -150,7 +145,7 @@ export function* onCheckInstanceId() {
 }
 export function* checkInstanceIdSaga({ payload: uid }) {
  try {
-    const userInstanceRef = doc(firestore, `userInstance/${uid}`);
+    const userInstanceRef = firestore.doc(`userInstance/${uid}`);

    const snapshot = yield userInstanceRef.get();
    let fingerprint = yield select((state) => state.user.fingerprint);
@@ -174,8 +169,6 @@ export function* onSignInSuccess() {

 export function* signInSuccessSaga({ payload }) {
  LogRocket.identify(payload.email);
-  tracker.setUserID(payload.email);
-
  try {
    // window.$crisp.push(["set", "user:email", [payload.email]]);
    console.log("$crisp set nickname", [payload.displayName || payload.email]);
@@ -196,8 +189,8 @@ export function* signInSuccessSaga({ payload }) {
  }

  // if (!payload.email.includes("@imex.")) yield put(setInstanceId(payload.uid));
-  setUserId(analytics, payload.email);
-  setUserProperties(analytics, payload);
+  analytics.setUserId(payload.email);
+  analytics.setUserProperties(payload);
  yield logImEXEvent("redux_sign_in_success");
 }

@@ -213,7 +206,7 @@ export function* onSendPasswordResetStart() {
 }
 export function* sendPasswordResetEmail({ payload }) {
  try {
-    yield sendPasswordResetEmail(payload, {
+    yield auth.sendPasswordResetEmail(payload, {
      url: "https://imex.online/passwordreset",
    });

@@ -231,8 +224,8 @@ export function* onValidatePasswordResetStart() {
 }
 export function* validatePasswordResetStart({ payload: { password, code } }) {
  try {
-    checkActionCode(auth, code);
-    yield confirmPasswordReset(auth, code, password);
+    auth.checkActionCode(code);
+    yield auth.confirmPasswordReset(code, password);
    yield put(validatePasswordResetSuccess());
  } catch (error) {
    console.log("function*validatePasswordResetStart -> error", error);
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -231,15 +231,6 @@
 				"deliver": {
 					"templates": "Delivery Templates"
 				},
-				"dms": {
-					"cashierid": "Cashier ID",
-					"default_journal": "Default Journal",
-					"dms_acctnumber": "DMS Account #",
-					"dms_wip_acctnumber": "DMS W.I.P.  Account #",
-					"generic_customer_number": "Generic Customer Number",
-					"mappingname": "DMS Mapping Name",
-					"srcco": "Source Company #/Dealer #"
-				},
 				"email": "General Shop Email",
 				"enforce_class": "Enforce Class on Conversion?",
 				"enforce_referral": "Enforce Referrals",
@@ -355,7 +346,6 @@
 						"view": "Shift Clock -> View"
 					},
 					"shop": {
-						"config": "Shop -> Config",
 						"dashboard": "Shop -> Dashboard",
 						"rbac": "Shop -> RBAC",
 						"templates": "Shop -> Templates",
@@ -477,14 +467,6 @@
 				"defaultcostsmapping": "Default Costs Mapping",
 				"defaultprofitsmapping": "Default Profits Mapping",
 				"deliverchecklist": "Delivery Checklist",
-				"dms": {
-					"cdk": {
-						"payers": "CDK Payers"
-					},
-					"cdk_dealerid": "CDK Dealer ID",
-					"title": "DMS"
-				},
-				"emaillater": "Email Later",
 				"employees": "Employees",
 				"insurancecos": "Insurance Companies",
 				"intakechecklist": "Intake Checklist",
@@ -496,7 +478,6 @@
 				"notespresets": "Notes Presets",
 				"orderstatuses": "Order Statuses",
 				"partslocations": "Parts Locations",
-				"printlater": "Print Later",
 				"rbac": "Role Based Access Control",
 				"responsibilitycenters": {
 					"costs": "Cost Centers",
@@ -834,9 +815,6 @@
 		"exportlogs": {
 			"fields": {
 				"createdat": "Created At"
-			},
-			"labels": {
-				"attempts": "Export Attempts"
 			}
 		},
 		"general": {
@@ -1073,15 +1051,6 @@
 				"changestatus": "Change Status",
 				"convert": "Convert",
 				"deliver": "Deliver",
-				"dms": {
-					"addpayer": "Add Payer",
-					"createnewcustomer": "Create New Customer",
-					"getmakes": "Get Makes",
-					"post": "Post",
-					"usegeneric": "Use Generic Customer",
-					"useselected": "Use Selected Customer"
-				},
-				"dmsautoallocate": "DMS Auto Allocate",
 				"export": "Export",
 				"exportcustdata": "Export Customer Data",
 				"exportselected": "Export Selected",
@@ -1161,27 +1130,6 @@
 				"ded_amt": "Deductible",
 				"ded_status": "Deductible Status",
 				"depreciation_taxes": "Depreciation/Taxes",
-				"dms": {
-					"address": "Customer Address",
-					"center": "Center",
-					"cost": "Cost",
-					"cost_dms_acctnumber": "Cost DMS Acct #",
-					"dms_make": "DMS Make",
-					"dms_model": "DMS Model",
-					"dms_wip_acctnumber": "Cost WIP DMS Acct #",
-					"journal": "Journal #",
-					"name1": "Customer Name",
-					"payer": {
-						"amount": "Amount",
-						"control_type": "Control Type",
-						"controlnumber": "Control Number",
-						"dms_acctnumber": "DMS Account #",
-						"name": "Payer Name"
-					},
-					"sale": "Sale",
-					"sale_dms_acctnumber": "Sale DMS Acct #",
-					"story": "Story"
-				},
 				"driveable": "Driveable",
 				"employee_body": "Body",
 				"employee_csr": "Customer Service Rep.",
@@ -1401,11 +1349,6 @@
 				"deliverchecklist": "Deliver Checklist",
 				"difference": "Difference",
 				"diskscan": "Scan Disk for Estimates",
-				"dms": {
-					"kmoutnotgreaterthankmin": "Mileage out must be greater than mileage in.",
-					"notallocated": "Not Allocated",
-					"totalallocated": "Total Amount Allocated"
-				},
 				"documents": "Documents",
 				"documents-images": "Images",
 				"documents-other": "Other Documents",
@@ -1453,7 +1396,7 @@
 					"partstotal": "This is the total of all parts and sublet amounts on the vehicle (some of these may require an in-house invoice).<br/>\nItems such as shop and paint materials, labor online lines, etc. are not included in this total.",
 					"totalreturns": "The total amount of returns created for this job."
 				},
-				"prt_dsmk_total": "Line Item Adjustment",
+				"prt_dsmk_total": "Line Item Markup",
 				"rates": "Rates",
 				"rates_subtotal": "All Rates Subtotal",
 				"reconciliation": {
@@ -2147,11 +2090,6 @@
 				"updated": "Scoreboard updated."
 			}
 		},
-		"scoredboard": {
-			"successes": {
-				"updated": "Scoreboard entry updated."
-			}
-		},
 		"tech": {
 			"fields": {
 				"employeeid": "Employee ID",
@@ -2195,7 +2133,6 @@
 				"date": "Ticket Date",
 				"efficiency": "Efficiency",
 				"employee": "Employee",
-				"flat_rate": "Flat Rate?",
 				"memo": "Memo",
 				"productivehrs": "Productive Hours",
 				"ro_number": "Job to Post Against"
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -231,15 +231,6 @@
 				"deliver": {
 					"templates": ""
 				},
-				"dms": {
-					"cashierid": "",
-					"default_journal": "",
-					"dms_acctnumber": "",
-					"dms_wip_acctnumber": "",
-					"generic_customer_number": "",
-					"mappingname": "",
-					"srcco": ""
-				},
 				"email": "",
 				"enforce_class": "",
 				"enforce_referral": "",
@@ -355,7 +346,6 @@
 						"view": ""
 					},
 					"shop": {
-						"config": "",
 						"dashboard": "",
 						"rbac": "",
 						"templates": "",
@@ -477,14 +467,6 @@
 				"defaultcostsmapping": "",
 				"defaultprofitsmapping": "",
 				"deliverchecklist": "",
-				"dms": {
-					"cdk": {
-						"payers": ""
-					},
-					"cdk_dealerid": "",
-					"title": ""
-				},
-				"emaillater": "",
 				"employees": "",
 				"insurancecos": "",
 				"intakechecklist": "",
@@ -496,7 +478,6 @@
 				"notespresets": "",
 				"orderstatuses": "",
 				"partslocations": "",
-				"printlater": "",
 				"rbac": "",
 				"responsibilitycenters": {
 					"costs": "",
@@ -834,9 +815,6 @@
 		"exportlogs": {
 			"fields": {
 				"createdat": ""
-			},
-			"labels": {
-				"attempts": ""
 			}
 		},
 		"general": {
@@ -1073,15 +1051,6 @@
 				"changestatus": "Cambiar Estado",
 				"convert": "Convertir",
 				"deliver": "",
-				"dms": {
-					"addpayer": "",
-					"createnewcustomer": "",
-					"getmakes": "",
-					"post": "",
-					"usegeneric": "",
-					"useselected": ""
-				},
-				"dmsautoallocate": "",
 				"export": "",
 				"exportcustdata": "",
 				"exportselected": "",
@@ -1161,27 +1130,6 @@
 				"ded_amt": "Deducible",
 				"ded_status": "Estado deducible",
 				"depreciation_taxes": "Depreciación / Impuestos",
-				"dms": {
-					"address": "",
-					"center": "",
-					"cost": "",
-					"cost_dms_acctnumber": "",
-					"dms_make": "",
-					"dms_model": "",
-					"dms_wip_acctnumber": "",
-					"journal": "",
-					"name1": "",
-					"payer": {
-						"amount": "",
-						"control_type": "",
-						"controlnumber": "",
-						"dms_acctnumber": "",
-						"name": ""
-					},
-					"sale": "",
-					"sale_dms_acctnumber": "",
-					"story": ""
-				},
 				"driveable": "",
 				"employee_body": "",
 				"employee_csr": "Representante de servicio al cliente.",
@@ -1401,11 +1349,6 @@
 				"deliverchecklist": "",
 				"difference": "",
 				"diskscan": "",
-				"dms": {
-					"kmoutnotgreaterthankmin": "",
-					"notallocated": "",
-					"totalallocated": ""
-				},
 				"documents": "documentos",
 				"documents-images": "",
 				"documents-other": "",
@@ -2147,11 +2090,6 @@
 				"updated": ""
 			}
 		},
-		"scoredboard": {
-			"successes": {
-				"updated": ""
-			}
-		},
 		"tech": {
 			"fields": {
 				"employeeid": "",
@@ -2195,7 +2133,6 @@
 				"date": "",
 				"efficiency": "",
 				"employee": "",
-				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
 				"ro_number": ""
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -231,15 +231,6 @@
 				"deliver": {
 					"templates": ""
 				},
-				"dms": {
-					"cashierid": "",
-					"default_journal": "",
-					"dms_acctnumber": "",
-					"dms_wip_acctnumber": "",
-					"generic_customer_number": "",
-					"mappingname": "",
-					"srcco": ""
-				},
 				"email": "",
 				"enforce_class": "",
 				"enforce_referral": "",
@@ -355,7 +346,6 @@
 						"view": ""
 					},
 					"shop": {
-						"config": "",
 						"dashboard": "",
 						"rbac": "",
 						"templates": "",
@@ -477,14 +467,6 @@
 				"defaultcostsmapping": "",
 				"defaultprofitsmapping": "",
 				"deliverchecklist": "",
-				"dms": {
-					"cdk": {
-						"payers": ""
-					},
-					"cdk_dealerid": "",
-					"title": ""
-				},
-				"emaillater": "",
 				"employees": "",
 				"insurancecos": "",
 				"intakechecklist": "",
@@ -496,7 +478,6 @@
 				"notespresets": "",
 				"orderstatuses": "",
 				"partslocations": "",
-				"printlater": "",
 				"rbac": "",
 				"responsibilitycenters": {
 					"costs": "",
@@ -834,9 +815,6 @@
 		"exportlogs": {
 			"fields": {
 				"createdat": ""
-			},
-			"labels": {
-				"attempts": ""
 			}
 		},
 		"general": {
@@ -1073,15 +1051,6 @@
 				"changestatus": "Changer le statut",
 				"convert": "Convertir",
 				"deliver": "",
-				"dms": {
-					"addpayer": "",
-					"createnewcustomer": "",
-					"getmakes": "",
-					"post": "",
-					"usegeneric": "",
-					"useselected": ""
-				},
-				"dmsautoallocate": "",
 				"export": "",
 				"exportcustdata": "",
 				"exportselected": "",
@@ -1161,27 +1130,6 @@
 				"ded_amt": "Déductible",
 				"ded_status": "Statut de franchise",
 				"depreciation_taxes": "Amortissement / taxes",
-				"dms": {
-					"address": "",
-					"center": "",
-					"cost": "",
-					"cost_dms_acctnumber": "",
-					"dms_make": "",
-					"dms_model": "",
-					"dms_wip_acctnumber": "",
-					"journal": "",
-					"name1": "",
-					"payer": {
-						"amount": "",
-						"control_type": "",
-						"controlnumber": "",
-						"dms_acctnumber": "",
-						"name": ""
-					},
-					"sale": "",
-					"sale_dms_acctnumber": "",
-					"story": ""
-				},
 				"driveable": "",
 				"employee_body": "",
 				"employee_csr": "représentant du service à la clientèle",
@@ -1401,11 +1349,6 @@
 				"deliverchecklist": "",
 				"difference": "",
 				"diskscan": "",
-				"dms": {
-					"kmoutnotgreaterthankmin": "",
-					"notallocated": "",
-					"totalallocated": ""
-				},
 				"documents": "Les documents",
 				"documents-images": "",
 				"documents-other": "",
@@ -2147,11 +2090,6 @@
 				"updated": ""
 			}
 		},
-		"scoredboard": {
-			"successes": {
-				"updated": ""
-			}
-		},
 		"tech": {
 			"fields": {
 				"employeeid": "",
@@ -2195,7 +2133,6 @@
 				"date": "",
 				"efficiency": "",
 				"employee": "",
-				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
 				"ro_number": ""
--- a/client/src/utils/CleanAxios.js
+++ b/client/src/utils/CleanAxios.js
@@ -14,7 +14,6 @@ export const axiosAuthInterceptorId = axios.interceptors.request.use(
        config.headers.Authorization = `Bearer ${token}`;
      }
    }
-
    return config;
  },
  (error) => Promise.reject(error)
--- a/client/yarn.lock
+++ b/client/yarn.lock
--- a/hasura/migrations/1628544240019_alter_table_public_bodyshops_add_column_cdk_configuration/down.yaml
+++ b/hasura/migrations/1628544240019_alter_table_public_bodyshops_add_column_cdk_configuration/down.yaml
@@ -1,5 +0,0 @@
- args:
-    cascade: false
-    read_only: false
-    sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "cdk_configuration";
-  type: run_sql
--- a/hasura/migrations/1628544240019_alter_table_public_bodyshops_add_column_cdk_configuration/up.yaml
+++ b/hasura/migrations/1628544240019_alter_table_public_bodyshops_add_column_cdk_configuration/up.yaml
@@ -1,5 +0,0 @@
- args:
-    cascade: false
-    read_only: false
-    sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "cdk_configuration" jsonb NULL;
-  type: run_sql
--- a/hasura/migrations/1628544252299_update_permission_user_public_table_bodyshops/down.yaml
+++ b/hasura/migrations/1628544252299_update_permission_user_public_table_bodyshops/down.yaml
@@ -1,89 +0,0 @@
- args:
-    role: user
-    table:
-      name: bodyshops
-      schema: public
-  type: drop_select_permission
- args:
-    permission:
-      allow_aggregations: false
-      columns:
-      - accountingconfig
-      - address1
-      - address2
-      - appt_alt_transport
-      - appt_colors
-      - appt_length
-      - attach_pdf_to_email
-      - bill_tax_rates
-      - cdk_dealerid
-      - city
-      - country
-      - created_at
-      - default_adjustment_rate
-      - deliverchecklist
-      - email
-      - enforce_class
-      - enforce_referral
-      - features
-      - federal_tax_id
-      - id
-      - imexshopid
-      - inhousevendorid
-      - insurance_vendor_id
-      - intakechecklist
-      - jc_hourly_rates
-      - jobsizelimit
-      - logo_img_path
-      - md_categories
-      - md_ccc_rates
-      - md_classes
-      - md_hour_split
-      - md_ins_cos
-      - md_jobline_presets
-      - md_labor_rates
-      - md_messaging_presets
-      - md_notes_presets
-      - md_order_statuses
-      - md_parts_locations
-      - md_payment_types
-      - md_rbac
-      - md_referral_sources
-      - md_responsibility_centers
-      - md_ro_statuses
-      - messagingservicesid
-      - phone
-      - prodtargethrs
-      - production_config
-      - region_config
-      - schedule_end_time
-      - schedule_start_time
-      - scoreboard_target
-      - shopname
-      - shoprates
-      - speedprint
-      - ssbuckets
-      - state
-      - state_tax_id
-      - stripe_acct_id
-      - sub_status
-      - target_touchtime
-      - template_header
-      - textid
-      - tt_allow_post_to_invoiced
-      - updated_at
-      - use_fippa
-      - website
-      - workingdays
-      - zip_post
-      computed_fields: []
-      filter:
-        associations:
-          user:
-            authid:
-              _eq: X-Hasura-User-Id
-    role: user
-    table:
-      name: bodyshops
-      schema: public
-  type: create_select_permission
--- a/hasura/migrations/1628544252299_update_permission_user_public_table_bodyshops/up.yaml
+++ b/hasura/migrations/1628544252299_update_permission_user_public_table_bodyshops/up.yaml
@@ -1,90 +0,0 @@
- args:
-    role: user
-    table:
-      name: bodyshops
-      schema: public
-  type: drop_select_permission
- args:
-    permission:
-      allow_aggregations: false
-      columns:
-      - accountingconfig
-      - address1
-      - address2
-      - appt_alt_transport
-      - appt_colors
-      - appt_length
-      - attach_pdf_to_email
-      - bill_tax_rates
-      - cdk_configuration
-      - cdk_dealerid
-      - city
-      - country
-      - created_at
-      - default_adjustment_rate
-      - deliverchecklist
-      - email
-      - enforce_class
-      - enforce_referral
-      - features
-      - federal_tax_id
-      - id
-      - imexshopid
-      - inhousevendorid
-      - insurance_vendor_id
-      - intakechecklist
-      - jc_hourly_rates
-      - jobsizelimit
-      - logo_img_path
-      - md_categories
-      - md_ccc_rates
-      - md_classes
-      - md_hour_split
-      - md_ins_cos
-      - md_jobline_presets
-      - md_labor_rates
-      - md_messaging_presets
-      - md_notes_presets
-      - md_order_statuses
-      - md_parts_locations
-      - md_payment_types
-      - md_rbac
-      - md_referral_sources
-      - md_responsibility_centers
-      - md_ro_statuses
-      - messagingservicesid
-      - phone
-      - prodtargethrs
-      - production_config
-      - region_config
-      - schedule_end_time
-      - schedule_start_time
-      - scoreboard_target
-      - shopname
-      - shoprates
-      - speedprint
-      - ssbuckets
-      - state
-      - state_tax_id
-      - stripe_acct_id
-      - sub_status
-      - target_touchtime
-      - template_header
-      - textid
-      - tt_allow_post_to_invoiced
-      - updated_at
-      - use_fippa
-      - website
-      - workingdays
-      - zip_post
-      computed_fields: []
-      filter:
-        associations:
-          user:
-            authid:
-              _eq: X-Hasura-User-Id
-    role: user
-    table:
-      name: bodyshops
-      schema: public
-  type: create_select_permission
--- a/hasura/migrations/1628544261316_update_permission_user_public_table_bodyshops/down.yaml
+++ b/hasura/migrations/1628544261316_update_permission_user_public_table_bodyshops/down.yaml
@@ -1,81 +0,0 @@
- args:
-    role: user
-    table:
-      name: bodyshops
-      schema: public
-  type: drop_update_permission
- args:
-    permission:
-      columns:
-      - accountingconfig
-      - address1
-      - address2
-      - appt_alt_transport
-      - appt_colors
-      - appt_length
-      - attach_pdf_to_email
-      - bill_tax_rates
-      - city
-      - country
-      - created_at
-      - default_adjustment_rate
-      - deliverchecklist
-      - email
-      - enforce_class
-      - enforce_referral
-      - federal_tax_id
-      - id
-      - inhousevendorid
-      - insurance_vendor_id
-      - intakechecklist
-      - jc_hourly_rates
-      - logo_img_path
-      - md_categories
-      - md_ccc_rates
-      - md_classes
-      - md_hour_split
-      - md_ins_cos
-      - md_jobline_presets
-      - md_labor_rates
-      - md_messaging_presets
-      - md_notes_presets
-      - md_order_statuses
-      - md_parts_locations
-      - md_payment_types
-      - md_rbac
-      - md_referral_sources
-      - md_responsibility_centers
-      - md_ro_statuses
-      - phone
-      - prodtargethrs
-      - production_config
-      - schedule_end_time
-      - schedule_start_time
-      - scoreboard_target
-      - shopname
-      - shoprates
-      - speedprint
-      - ssbuckets
-      - state
-      - state_tax_id
-      - target_touchtime
-      - tt_allow_post_to_invoiced
-      - updated_at
-      - use_fippa
-      - website
-      - workingdays
-      - zip_post
-      filter:
-        associations:
-          _and:
-          - user:
-              authid:
-                _eq: X-Hasura-User-Id
-          - active:
-              _eq: true
-      set: {}
-    role: user
-    table:
-      name: bodyshops
-      schema: public
-  type: create_update_permission
--- a/hasura/migrations/1628544261316_update_permission_user_public_table_bodyshops/up.yaml
+++ b/hasura/migrations/1628544261316_update_permission_user_public_table_bodyshops/up.yaml
@@ -1,82 +0,0 @@
- args:
-    role: user
-    table:
-      name: bodyshops
-      schema: public
-  type: drop_update_permission
- args:
-    permission:
-      columns:
-      - accountingconfig
-      - address1
-      - address2
-      - appt_alt_transport
-      - appt_colors
-      - appt_length
-      - attach_pdf_to_email
-      - bill_tax_rates
-      - cdk_configuration
-      - city
-      - country
-      - created_at
-      - default_adjustment_rate
-      - deliverchecklist
-      - email
-      - enforce_class
-      - enforce_referral
-      - federal_tax_id
-      - id
-      - inhousevendorid
-      - insurance_vendor_id
-      - intakechecklist
-      - jc_hourly_rates
-      - logo_img_path
-      - md_categories
-      - md_ccc_rates
-      - md_classes
-      - md_hour_split
-      - md_ins_cos
-      - md_jobline_presets
-      - md_labor_rates
-      - md_messaging_presets
-      - md_notes_presets
-      - md_order_statuses
-      - md_parts_locations
-      - md_payment_types
-      - md_rbac
-      - md_referral_sources
-      - md_responsibility_centers
-      - md_ro_statuses
-      - phone
-      - prodtargethrs
-      - production_config
-      - schedule_end_time
-      - schedule_start_time
-      - scoreboard_target
-      - shopname
-      - shoprates
-      - speedprint
-      - ssbuckets
-      - state
-      - state_tax_id
-      - target_touchtime
-      - tt_allow_post_to_invoiced
-      - updated_at
-      - use_fippa
-      - website
-      - workingdays
-      - zip_post
-      filter:
-        associations:
-          _and:
-          - user:
-              authid:
-                _eq: X-Hasura-User-Id
-          - active:
-              _eq: true
-      set: {}
-    role: user
-    table:
-      name: bodyshops
-      schema: public
-  type: create_update_permission
--- a/hasura/migrations/1629321680242_alter_table_public_timetickets_add_column_flat_rate/down.yaml
+++ b/hasura/migrations/1629321680242_alter_table_public_timetickets_add_column_flat_rate/down.yaml
@@ -1,5 +0,0 @@
- args:
-    cascade: false
-    read_only: false
-    sql: ALTER TABLE "public"."timetickets" DROP COLUMN "flat_rate";
-  type: run_sql
--- a/hasura/migrations/1629321680242_alter_table_public_timetickets_add_column_flat_rate/up.yaml
+++ b/hasura/migrations/1629321680242_alter_table_public_timetickets_add_column_flat_rate/up.yaml
@@ -1,6 +0,0 @@
- args:
-    cascade: false
-    read_only: false
-    sql: ALTER TABLE "public"."timetickets" ADD COLUMN "flat_rate" boolean NULL DEFAULT
-      false;
-  type: run_sql
--- a/hasura/migrations/1629321689733_update_permission_user_public_table_timetickets/down.yaml
+++ b/hasura/migrations/1629321689733_update_permission_user_public_table_timetickets/down.yaml
@@ -1,39 +0,0 @@
- args:
-    role: user
-    table:
-      name: timetickets
-      schema: public
-  type: drop_insert_permission
- args:
-    permission:
-      check:
-        bodyshop:
-          associations:
-            _and:
-            - user:
-                authid:
-                  _eq: X-Hasura-User-Id
-            - active:
-                _eq: true
-      columns:
-      - actualhrs
-      - bodyshopid
-      - ciecacode
-      - clockoff
-      - clockon
-      - cost_center
-      - created_at
-      - date
-      - employeeid
-      - id
-      - jobid
-      - memo
-      - productivehrs
-      - rate
-      - updated_at
-      set: {}
-    role: user
-    table:
-      name: timetickets
-      schema: public
-  type: create_insert_permission
--- a/hasura/migrations/1629321689733_update_permission_user_public_table_timetickets/up.yaml
+++ b/hasura/migrations/1629321689733_update_permission_user_public_table_timetickets/up.yaml
@@ -1,40 +0,0 @@
- args:
-    role: user
-    table:
-      name: timetickets
-      schema: public
-  type: drop_insert_permission
- args:
-    permission:
-      check:
-        bodyshop:
-          associations:
-            _and:
-            - user:
-                authid:
-                  _eq: X-Hasura-User-Id
-            - active:
-                _eq: true
-      columns:
-      - actualhrs
-      - bodyshopid
-      - ciecacode
-      - clockoff
-      - clockon
-      - cost_center
-      - created_at
-      - date
-      - employeeid
-      - flat_rate
-      - id
-      - jobid
-      - memo
-      - productivehrs
-      - rate
-      - updated_at
-      set: {}
-    role: user
-    table:
-      name: timetickets
-      schema: public
-  type: create_insert_permission
--- a/hasura/migrations/1629321697271_update_permission_user_public_table_timetickets/down.yaml
+++ b/hasura/migrations/1629321697271_update_permission_user_public_table_timetickets/down.yaml
@@ -1,40 +0,0 @@
- args:
-    role: user
-    table:
-      name: timetickets
-      schema: public
-  type: drop_select_permission
- args:
-    permission:
-      allow_aggregations: false
-      columns:
-      - actualhrs
-      - bodyshopid
-      - ciecacode
-      - clockoff
-      - clockon
-      - cost_center
-      - created_at
-      - date
-      - employeeid
-      - id
-      - jobid
-      - memo
-      - productivehrs
-      - rate
-      - updated_at
-      computed_fields: []
-      filter:
-        bodyshop:
-          associations:
-            _and:
-            - user:
-                authid:
-                  _eq: X-Hasura-User-Id
-            - active:
-                _eq: true
-    role: user
-    table:
-      name: timetickets
-      schema: public
-  type: create_select_permission
--- a/hasura/migrations/1629321697271_update_permission_user_public_table_timetickets/up.yaml
+++ b/hasura/migrations/1629321697271_update_permission_user_public_table_timetickets/up.yaml
@@ -1,41 +0,0 @@
- args:
-    role: user
-    table:
-      name: timetickets
-      schema: public
-  type: drop_select_permission
- args:
-    permission:
-      allow_aggregations: false
-      columns:
-      - actualhrs
-      - bodyshopid
-      - ciecacode
-      - clockoff
-      - clockon
-      - cost_center
-      - created_at
-      - date
-      - employeeid
-      - flat_rate
-      - id
-      - jobid
-      - memo
-      - productivehrs
-      - rate
-      - updated_at
-      computed_fields: []
-      filter:
-        bodyshop:
-          associations:
-            _and:
-            - user:
-                authid:
-                  _eq: X-Hasura-User-Id
-            - active:
-                _eq: true
-    role: user
-    table:
-      name: timetickets
-      schema: public
-  type: create_select_permission
--- a/hasura/migrations/1629321703175_update_permission_user_public_table_timetickets/down.yaml
+++ b/hasura/migrations/1629321703175_update_permission_user_public_table_timetickets/down.yaml
@@ -1,39 +0,0 @@
- args:
-    role: user
-    table:
-      name: timetickets
-      schema: public
-  type: drop_update_permission
- args:
-    permission:
-      columns:
-      - actualhrs
-      - bodyshopid
-      - ciecacode
-      - clockoff
-      - clockon
-      - cost_center
-      - created_at
-      - date
-      - employeeid
-      - id
-      - jobid
-      - memo
-      - productivehrs
-      - rate
-      - updated_at
-      filter:
-        bodyshop:
-          associations:
-            _and:
-            - user:
-                authid:
-                  _eq: X-Hasura-User-Id
-            - active:
-                _eq: true
-      set: {}
-    role: user
-    table:
-      name: timetickets
-      schema: public
-  type: create_update_permission
--- a/hasura/migrations/1629321703175_update_permission_user_public_table_timetickets/up.yaml
+++ b/hasura/migrations/1629321703175_update_permission_user_public_table_timetickets/up.yaml
@@ -1,40 +0,0 @@
- args:
-    role: user
-    table:
-      name: timetickets
-      schema: public
-  type: drop_update_permission
- args:
-    permission:
-      columns:
-      - actualhrs
-      - bodyshopid
-      - ciecacode
-      - clockoff
-      - clockon
-      - cost_center
-      - created_at
-      - date
-      - employeeid
-      - flat_rate
-      - id
-      - jobid
-      - memo
-      - productivehrs
-      - rate
-      - updated_at
-      filter:
-        bodyshop:
-          associations:
-            _and:
-            - user:
-                authid:
-                  _eq: X-Hasura-User-Id
-            - active:
-                _eq: true
-      set: {}
-    role: user
-    table:
-      name: timetickets
-      schema: public
-  type: create_update_permission
--- a/hasura/migrations/1629520416914_create_table_public_dms_vehicles/down.yaml
+++ b/hasura/migrations/1629520416914_create_table_public_dms_vehicles/down.yaml
@@ -1,5 +0,0 @@
- args:
-    cascade: false
-    read_only: false
-    sql: DROP TABLE "public"."dms_vehicles";
-  type: run_sql
--- a/hasura/migrations/1629520416914_create_table_public_dms_vehicles/up.yaml
+++ b/hasura/migrations/1629520416914_create_table_public_dms_vehicles/up.yaml
@@ -1,18 +0,0 @@
- args:
-    cascade: false
-    read_only: false
-    sql: CREATE EXTENSION IF NOT EXISTS pgcrypto;
-  type: run_sql
- args:
-    cascade: false
-    read_only: false
-    sql: CREATE TABLE "public"."dms_vehicles"("id" uuid NOT NULL DEFAULT gen_random_uuid(),
-      "created_at" timestamptz NOT NULL DEFAULT now(), "makecode" text NOT NULL, "modelcode"
-      text NOT NULL, "make" text NOT NULL, "model" text NOT NULL, "bodyshopid" uuid
-      NOT NULL, PRIMARY KEY ("id") , FOREIGN KEY ("bodyshopid") REFERENCES "public"."bodyshops"("id")
-      ON UPDATE cascade ON DELETE cascade);
-  type: run_sql
- args:
-    name: dms_vehicles
-    schema: public
-  type: add_existing_table_or_view
--- a/hasura/migrations/1629520454038_track_all_relationships/down.yaml
+++ b/hasura/migrations/1629520454038_track_all_relationships/down.yaml
@@ -1,12 +0,0 @@
- args:
-    relationship: dms_vehicles
-    table:
-      name: bodyshops
-      schema: public
-  type: drop_relationship
- args:
-    relationship: bodyshop
-    table:
-      name: dms_vehicles
-      schema: public
-  type: drop_relationship
--- a/hasura/migrations/1629520454038_track_all_relationships/up.yaml
+++ b/hasura/migrations/1629520454038_track_all_relationships/up.yaml
@@ -1,20 +0,0 @@
- args:
-    name: dms_vehicles
-    table:
-      name: bodyshops
-      schema: public
-    using:
-      foreign_key_constraint_on:
-        column: bodyshopid
-        table:
-          name: dms_vehicles
-          schema: public
-  type: create_array_relationship
- args:
-    name: bodyshop
-    table:
-      name: dms_vehicles
-      schema: public
-    using:
-      foreign_key_constraint_on: bodyshopid
-  type: create_object_relationship
--- a/hasura/migrations/1629520509486_update_permission_user_public_table_dms_vehicles/down.yaml
+++ b/hasura/migrations/1629520509486_update_permission_user_public_table_dms_vehicles/down.yaml
@@ -1,6 +0,0 @@
- args:
-    role: user
-    table:
-      name: dms_vehicles
-      schema: public
-  type: drop_select_permission
--- a/hasura/migrations/1629520509486_update_permission_user_public_table_dms_vehicles/up.yaml
+++ b/hasura/migrations/1629520509486_update_permission_user_public_table_dms_vehicles/up.yaml
@@ -1,28 +0,0 @@
- args:
-    permission:
-      allow_aggregations: false
-      backend_only: false
-      columns:
-      - id
-      - created_at
-      - makecode
-      - modelcode
-      - make
-      - model
-      - bodyshopid
-      computed_fields: []
-      filter:
-        bodyshop:
-          associations:
-            _and:
-            - user:
-                authid:
-                  _eq: X-Hasura-User-Id
-            - active:
-                _eq: true
-      limit: null
-    role: user
-    table:
-      name: dms_vehicles
-      schema: public
-  type: create_select_permission
--- a/hasura/migrations/1629520623978_update_permission_user_public_table_dms_vehicles/down.yaml
+++ b/hasura/migrations/1629520623978_update_permission_user_public_table_dms_vehicles/down.yaml
@@ -1,6 +0,0 @@
- args:
-    role: user
-    table:
-      name: dms_vehicles
-      schema: public
-  type: drop_insert_permission
--- a/hasura/migrations/1629520623978_update_permission_user_public_table_dms_vehicles/up.yaml
+++ b/hasura/migrations/1629520623978_update_permission_user_public_table_dms_vehicles/up.yaml
@@ -1,27 +0,0 @@
- args:
-    permission:
-      allow_upsert: true
-      backend_only: false
-      check:
-        bodyshop:
-          associations:
-            _and:
-            - user:
-                authid:
-                  _eq: X-Hasura-User-Id
-            - active:
-                _eq: true
-      columns:
-      - id
-      - created_at
-      - makecode
-      - modelcode
-      - make
-      - model
-      - bodyshopid
-      set: {}
-    role: user
-    table:
-      name: dms_vehicles
-      schema: public
-  type: create_insert_permission
--- a/hasura/migrations/1629520632595_update_permission_user_public_table_dms_vehicles/down.yaml
+++ b/hasura/migrations/1629520632595_update_permission_user_public_table_dms_vehicles/down.yaml
@@ -1,6 +0,0 @@
- args:
-    role: user
-    table:
-      name: dms_vehicles
-      schema: public
-  type: drop_update_permission
--- a/hasura/migrations/1629520632595_update_permission_user_public_table_dms_vehicles/up.yaml
+++ b/hasura/migrations/1629520632595_update_permission_user_public_table_dms_vehicles/up.yaml
@@ -1,26 +0,0 @@
- args:
-    permission:
-      backend_only: false
-      columns:
-      - make
-      - makecode
-      - model
-      - modelcode
-      - created_at
-      - bodyshopid
-      - id
-      filter:
-        bodyshop:
-          associations:
-            _and:
-            - user:
-                authid:
-                  _eq: X-Hasura-User-Id
-            - active:
-                _eq: true
-      set: {}
-    role: user
-    table:
-      name: dms_vehicles
-      schema: public
-  type: create_update_permission
--- a/hasura/migrations/1629521860924_update_permission_user_public_table_dms_vehicles/down.yaml
+++ b/hasura/migrations/1629521860924_update_permission_user_public_table_dms_vehicles/down.yaml
@@ -1,6 +0,0 @@
- args:
-    role: user
-    table:
-      name: dms_vehicles
-      schema: public
-  type: drop_delete_permission
--- a/hasura/migrations/1629521860924_update_permission_user_public_table_dms_vehicles/up.yaml
+++ b/hasura/migrations/1629521860924_update_permission_user_public_table_dms_vehicles/up.yaml
@@ -1,17 +0,0 @@
- args:
-    permission:
-      backend_only: false
-      filter:
-        bodyshop:
-          associations:
-            _and:
-            - user:
-                authid:
-                  _eq: X-Hasura-User-Id
-            - active:
-                _eq: true
-    role: user
-    table:
-      name: dms_vehicles
-      schema: public
-  type: create_delete_permission
--- a/hasura/migrations/1629738990845_run_sql_migration/down.yaml
+++ b/hasura/migrations/1629738990845_run_sql_migration/down.yaml
@@ -1 +0,0 @@
-[]
--- a/hasura/migrations/1629738990845_run_sql_migration/up.yaml
+++ b/hasura/migrations/1629738990845_run_sql_migration/up.yaml
@@ -1,13 +0,0 @@
- args:
-    cascade: true
-    read_only: false
-    sql: CREATE OR REPLACE FUNCTION public.search_dms_vehicles(search text)RETURNS
-      SETOF dms_vehicles LANGUAGE plpgsql STABLE AS $FUNCTION$ BEGIN IF search=''
-      THEN RETURN query SELECT*FROM dms_vehicles;ELSE RETURN query SELECT*FROM dms_vehicles
-      WHERE make ILIKE'%'||search||'%' OR model ILIKE'%'||search||'%' ORDER BY make
-      ILIKE'%'||search||'%' OR NULL,model ILIKE'%'||search||'%' OR NULL;END IF;END$FUNCTION$;
-  type: run_sql
- args:
-    name: search_dms_vehicles
-    schema: public
-  type: track_function
--- a/hasura/migrations/1630078518068_alter_table_public_associations_add_column_qbo_auth/down.yaml
+++ b/hasura/migrations/1630078518068_alter_table_public_associations_add_column_qbo_auth/down.yaml
@@ -1,5 +0,0 @@
- args:
-    cascade: false
-    read_only: false
-    sql: ALTER TABLE "public"."associations" DROP COLUMN "qbo_auth";
-  type: run_sql
--- a/hasura/migrations/1630078518068_alter_table_public_associations_add_column_qbo_auth/up.yaml
+++ b/hasura/migrations/1630078518068_alter_table_public_associations_add_column_qbo_auth/up.yaml
@@ -1,5 +0,0 @@
- args:
-    cascade: false
-    read_only: false
-    sql: ALTER TABLE "public"."associations" ADD COLUMN "qbo_auth" jsonb NULL;
-  type: run_sql
--- a/Show More
+++ b/Show More