Merged in release/2021-09-03 (pull request #192)

release/2021-09-03 Approved-by: Patrick Fic
2021-08-30 22:43:40 +00:00
parent 8d3d52485f 05e295fcac
commit f6f90d68fa
64 changed files with 14377 additions and 2265 deletions
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -5377,6 +5377,27 @@
                                            <folder_node>
                                                <name>shop</name>
                                                <children>
+                                                    <concept_node>
+                                                        <name>config</name>
+                                                        <definition_loaded>false</definition_loaded>
+                                                        <description></description>
+                                                        <comment></comment>
+                                                        <default_text></default_text>
+                                                        <translations>
+                                                            <translation>
+                                                                <language>en-US</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                            <translation>
+                                                                <language>es-MX</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                            <translation>
+                                                                <language>fr-CA</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                        </translations>
+                                                    </concept_node>
                                                    <concept_node>
                                                        <name>dashboard</name>
                                                        <definition_loaded>false</definition_loaded>
@@ -7550,6 +7571,32 @@
                                    <folder_node>
                                        <name>dms</name>
                                        <children>
+                                            <folder_node>
+                                                <name>cdk</name>
+                                                <children>
+                                                    <concept_node>
+                                                        <name>payers</name>
+                                                        <definition_loaded>false</definition_loaded>
+                                                        <description></description>
+                                                        <comment></comment>
+                                                        <default_text></default_text>
+                                                        <translations>
+                                                            <translation>
+                                                                <language>en-US</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                            <translation>
+                                                                <language>es-MX</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                            <translation>
+                                                                <language>fr-CA</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                        </translations>
+                                                    </concept_node>
+                                                </children>
+                                            </folder_node>
                                            <concept_node>
                                                <name>cdk_dealerid</name>
                                                <definition_loaded>false</definition_loaded>
@@ -23006,6 +23053,32 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
+                                    <folder_node>
+                                        <name>dms</name>
+                                        <children>
+                                            <concept_node>
+                                                <name>kmoutnotgreaterthankmin</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                        </children>
+                                    </folder_node>
                                    <concept_node>
                                        <name>documents</name>
                                        <definition_loaded>false</definition_loaded>
--- a/client/package.json
+++ b/client/package.json
@@ -4,83 +4,84 @@
  "private": true,
  "proxy": "http://localhost:5000",
  "dependencies": {
-    "@apollo/client": "^3.3.21",
+    "@apollo/client": "^3.4.10",
    "@craco/craco": "^6.2.0",
-    "@fingerprintjs/fingerprintjs": "^3.2.0",
+    "@fingerprintjs/fingerprintjs": "^3.3.0",
    "@lourenci/react-kanban": "^2.1.0",
-    "@openreplay/tracker": "^3.2.1",
-    "@openreplay/tracker-assist": "^3.0.3",
+    "@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.10.0",
-    "@sentry/tracing": "^6.10.0",
+    "@sentry/react": "^6.11.0",
+    "@sentry/tracing": "^6.11.0",
    "@stripe/react-stripe-js": "^1.4.0",
-    "@stripe/stripe-js": "^1.16.0",
-    "@tanem/react-nprogress": "^3.0.74",
-    "antd": "^4.16.8",
+    "@stripe/stripe-js": "^1.17.1",
+    "@tanem/react-nprogress": "^3.0.79",
+    "antd": "^4.16.13",
    "apollo-link-logger": "^2.0.0",
    "axios": "^0.21.1",
-    "craco-less": "^1.18.0",
+    "craco-less": "^1.20.0",
    "dinero.js": "^1.9.0",
    "dotenv": "^10.0.0",
    "enquire-js": "^0.2.1",
    "env-cmd": "^10.1.0",
-    "exifr": "^7.1.2",
-    "firebase": "^8.7.1",
-    "graphql": "^15.5.1",
-    "i18next": "^20.3.4",
+    "exifr": "^7.1.3",
+    "firebase": "^9.0.0",
+    "graphql": "^15.5.2",
+    "i18next": "^20.4.0",
    "i18next-browser-languagedetector": "^6.1.2",
-    "jsoneditor": "^9.5.2",
+    "jsoneditor": "^9.5.4",
    "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.9.22",
-    "logrocket": "^1.2.0",
-    "markerjs2": "^2.9.0",
+    "libphonenumber-js": "^1.9.25",
+    "logrocket": "^2.0.0",
+    "markerjs2": "^2.11.2",
    "moment-business-days": "^1.2.0",
-    "phone": "^3.1.2",
+    "phone": "^3.1.6",
    "preval.macro": "^5.0.0",
    "prop-types": "^15.7.2",
    "query-string": "^7.0.1",
    "rc-queue-anim": "^2.0.0",
    "rc-scroll-anim": "^2.7.6",
    "react": "^17.0.1",
-    "react-big-calendar": "^0.33.2",
+    "react-big-calendar": "^0.35.0",
    "react-color": "^2.19.3",
+    "react-cookie": "^4.1.1",
    "react-dom": "^17.0.1",
    "react-drag-listview": "^0.1.8",
    "react-grid-gallery": "^0.5.5",
-    "react-grid-layout": "^1.2.5",
-    "react-i18next": "^11.11.3",
+    "react-grid-layout": "^1.3.0",
+    "react-i18next": "^11.11.4",
    "react-icons": "^4.2.0",
-    "react-number-format": "^4.6.4",
+    "react-number-format": "^4.7.3",
    "react-redux": "^7.2.4",
    "react-resizable": "^3.0.4",
-    "react-router-dom": "^5.2.0",
+    "react-router-dom": "^5.2.1",
    "react-scripts": "^4.0.3",
    "react-sublime-video": "^0.2.5",
    "react-virtualized": "^9.22.3",
-    "recharts": "^2.0.10",
-    "redux": "^4.1.0",
+    "recharts": "^2.1.2",
+    "redux": "^4.1.1",
    "redux-persist": "^6.0.0",
    "redux-saga": "^1.1.3",
    "redux-state-sync": "^3.1.2",
    "reselect": "^4.0.0",
-    "sass": "^1.35.2",
-    "socket.io-client": "^4.1.3",
-    "styled-components": "^5.3.0",
+    "sass": "^1.38.2",
+    "socket.io-client": "^4.2.0",
+    "styled-components": "^5.3.1",
    "subscriptions-transport-ws": "^0.9.18",
    "web-vitals": "^2.1.0",
-    "workbox-background-sync": "^6.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"
+    "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"
  },
  "scripts": {
    "analyze": "source-map-explorer 'build/static/js/*.js'",
--- a/client/src/components/_test/test.component.jsx
+++ b/client/src/components/_test/test.component.jsx
@@ -1,25 +1,9 @@
-import Axios from "axios";
 import React from "react";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 export default function Test() {
-  const handleQbSignIn = async () => {
-    const result = await Axios.post("/qbo/authorize", { userId: "1234" });
-    console.log("handleQbSignIn -> result", result.data);
-    // window.open(result.data, "_blank", "toolbar=0,location=0,menubar=0");
-
-    var parameters = "location=1,width=800,height=650";
-    parameters +=
-      ",left=" +
-      (window.screen.width - 800) / 2 +
-      ",top=" +
-      (window.screen.height - 650) / 2;
-
-    // Launch Popup
-    window.open(result.data, "connectPopup", parameters);
-  };
-
  return (
    <div>
-      <button onClick={handleQbSignIn}>Sign Into Qb.</button>
+      <QboAuthorizeComponent />
    </div>
  );
 }
--- 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.productiondollars"),
+    label: i18next.t("dashboard.titles.monthlypartssales"),
    component: DashboardMonthlyPartsSales,
    gqlFragment: null,
    minW: 2,
@@ -253,7 +253,7 @@ const componentList = {
    h: 2,
  },
  MonthlyLaborSales: {
-    label: i18next.t("dashboard.titles.monthlypartssales"),
+    label: i18next.t("dashboard.titles.monthlylaborsales"),
    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,17 +1,21 @@
-import { Button, Table } from "antd";
-import React, { useState } from "react";
+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
@@ -20,6 +24,15 @@ export default connect(
 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"),
@@ -71,13 +84,45 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId }) {
            );
          }}
        >
-          Get
+          <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
@@ -4,6 +4,9 @@ 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
@@ -12,83 +15,75 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
-export default connect(mapStateToProps, mapDispatchToProps)(DmsCdkMakes);
+export default connect(mapStateToProps, mapDispatchToProps)(DmsCdkVehicles);

-export function DmsCdkMakes({ bodyshop, form, socket }) {
-  const [makesList, setMakesList] = useState([]);
-  const [searchText, setSearchText] = useState("");
-  const [loading, setLoading] = useState(false);
+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.makeFullName"),
-      dataIndex: "makeFullName",
-      key: "makeFullName",
+      title: t("jobs.fields.dms.make"),
+      dataIndex: "make",
+      key: "make",
    },
    {
-      title: t("jobs.fields.dms.modelFullName"),
-      dataIndex: "modelFullName",
-      key: "modelFullName",
+      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.makecode"),
+      dataIndex: "makecode",
+      key: "makecode",
    },
    {
-      title: t("jobs.fields.dms.modelCode"),
-      dataIndex: "modelCode",
-      key: "modelCode",
+      title: t("jobs.fields.dms.modelcode"),
+      dataIndex: "modelcode",
+      key: "modelcode",
    },
  ];

-  const filteredMakes =
-    searchText !== "" && searchText
-      ? makesList.filter(
-          (make) =>
-            searchText
-              .split(" ")
-              .some((v) =>
-                make.makeFullName.toLowerCase().includes(v.toLowerCase())
-              ) ||
-            searchText
-              .split(" ")
-              .some((v) =>
-                make.modelFullName.toLowerCase().includes(v.toLowerCase())
-              )
-        )
-      : makesList;
-
+  console.log(
+    "🚀  ~ file: dms-cdk-makes.component.jsx  ~ line 95  ~ selectedModel",
+    selectedModel
+  );
  return (
    <div>
-      <Modal width={"90%"} visible={visible} onCancel={() => setVisible(false)}>
+      <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) => setSearchText(val)}
+              onSearch={(val) => callSearch({ variables: { search: val } })}
              placeholder={t("general.labels.search")}
            />
          )}
          columns={columns}
          loading={loading}
-          id="id"
-          dataSource={filteredMakes}
+          rowKey="id"
+          dataSource={data ? data.search_dms_vehicles : []}
          onRow={(record) => {
            return {
-              onClick: setSelectedModel(record),
+              onClick: () => setSelectedModel(record),
            };
          }}
          rowSelection={{
-            onSelect: (record, selected, ...props) => {
-              console.log(
-                "🚀  ~ file: dms-cdk-makes.component.jsx  ~ line 85  ~ record, selected, ...props",
-                record,
-                selected,
-                ...props
-              );
-
+            onSelect: (record) => {
              setSelectedModel(record);
            },

@@ -100,15 +95,14 @@ export function DmsCdkMakes({ bodyshop, form, socket }) {
      <Button
        onClick={() => {
          setVisible(true);
-          setLoading(true);
-          socket.emit("cdk-get-makes", bodyshop.cdk_dealerid, (makes) => {
-            console.log("Called back", makes);
-            setMakesList(makes);
-            setLoading(false);
+          callSearch({
+            variables: {
+              search: job && job.v_model_desc && job.v_model_desc.substr(0, 3),
+            },
          });
        }}
      >
-        Get Makes
+        {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
@@ -0,0 +1,32 @@
+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,10 +1,24 @@
 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 PhoneFormatter from "../../utils/PhoneFormatter";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import { alphaSort } from "../../utils/sorters";
-export default function DmsCustomerSelector() {
+
+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);
@@ -15,11 +29,24 @@ export default function DmsCustomerSelector() {
    setcustomerList(customerList);
  });

-  const onOk = () => {
+  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"),
@@ -27,28 +54,13 @@ export default function DmsCustomerSelector() {
      key: "name1",
      sorter: (a, b) => alphaSort(a.name1?.fullName, b.name1?.fullName),
    },
-    {
-      title: t("dms.fields.name2"),
-      dataIndex: ["name2", "fullName"],
-      key: "name2",
-      sorter: (a, b) => alphaSort(a.name2?.fullName, b.name2?.fullName),
-    },
-    {
-      title: t("dms.fields.phone"),
-      dataIndex: ["contactInfo", "mainTelephoneNumber", "value"],
-      key: "phone",
-      render: (record, value) => (
-        <PhoneFormatter>
-          {record.contactInfo?.mainTelephoneNumber?.value}
-        </PhoneFormatter>
-      ),
-    },
+
    {
      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}`,
+        `${record?.address?.addressLine[0]}, ${record.address?.city} ${record.address?.stateOrProvince} ${record.address?.postalCode}`,
    },
  ];

@@ -57,7 +69,23 @@ export default function DmsCustomerSelector() {
    <Table
      title={() => (
        <div>
-          <Button onClick={onOk}>Select</Button>
+          <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" }}
--- 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,5 +1,13 @@
 import { DeleteFilled } from "@ant-design/icons";
-import { Button, Form, Input } from "antd";
+import {
+  Button,
+  Form,
+  Input,
+  InputNumber,
+  Select,
+  Space,
+  Statistic,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -8,7 +16,9 @@ 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,
 });
@@ -17,11 +27,38 @@ const mapDispatchToProps = (dispatch) => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(DmsPostForm);

-export function DmsPostForm({ bodyshop, socket, jobId }) {
+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">
+    <Form form={form} layout="vertical" onFinish={handleFinish}>
      <LayoutFormRow>
        <Form.Item
          name="journal"
@@ -40,15 +77,41 @@ export function DmsPostForm({ bodyshop, socket, jobId }) {
          <Input />
        </Form.Item>
        <Form.Item
-          name="dms_make"
-          label={t("jobs.fields.dms.dms_make")}
+          name="story"
+          label={t("jobs.fields.dms.story")}
          rules={[
            {
              required: true,
            },
          ]}
        >
-          <Input />
+          <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"
@@ -59,9 +122,21 @@ export function DmsPostForm({ bodyshop, socket, jobId }) {
            },
          ]}
        >
-          <Input />
+          <Input disabled />
        </Form.Item>
-        <DmsCdkMakes form={form} socket={socket} />
+        <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"]}>
@@ -81,20 +156,30 @@ export function DmsPostForm({ bodyshop, socket, jobId }) {
                        },
                      ]}
                    >
-                      <Input />
+                      <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.account")}
-                      key={`${index}account`}
-                      name={[field.name, "account"]}
+                      label={t("jobs.fields.dms.payer.dms_acctnumber")}
+                      key={`${index}dms_acctnumber`}
+                      name={[field.name, "dms_acctnumber"]}
                      rules={[
                        {
                          required: true,
                        },
                      ]}
                    >
-                      <Input />
+                      <Input disabled />
                    </Form.Item>

                    <Form.Item
@@ -107,8 +192,9 @@ export function DmsPostForm({ bodyshop, socket, jobId }) {
                        },
                      ]}
                    >
-                      <CurrencyInput />
+                      <CurrencyInput min={0} />
                    </Form.Item>
+
                    <Form.Item
                      label={t("jobs.fields.dms.payer.controlnumber")}
                      key={`${index}controlnumber`}
@@ -122,6 +208,27 @@ export function DmsPostForm({ bodyshop, socket, jobId }) {
                      <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);
@@ -133,18 +240,69 @@ export function DmsPostForm({ bodyshop, socket, jobId }) {
              <Form.Item>
                <Button
                  type="dashed"
+                  disabled={!(fields.length < 3)}
                  onClick={() => {
-                    add();
+                    if (fields.length < 3) add();
                  }}
                  style={{ width: "100%" }}
                >
-                  {t("general.actions.add")}
+                  {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,21 +15,20 @@ const mapDispatchToProps = (dispatch) => ({
 class FcmNotificationComponent extends Component {
  async componentDidMount() {
    //const { client, currentUser } = this.props;
-    if (!!!messaging) return; //Skip all of the notification functionality if the firebase SDK could not start.
-
-    messaging
-      .requestPermission()
-      .then(async function () {
-        // const token = await messaging.getToken();
-        // client.mutate({
-        //   mutation: UPDATE_FCM_TOKEN,
-        //   variables: { authEmail: currentUser.email, token: { [token]: true } },
-        // });
-      })
-      .catch(function (err) {
-        console.log("Unable to get permission to notify.", err);
-        logImEXEvent("fcm_permission_denied", { message: err });
-      });
+    // if (!!!messaging) return; //Skip all of the notification functionality if the firebase SDK could not start.
+    // messaging
+    //   .requestPermission()
+    //   .then(async function () {
+    //     // const token = await messaging.getToken();
+    //     // client.mutate({
+    //     //   mutation: UPDATE_FCM_TOKEN,
+    //     //   variables: { authEmail: currentUser.email, token: { [token]: true } },
+    //     // });
+    //   })
+    //   .catch(function (err) {
+    //     console.log("Unable to get permission to notify.", err);
+    //     logImEXEvent("fcm_permission_denied", { message: err });
+    //   });
  }

  render() {
--- a/client/src/components/global-search/global-search.component.jsx
+++ b/client/src/components/global-search/global-search.component.jsx
@@ -168,7 +168,6 @@ 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
@@ -245,6 +245,7 @@ export function JobChecklistForm({
              name={["production_vars", "note"]}
              label={t("jobs.fields.production_vars.note")}
              disabled={readOnly}
+              trigger="onChange"
            >
              <Input.TextArea rows={3} disabled={readOnly} />
            </Form.Item>
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -429,6 +429,6 @@ function confirmDialog(msg) {
  return new Promise(function (resolve, reject) {
    let confirmed = window.confirm(msg);

-    return confirmed ? resolve(true) : reject(false);
+    return confirmed ? resolve(true) : resolve(false);
  });
 }
--- 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,7 +6,6 @@ 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 {
@@ -37,15 +36,9 @@ export function PaymentsExportAllButton({

    let QbXmlResponse;
    try {
-      QbXmlResponse = await axios.post(
-        "/accounting/qbxml/payments",
-        { payments: paymentIds },
-        {
-          headers: {
-            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
-          },
-        }
-      );
+      QbXmlResponse = await axios.post("/accounting/qbxml/payments", {
+        payments: paymentIds,
+      });
    } 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
@@ -0,0 +1,76 @@
+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,8 +52,9 @@ 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/shop-info/shop-info.rbac.component.jsx
+++ b/client/src/components/shop-info/shop-info.rbac.component.jsx
@@ -513,6 +513,18 @@ 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/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,6 +7,7 @@ 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";
@@ -35,7 +36,7 @@ export function UserValidatePwReset({
  useEffect(() => {
    async function checkCodeValid() {
      try {
-        const codeValid = await auth.checkActionCode(oobCode);
+        const codeValid = await checkActionCode(auth, 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,20 +1,18 @@
-import "firebase/analytics";
-import firebase from "firebase/app";
-import "firebase/auth";
-import "firebase/database";
-import "firebase/firestore";
-import "firebase/messaging";
+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 { store } from "../redux/store";

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

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

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

-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.");
-}
+//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.");
+// }

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

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

-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 (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/dms.queries.js
+++ b/client/src/graphql/dms.queries.js
@@ -0,0 +1,13 @@
+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.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -1726,6 +1726,8 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
      actual_delivery
      scheduled_in
      actual_in
+      kmin
+      kmout
      joblines(where: { removed: { _eq: false } }) {
        id
        removed
@@ -1878,98 +1880,16 @@ export const FIND_JOBS_BY_CLAIM = gql`
 `;

 export const QUERY_JOB_EXPORT_DMS = gql`
-  query QUERY_JOB_CLOSE_DETAILS($id: uuid!) {
+  query QUERY_JOB_EXPORT_DMS($id: uuid!) {
    jobs_by_pk(id: $id) {
-      ro_number
-      invoice_allocation
-      ins_co_id
      id
-      ded_amt
-      ded_status
-      depreciation_taxes
-      other_amount_payable
-      towing_payable
-      storage_payable
-      adjustment_bottom_line
-      federal_tax_rate
-      state_tax_rate
-      local_tax_rate
-      tax_tow_rt
-      tax_str_rt
-      tax_paint_mat_rt
-      tax_sub_rt
-      tax_lbr_rt
-      tax_levies_rt
-      parts_tax_rates
+      ro_number
+      po_number
+      clm_no
      job_totals
-      rate_la1
-      rate_la2
-      rate_la3
-      rate_la4
-      rate_laa
-      rate_lab
-      rate_lad
-      rate_lae
-      rate_laf
-      rate_lag
-      rate_lam
-      rate_lar
-      rate_las
-      rate_lau
-      rate_ma2s
-      rate_ma2t
-      rate_ma3s
-      rate_mabl
-      rate_macs
-      rate_mahw
-      rate_mapa
-      rate_mash
-      rate_matd
-      status
-      date_exported
-      date_invoiced
-      voided
-      scheduled_completion
-      actual_completion
-      scheduled_delivery
-      actual_delivery
-      scheduled_in
-      actual_in
-      bills {
-        id
-        federal_tax_rate
-        local_tax_rate
-        state_tax_rate
-        is_credit_memo
-        billlines {
-          actual_cost
-          cost_center
-          id
-          quantity
-        }
-      }
-      joblines(where: { removed: { _eq: false } }) {
-        id
-        removed
-        tax_part
-        line_desc
-        prt_dsmk_p
-        prt_dsmk_m
-        part_type
-        oem_partno
-        db_price
-        act_price
-        part_qty
-        mod_lbr_ty
-        db_hrs
-        mod_lb_hrs
-        lbr_op
-        lbr_amt
-        op_code_desc
-        profitcenter_labor
-        profitcenter_part
-        prt_dsmk_p
-      }
+      kmin
+      kmout
+      v_model_desc
    }
  }
 `;
--- a/client/src/pages/accounting-qbo/accounting-qbo.page.jsx
+++ b/client/src/pages/accounting-qbo/accounting-qbo.page.jsx
@@ -0,0 +1,47 @@
+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,4 +1,4 @@
-//import { useQuery } from "@apollo/client";
+import { useQuery } from "@apollo/client";
 import { Button, Col, Result, Row, Select, Space } from "antd";
 import queryString from "query-string";
 import React, { useEffect, useState } from "react";
@@ -7,14 +7,14 @@ 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 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 LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import { auth } from "../../firebase/firebase.utils";
-//import { QUERY_JOB_EXPORT_DMS } from "../../graphql/jobs.queries";
+import { QUERY_JOB_EXPORT_DMS } from "../../graphql/jobs.queries";
 import {
  setBreadcrumbs,
  setSelectedHeader,
@@ -52,10 +52,10 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
  const search = queryString.parse(useLocation().search);
  const { jobId } = search;

-  // const { loading, error } = useQuery(QUERY_JOB_EXPORT_DMS, {
-  //   variables: { id: jobId },
-  //   skip: true, //!jobId,
-  // });
+  const { loading, error, data } = useQuery(QUERY_JOB_EXPORT_DMS, {
+    variables: { id: jobId },
+    skip: !jobId,
+  });

  useEffect(() => {
    document.title = t("titles.dms");
@@ -73,7 +73,6 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
      console.log("Connected again.");
    });
    socket.on("reconnect", () => {
-      console.log("Connected again.");
      setLogs((logs) => {
        return [
          ...logs,
@@ -102,48 +101,42 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, []);

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

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

  return (
    <div>
-      <Space>
-        <Button
-          onClick={() => {
-            socket.emit(
-              `${dmsType}-export-job`,
-              "752a4f5f-22ab-414b-b182-98d4e62227ef"
-            );
-          }}
-        >
-          Export
-        </Button>
-        <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>
      <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} />
+          <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>
@@ -155,7 +148,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
  );
 }

-const determineDmsType = (bodyshop) => {
+export 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,6 +8,7 @@ import {
  Alert,
  Divider,
  PageHeader,
+  InputNumber,
 } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -56,6 +57,8 @@ 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"],
@@ -63,7 +66,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"]({
@@ -112,6 +115,8 @@ 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
      >
@@ -203,6 +208,45 @@ 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,6 +116,9 @@ 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")
 );
@@ -333,6 +336,13 @@ 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,6 +4,7 @@ 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";
@@ -35,20 +36,22 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
  }, [t, setSelectedHeader, setBreadcrumbs, bodyshop.shopname]);

  return (
-    <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 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>
  );
 }
 export default connect(mapStateToProps, mapDispatchToProps)(ShopPage);
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -1,12 +1,20 @@
 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,
@@ -28,8 +36,6 @@ import {
  validatePasswordResetSuccess,
 } from "./user.actions";
 import UserActionTypes from "./user.types";
-import * as Sentry from "@sentry/browser";
-import { tracker } from "../../App/App.container";

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

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

    yield put(
      signInSuccess({
@@ -90,7 +96,7 @@ export function* signOutStart() {
  try {
    logImEXEvent("redux_sign_out");

-    yield auth.signOut();
+    yield signOut(auth);
    yield put(signOutSuccess());
    localStorage.removeItem("token");
  } catch (error) {
@@ -104,10 +110,7 @@ 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",
@@ -122,7 +125,7 @@ export function* onSetInstanceId() {
 }
 export function* setInstanceIdSaga({ payload: uid }) {
  try {
-    const userInstanceRef = firestore.doc(`userInstance/${uid}`);
+    const userInstanceRef = doc(firestore, `userInstance/${uid}`);

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

    const snapshot = yield userInstanceRef.get();
    let fingerprint = yield select((state) => state.user.fingerprint);
@@ -193,8 +196,8 @@ export function* signInSuccessSaga({ payload }) {
  }

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

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

@@ -228,8 +231,8 @@ export function* onValidatePasswordResetStart() {
 }
 export function* validatePasswordResetStart({ payload: { password, code } }) {
  try {
-    auth.checkActionCode(code);
-    yield auth.confirmPasswordReset(code, password);
+    checkActionCode(auth, code);
+    yield confirmPasswordReset(auth, 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
@@ -352,6 +352,7 @@
 						"view": "Shift Clock -> View"
 					},
 					"shop": {
+						"config": "Shop -> Config",
 						"dashboard": "Shop -> Dashboard",
 						"rbac": "Shop -> RBAC",
 						"templates": "Shop -> Templates",
@@ -474,6 +475,9 @@
 				"defaultprofitsmapping": "Default Profits Mapping",
 				"deliverchecklist": "Delivery Checklist",
 				"dms": {
+					"cdk": {
+						"payers": "CDK Payers"
+					},
 					"cdk_dealerid": "CDK Dealer ID",
 					"title": "DMS"
 				},
@@ -1373,6 +1377,9 @@
 				"deliverchecklist": "Deliver Checklist",
 				"difference": "Difference",
 				"diskscan": "Scan Disk for Estimates",
+				"dms": {
+					"kmoutnotgreaterthankmin": "Mileage out must be greater than mileage in."
+				},
 				"documents": "Documents",
 				"documents-images": "Images",
 				"documents-other": "Other Documents",
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -352,6 +352,7 @@
 						"view": ""
 					},
 					"shop": {
+						"config": "",
 						"dashboard": "",
 						"rbac": "",
 						"templates": "",
@@ -474,6 +475,9 @@
 				"defaultprofitsmapping": "",
 				"deliverchecklist": "",
 				"dms": {
+					"cdk": {
+						"payers": ""
+					},
 					"cdk_dealerid": "",
 					"title": ""
 				},
@@ -1373,6 +1377,9 @@
 				"deliverchecklist": "",
 				"difference": "",
 				"diskscan": "",
+				"dms": {
+					"kmoutnotgreaterthankmin": ""
+				},
 				"documents": "documentos",
 				"documents-images": "",
 				"documents-other": "",
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -352,6 +352,7 @@
 						"view": ""
 					},
 					"shop": {
+						"config": "",
 						"dashboard": "",
 						"rbac": "",
 						"templates": "",
@@ -474,6 +475,9 @@
 				"defaultprofitsmapping": "",
 				"deliverchecklist": "",
 				"dms": {
+					"cdk": {
+						"payers": ""
+					},
 					"cdk_dealerid": "",
 					"title": ""
 				},
@@ -1373,6 +1377,9 @@
 				"deliverchecklist": "",
 				"difference": "",
 				"diskscan": "",
+				"dms": {
+					"kmoutnotgreaterthankmin": ""
+				},
 				"documents": "Les documents",
 				"documents-images": "",
 				"documents-other": "",
--- a/client/src/utils/CleanAxios.js
+++ b/client/src/utils/CleanAxios.js
@@ -14,6 +14,7 @@ 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/1629520416914_create_table_public_dms_vehicles/down.yaml
+++ b/hasura/migrations/1629520416914_create_table_public_dms_vehicles/down.yaml
@@ -0,0 +1,5 @@
+- 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
@@ -0,0 +1,18 @@
+- 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
@@ -0,0 +1,12 @@
+- 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
@@ -0,0 +1,20 @@
+- 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
@@ -0,0 +1,6 @@
+- 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
@@ -0,0 +1,28 @@
+- 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
@@ -0,0 +1,6 @@
+- 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
@@ -0,0 +1,27 @@
+- 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
@@ -0,0 +1,6 @@
+- 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
@@ -0,0 +1,26 @@
+- 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
@@ -0,0 +1,6 @@
+- 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
@@ -0,0 +1,17 @@
+- 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
@@ -0,0 +1 @@
+[]
--- a/hasura/migrations/1629738990845_run_sql_migration/up.yaml
+++ b/hasura/migrations/1629738990845_run_sql_migration/up.yaml
@@ -0,0 +1,13 @@
+- 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
@@ -0,0 +1,5 @@
+- 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
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."associations" ADD COLUMN "qbo_auth" jsonb NULL;
+  type: run_sql
--- a/hasura/migrations/metadata.yaml
+++ b/hasura/migrations/metadata.yaml
@@ -721,6 +721,13 @@ tables:
        table:
          schema: public
          name: csiquestions
+  - name: dms_vehicles
+    using:
+      foreign_key_constraint_on:
+        column: bodyshopid
+        table:
+          schema: public
+          name: dms_vehicles
  - name: documents
    using:
      foreign_key_constraint_on:
@@ -1527,6 +1534,87 @@ tables:
            - active:
                _eq: true
      check: null
+- table:
+    schema: public
+    name: dms_vehicles
+  object_relationships:
+  - name: bodyshop
+    using:
+      foreign_key_constraint_on: bodyshopid
+  insert_permissions:
+  - role: user
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - id
+      - created_at
+      - makecode
+      - modelcode
+      - make
+      - model
+      - bodyshopid
+      backend_only: false
+  select_permissions:
+  - role: user
+    permission:
+      columns:
+      - id
+      - created_at
+      - makecode
+      - modelcode
+      - make
+      - model
+      - bodyshopid
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+  update_permissions:
+  - role: user
+    permission:
+      columns:
+      - make
+      - makecode
+      - model
+      - modelcode
+      - created_at
+      - bodyshopid
+      - id
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      check: null
+  delete_permissions:
+  - role: user
+    permission:
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
 - table:
    schema: public
    name: documents
@@ -4554,6 +4642,9 @@ functions:
 - function:
    schema: public
    name: search_cccontracts
+- function:
+    schema: public
+    name: search_dms_vehicles
 - function:
    schema: public
    name: search_exportlog
--- a/logs/oAuthClient-log.log
+++ b/logs/oAuthClient-log.log
--- a/package.json
+++ b/package.json
@@ -17,17 +17,19 @@
    "start": "node server.js"
  },
  "dependencies": {
-    "aws-sdk": "^2.951.0",
+    "aws-sdk": "^2.979.0",
+    "bluebird": "^3.7.2",
    "body-parser": "^1.18.3",
    "cloudinary": "^1.26.2",
    "compression": "^1.7.4",
+    "cookie-parser": "^1.4.5",
    "cors": "2.8.5",
    "csrf": "^3.1.0",
    "dinero.js": "^1.9.0",
    "dotenv": "10.0.0",
    "express": "^4.16.4",
-    "firebase-admin": "^9.11.0",
-    "graphql": "^15.5.1",
+    "firebase-admin": "^9.11.1",
+    "graphql": "^15.5.2",
    "graphql-request": "^3.4.0",
    "graylog2": "^0.2.1",
    "inline-css": "^3.0.0",
@@ -36,14 +38,16 @@
    "moment": "^2.29.1",
    "node-fetch": "^2.6.1",
    "node-mailjet": "^3.3.4",
+    "node-quickbooks": "^2.0.39",
    "nodemailer": "^6.6.3",
-    "phone": "^3.1.2",
-    "soap": "^0.40.0",
-    "socket.io": "^4.1.3",
-    "ssh2-sftp-client": "^7.0.0",
-    "stripe": "^8.164.0",
-    "twilio": "^3.66.0",
-    "xmlbuilder2": "^2.4.1"
+    "phone": "^3.1.6",
+    "query-string": "^7.0.1",
+    "soap": "^0.42.0",
+    "socket.io": "^4.2.0",
+    "ssh2-sftp-client": "^7.0.3",
+    "stripe": "^8.171.0",
+    "twilio": "^3.67.1",
+    "xmlbuilder2": "^3.0.2"
  },
  "devDependencies": {
    "concurrently": "^6.2.0",
--- a/server.js
+++ b/server.js
@@ -7,6 +7,7 @@ const twilio = require("twilio");
 const logger = require("./server/utils/logger");
 global.fetch = require("node-fetch");
 var fb = require("./server/firebase/firebase-handler");
+var cookieParser = require("cookie-parser");

 //var enforce = require("express-sslify");

@@ -21,8 +22,26 @@ const app = express();
 const port = process.env.PORT || 5000;
 //const port = 5000;

+const http = require("http");
+const server = http.createServer(app);
+const { Server } = require("socket.io");
+const io = new Server(server, {
+  path: "/ws",
+  cors: {
+    origin: [
+      "https://test.imex.online",
+      "http://localhost:3000",
+      "https://imex.online",
+    ],
+    methods: ["GET", "POST"],
+  },
+});
+exports.io = io;
+require("./server/web-sockets/web-socket");
+
 //app.use(fb.validateFirebaseIdToken);
 app.use(compression());
+app.use(cookieParser());
 app.use(bodyParser.json({ limit: "50mb" }));
 app.use(bodyParser.urlencoded({ limit: "50mb", extended: true }));
 //app.use(enforce.HTTPS({ trustProtoHeader: true }));
@@ -127,8 +146,9 @@ var utils = require("./server/utils/utils");
 app.post("/utils/time", utils.servertime);

 var qbo = require("./server/accounting/qbo/qbo");
-app.post("/qbo/authorize", qbo.authorize);
+app.post("/qbo/authorize", fb.validateFirebaseIdToken, qbo.authorize);
 app.get("/qbo/callback", qbo.callback);
+app.post("/qbo/receivables", fb.validateFirebaseIdToken, qbo.receivables);

 var data = require("./server/data/data");
 app.post("/data/ah", data.autohouse);
@@ -136,25 +156,13 @@ app.post("/data/ah", data.autohouse);
 var ioevent = require("./server/ioevent/ioevent");
 app.post("/ioevent", ioevent.default);

+var cdkGetMake = require("./server/cdk/cdk-get-makes");
+app.post("/cdk/getvehicles", fb.validateFirebaseIdToken, cdkGetMake.default);
+
 app.get("/", async function (req, res) {
  res.status(200).send("Access Forbidden.");
 });

-const http = require("http");
-const server = http.createServer(app);
-const { Server } = require("socket.io");
-const io = new Server(server, {
-  path: "/ws",
-  cors: {
-    origin: [
-      "https://test.imex.online",
-      "http://localhost:3000",
-      "https://imex.online",
-    ],
-    methods: ["GET", "POST"],
-  },
-});
-
 server.listen(port, (error) => {
  if (error) throw error;
  logger.log(
@@ -163,5 +171,3 @@ server.listen(port, (error) => {
    "api"
  );
 });
-exports.io = io;
-require("./server/web-sockets/web-socket");
--- a/server/accounting/qbo/qbo-authorize.js
+++ b/server/accounting/qbo/qbo-authorize.js
@@ -6,26 +6,27 @@ require("dotenv").config({
  ),
 });
 const OAuthClient = require("intuit-oauth");
-var Tokens = require("csrf");
-var tokens = new Tokens();
+const logger = require("../../utils/logger");
+
 const oauthClient = new OAuthClient({
-  clientId: process.env.QB_ONLINE_CLIENT_ID,
-  clientSecret: process.env.QB_ONLINE_SECRET,
-  environment: "sandbox", //process.env.NODE_ENV === "production" ? "production" : "sandbox",
-  redirectUri: process.env.QB_ONLINE_REDIRECT_URI,
+  clientId: process.env.QBO_CLIENT_ID,
+  clientSecret: process.env.QBO_SECRET,
+  environment: process.env.NODE_ENV === "production" ? "production" : "sandbox",
+  redirectUri: process.env.QBO_REDIRECT_URI,
 });

 exports.default = async (req, res) => {
-  console.log("QBO Authorize Called");
-  const { userId } = req.body;
-  console.log("exports.default -> userId", userId);
-  // AuthorizationUri
+  try {
+    logger.log("qbo-auth-uri", "DEBUG", req.user.email, null, null);
+    const authUri = oauthClient.authorizeUri({
+      scope: [OAuthClient.scopes.Accounting, OAuthClient.scopes.OpenId],
+      state: req.user.email,
+    }); // can be an array of multiple scopes ex : {scope:[OAuthClient.scopes.Accounting,OAuthClient.scopes.OpenId]}

-  const authUri = oauthClient.authorizeUri({
-    scope: [OAuthClient.scopes.Accounting, OAuthClient.scopes.OpenId],
-    state: tokens.create(userId),
-  }); // can be an array of multiple scopes ex : {scope:[OAuthClient.scopes.Accounting,OAuthClient.scopes.OpenId]}
-  console.log("authUri", authUri);
-  // Redirect the authUri
-  res.send(authUri);
+    res.send(authUri);
+  } catch (error) {
+    logger.log("qbo-auth-uri-error", "ERROR", req.user.email, null, { error });
+
+    res.status(500).json(error);
+  }
 };
--- a/server/accounting/qbo/qbo-callback.js
+++ b/server/accounting/qbo/qbo-callback.js
@@ -5,32 +5,79 @@ require("dotenv").config({
    `.env.${process.env.NODE_ENV || "development"}`
  ),
 });
+const logger = require("../../utils/logger");
 const OAuthClient = require("intuit-oauth");
-var Tokens = require("csrf");
-
+var QuickBooks = require("node-quickbooks");
+const Promise = require("bluebird");
+const QuickBooksPromise = Promise.promisifyAll(QuickBooks.prototype);
+const client = require("../../graphql-client/graphql-client").client;
+const queries = require("../../graphql-client/queries");
+const queryString = require("query-string");
 const oauthClient = new OAuthClient({
-  clientId: process.env.QB_ONLINE_CLIENT_ID,
-  clientSecret: process.env.QB_ONLINE_SECRET,
-  environment: "sandbox", //process.env.NODE_ENV === "production" ? "production" : "sandbox",
-  redirectUri: process.env.QB_ONLINE_REDIRECT_URI,
+  clientId: process.env.QBO_CLIENT_ID,
+  clientSecret: process.env.QBO_SECRET,
+  environment: process.env.NODE_ENV === "production" ? "production" : "sandbox",
+  redirectUri: process.env.QBO_REDIRECT_URI,
+  logging: true,
 });

 exports.default = async (req, res) => {
-  // Parse the redirect URL for authCode and exchange them for tokens
-  const parseRedirect = req.url;
-  const { code, state, realmId } = req.query;
-  console.log("exports.default -> state", state);
-  // Exchange the auth code retrieved from the **req.url** on the redirectUri
-  oauthClient
-    .createToken(parseRedirect)
-    .then(function (authResponse) {
-      console.log("The Token is  " + JSON.stringify(authResponse.getJson()));
-      const { access_token, refresh_token } = authResponse.getJson();
-      console.log("exports.default -> refresh_token", refresh_token);
-      console.log("exports.default -> access_token", access_token);
-    })
-    .catch(function (e) {
-      console.error("The error message is :" + e.originalMessage);
-      console.error(e.intuit_tid);
+  const params = queryString.parse(req.url.split("?").reverse()[0]);
+  try {
+    logger.log("qbo-callback-create-token", "DEBUG", params.state, null, null);
+    const authResponse = await oauthClient.createToken(req.url);
+    if (authResponse.json.error) {
+      logger.log("qbo-callback-error", "ERROR", params.state, null, {
+        error: authResponse.json,
+      });
+      res.redirect(
+        `http://localhost:3000/manage/accounting/qbo?error=${encodeURIComponent(
+          JSON.stringify(authResponse.json)
+        )}`
+      );
+    } else {
+      await client.request(queries.SET_QBO_AUTH, {
+        email: params.state,
+        qbo_auth: { ...authResponse.json, createdAt: Date.now() },
+      });
+      logger.log(
+        "qbo-callback-create-token-success",
+        "DEBUG",
+        params.state,
+        null,
+        null
+      );
+
+      res.redirect(`http://localhost:3000/manage/accounting/qbo?`);
+    }
+  } catch (e) {
+    logger.log("qbo-callback-error", "ERROR", params.state, null, {
+      error: e,
    });
+    res.status(400).json(e);
+  }
+};
+
+exports.refresh = async (oauthClient, req) => {
+  try {
+    logger.log("qbo-token-refresh", "DEBUG", req.user.email, null, null);
+    const authResponse = await oauthClient.refresh();
+    await client.request(queries.SET_QBO_AUTH, {
+      email: req.user.email,
+      qbo_auth: { ...authResponse.json, createdAt: Date.now() },
+    });
+  } catch (error) {
+    logger.log("qbo-token-refresh-error", "ERROR", req.user.email, null, {
+      error,
+    });
+  }
+};
+
+exports.setNewRefreshToken = async (email, apiResponse) => {
+  logger.log("qbo-token-updated", "DEBUG", email, null, null);
+
+  await client.request(queries.SET_QBO_AUTH, {
+    email,
+    qbo_auth: { ...apiResponse.token, createdAt: Date.now() },
+  });
 };
--- a/server/accounting/qbo/qbo-receivables.js
+++ b/server/accounting/qbo/qbo-receivables.js
@@ -0,0 +1,312 @@
+const urlBuilder = require("./qbo").urlBuilder;
+const path = require("path");
+require("dotenv").config({
+  path: path.resolve(
+    process.cwd(),
+    `.env.${process.env.NODE_ENV || "development"}`
+  ),
+});
+const logger = require("../../utils/logger");
+
+const apiGqlClient = require("../../graphql-client/graphql-client").client;
+const queries = require("../../graphql-client/queries");
+const {
+  refresh: refreshOauthToken,
+  setNewRefreshToken,
+} = require("./qbo-callback");
+const OAuthClient = require("intuit-oauth");
+var QuickBooks = require("node-quickbooks");
+const GraphQLClient = require("graphql-request").GraphQLClient;
+const { generateOwnerTier } = require("../qbxml/qbxml-utils");
+
+const oauthClient = new OAuthClient({
+  clientId: process.env.QBO_CLIENT_ID,
+  clientSecret: process.env.QBO_SECRET,
+  environment: process.env.NODE_ENV === "production" ? "production" : "sandbox",
+  redirectUri: process.env.QBO_REDIRECT_URI,
+  logging: true,
+});
+
+exports.default = async (req, res) => {
+  try {
+    //Fetch the API Access Tokens & Set them for the session.
+    const response = await apiGqlClient.request(queries.GET_QBO_AUTH, {
+      email: req.user.email,
+    });
+    response.associations[0].qbo_auth;
+    oauthClient.setToken(response.associations[0].qbo_auth);
+    if (!oauthClient.token.isAccessTokenValid()) {
+      await refreshOauthToken(oauthClient, req);
+      if (!oauthClient.token.isAccessTokenValid()) {
+        res.sendStatus(401);
+      }
+    }
+    const BearerToken = req.headers.authorization;
+    const { jobIds } = req.body;
+    //Query Job Info
+    const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
+      headers: {
+        Authorization: BearerToken,
+      },
+    });
+    const result = await client
+      .setHeaders({ Authorization: BearerToken })
+      .request(queries.QUERY_JOBS_FOR_RECEIVABLES_EXPORT, {
+        ids: ["966dc7f9-2acd-44dc-9df5-d07c5578070a"],
+        //jobIds
+      });
+    const { jobs, bodyshops } = result;
+
+    const job = jobs[0];
+    const bodyshop = bodyshops[0];
+    const isThreeTier = bodyshop.accountingconfig.tiers === 3;
+    const twoTierPref = bodyshop.accountingconfig.twotierpref;
+
+    //Replace this with a for-each loop to check every single Job that's included in the list.
+
+    let insCoCustomerTier, ownerCustomerTier;
+    if (isThreeTier || twoTierPref === "source") {
+      //Insert the insurance company tier.
+      //Query for top level customer, the insurance company name.
+      insCoCustomerTier = await QueryInsuranceCo(oauthClient, req, job);
+      if (!insCoCustomerTier) {
+        //Creating the Insurance Customer.
+        insCoCustomerTier = await InsertInsuranceCo(
+          oauthClient,
+          req,
+          job,
+          bodyshop
+        );
+      }
+    }
+
+    if (isThreeTier || twoTierPref === "name") {
+      //Insert the name/owner and account for whether the source should be the ins co in 3 tier..
+      ownerCustomerTier = await QueryOwner(oauthClient, req, job);
+      //Query for the owner itself.
+      if (!ownerCustomerTier) {
+        ownerCustomerTier = await InsertOwner(
+          oauthClient,
+          req,
+          job,
+          isThreeTier,
+          insCoCustomerTier
+        );
+      }
+    }
+
+    //Query for the Job or Create it.
+    const jobrecord = await InsertJob(
+      oauthClient,
+      req,
+      job,
+      isThreeTier,
+      ownerCustomerTier
+    );
+    //Is there a job associated to the owner? If so, get the ID and move on.
+
+    //Otherwise create it.
+
+    res.sendStatus(200);
+  } catch (error) {
+    console.log(error);
+    res.status(400).json(error);
+  }
+};
+
+async function QueryInsuranceCo(oauthClient, req, job) {
+  const result = await oauthClient.makeApiCall({
+    url: urlBuilder(
+      req.cookies.qbo_realmId,
+      "query",
+      `select * From Customer where DisplayName = '${job.ins_co_nm}'`
+    ),
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+  });
+  setNewRefreshToken(req.user.email, result);
+  return (
+    result.json &&
+    result.json.QueryResponse &&
+    result.json.QueryResponse.Customer &&
+    result.json.QueryResponse.Customer[0]
+  );
+}
+async function InsertInsuranceCo(oauthClient, req, job, bodyshop) {
+  const insCo = bodyshop.md_ins_cos.find((i) => i.name === job.ins_co_nm);
+
+  const Customer = {
+    DisplayName: job.ins_co_nm,
+    BillAddr: {
+      City: job.ownr_city,
+      Line1: insCo.street1,
+      Line2: insCo.street2,
+      PostalCode: insCo.zip,
+      CountrySubDivisionCode: insCo.state,
+    },
+  };
+  try {
+    const result = await oauthClient.makeApiCall({
+      url: urlBuilder(req.cookies.qbo_realmId, "customer"),
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(Customer),
+    });
+    setNewRefreshToken(req.user.email, result);
+    return result && result.Customer;
+  } catch (error) {
+    logger.log("qbo-receivables-error", "DEBUG", req.user.email, job.id, {
+      error,
+      method: "InsertInsuranceCo",
+    });
+    throw error;
+  }
+}
+
+async function QueryOwner(oauthClient, req, job) {
+  const ownerName = generateOwnerTier(job, true, null);
+  const result = await oauthClient.makeApiCall({
+    url: urlBuilder(
+      req.cookies.qbo_realmId,
+      "query",
+      `select * From Customer where DisplayName = '${ownerName}'`
+    ),
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+  });
+  setNewRefreshToken(req.user.email, result);
+  return (
+    result.json &&
+    result.json.QueryResponse &&
+    result.json.QueryResponse.Customer &&
+    result.json.QueryResponse.Customer[0]
+  );
+}
+
+async function InsertOwner(oauthClient, req, job, isThreeTier, parentTierRef) {
+  const ownerName = generateOwnerTier(job, true, null);
+  const Customer = {
+    DisplayName: ownerName,
+    BillAddr: {
+      City: job.ownr_city,
+      Line1: job.ownr_addr1,
+      Line2: job.ownr_addr2,
+      PostalCode: job.ownr_zip,
+      CountrySubDivisionCode: job.ownr_st,
+    },
+    ...(isThreeTier
+      ? {
+          Job: true,
+          ParentRef: {
+            value: parentTierRef.Id,
+          },
+        }
+      : {}),
+  };
+  try {
+    const result = await oauthClient.makeApiCall({
+      url: urlBuilder(req.cookies.qbo_realmId, "customer"),
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(Customer),
+    });
+    setNewRefreshToken(req.user.email, result);
+    return result && result.Customer;
+  } catch (error) {
+    logger.log("qbo-receivables-error", "DEBUG", req.user.email, job.id, {
+      error,
+      method: "InsertOwner",
+    });
+    throw error;
+  }
+}
+async function InsertJob(oauthClient, req, job, isThreeTier, parentTierRef) {
+  const Customer = {
+    DisplayName: job.ro_number,
+    BillAddr: {
+      City: job.ownr_city,
+      Line1: job.ownr_addr1,
+      Line2: job.ownr_addr2,
+      PostalCode: job.ownr_zip,
+      CountrySubDivisionCode: job.ownr_st,
+    },
+    ...(isThreeTier
+      ? {
+          Job: true,
+          ParentRef: {
+            value: parentTierRef.Id,
+          },
+        }
+      : {}),
+  };
+  try {
+    const result = await oauthClient.makeApiCall({
+      url: urlBuilder(req.cookies.qbo_realmId, "customer"),
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(Customer),
+    });
+    setNewRefreshToken(req.user.email, result);
+    return result && result.Customer;
+  } catch (error) {
+    logger.log("qbo-receivables-error", "DEBUG", req.user.email, job.id, {
+      error,
+      method: "InsertOwner",
+    });
+    throw error;
+  }
+}
+//  const customerCreate = {
+//    FullyQualifiedName: "A Test Customer",
+//    DisplayName: "A test Customer",
+//  };
+// const ret = await oauthClient.makeApiCall({
+//   url: urlBuilder(req.cookies.qbo_realmId, "customer"),
+//   method: "POST",
+//   headers: {
+//     "Content-Type": "application/json",
+//   },
+//   body: JSON.stringify(customerCreate),
+// });
+
+// const invoice = {
+//   Line: [
+//     {
+//       DetailType: "SalesItemLineDetail",
+//       Amount: 100,
+//       SalesItemLineDetail: {
+//         ItemRef: {
+//           name: "Services",
+//           value: "1",
+//         },
+//         TaxCodeRef: {
+//           value: "2",
+//         },
+//         Qty: 1,
+//         UnitPrice: 100,
+//       },
+//     },
+//   ],
+//   CustomerRef: {
+//     name: "A test Customer",
+//   },
+// };
+
+// const ret2 = await oauthClient.makeApiCall({
+//   url: urlBuilder(req.cookies.qbo_realmId, "invoice"),
+//   method: "POST",
+//   headers: {
+//     "Content-Type": "application/json",
+//   },
+//   body: JSON.stringify(invoice),
+// });
--- a/server/accounting/qbo/qbo.js
+++ b/server/accounting/qbo/qbo.js
@@ -1,7 +1,3 @@
-exports.callback = require("./qbo-callback").default;
-exports.authorize = require("./qbo-authorize").default;
-
-const OAuthClient = require("intuit-oauth");
 const path = require("path");
 require("dotenv").config({
  path: path.resolve(
@@ -9,3 +5,19 @@ require("dotenv").config({
    `.env.${process.env.NODE_ENV || "development"}`
  ),
 });
+
+function urlBuilder(realmId, object, query = null) {
+  return `https://${
+    process.env.NODE_ENV === "development" || !process.env.NODE_ENV
+      ? "sandbox-"
+      : ""
+  }quickbooks.api.intuit.com/v3/company/${realmId}/${object}${
+    query ? `?query=${encodeURIComponent(query)}` : ""
+  }`;
+}
+
+exports.urlBuilder = urlBuilder;
+exports.callback = require("./qbo-callback").default;
+exports.authorize = require("./qbo-authorize").default;
+exports.refresh = require("./qbo-callback").refresh;
+exports.receivables = require("./qbo-receivables").default;
--- a/server/cdk/cdk-get-makes.js
+++ b/server/cdk/cdk-get-makes.js
@@ -15,32 +15,101 @@ const Dinero = require("dinero.js");
 const _ = require("lodash");
 const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl");
 const { performance } = require("perf_hooks");
+const apiGqlClient = require("../graphql-client/graphql-client").client;

-exports.default = async function (socket, cdk_dealerid) {
+// exports.default = async function (socket, cdk_dealerid) {
+//   try {
+//     CdkBase.createLogEvent(
+//       socket,
+//       "DEBUG",
+//       `Getting makes and models list from CDK.`
+//     );
+//     return await GetCdkMakes(socket, cdk_dealerid);
+//   } catch (error) {
+//     CdkBase.createLogEvent(
+//       socket,
+//       "ERROR",
+//       `Error encountered in CdkGetMakes. ${error}`
+//     );
+//   }
+// };
+
+exports.default = async function ReloadCdkMakes(req, res) {
+  const { bodyshopid, cdk_dealerid } = req.body;
  try {
-    CdkBase.createLogEvent(
-      socket,
-      "DEBUG",
-      `Getting makes and models list from CDK.`
+    const BearerToken = req.headers.authorization;
+    //Query all CDK Models
+    const newList = await GetCdkMakes(req, cdk_dealerid);
+    console.log("🚀  ~ file: cdk-get-makes.js  ~ line 40  ~ newList", newList);
+
+    //Clear out the existing records
+    const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
+      headers: {
+        Authorization: BearerToken,
+      },
+    });
+
+    const deleteResult = await client
+      .setHeaders({ Authorization: BearerToken })
+      .request(queries.DELETE_ALL_DMS_VEHICLES, {});
+    console.log(
+      "🚀  ~ file: cdk-get-makes.js  ~ line 53  ~ deleteResult",
+      deleteResult
+    );
+
+    //Insert the new ones.
+
+    const insertResult = await client
+      .setHeaders({ Authorization: BearerToken })
+      .request(queries.INSERT_DMS_VEHICLES, {
+        vehicles: newList.map((i) => {
+          return {
+            bodyshopid,
+            makecode: i.makeCode,
+            modelcode: i.modelCode,
+            make: i.makeFullName,
+            model: i.modelFullName,
+          };
+        }),
+      });
+    console.log(
+      "🚀  ~ file: cdk-get-makes.js  ~ line 66  ~ insertResult",
+      insertResult
+    );
+
+    logger.log(
+      "cdk-replace-makes-models-success",
+      "DEBUG",
+      req.user.email,
+      null,
+      {
+        cdk_dealerid,
+        count: newList.length,
+      }
    );
-    return await GetCdkMakes(socket, cdk_dealerid);
  } catch (error) {
-    CdkBase.createLogEvent(
-      socket,
+    logger.log(
+      "cdk-replace-makes-models-error",
      "ERROR",
-      `Error encountered in CdkGetMakes. ${error}`
+      req.user.email,
+      null,
+      {
+        cdk_dealerid,
+        error,
+      }
    );
  }
 };

-async function GetCdkMakes(socket, cdk_dealerid) {
-  CdkBase.createLogEvent(socket, "TRACE", `{1} Begin GetCDkMakes WSDL Call`);
+async function GetCdkMakes(req, cdk_dealerid) {
+  logger.log("cdk-replace-makes-models", "DEBUG", req.user.email, null, {
+    cdk_dealerid,
+  });

  try {
    const soapClientVehicleInsert = await soap.createClientAsync(
      CdkWsdl.VehicleInsert
    );
-    const start = performance.now();

    const soapResponseVehicleSearch =
      await soapClientVehicleInsert.getMakeModelAsync(
@@ -51,28 +120,25 @@ async function GetCdkMakes(socket, cdk_dealerid) {

        {}
      );
-    CheckCdkResponseForError(socket, soapResponseVehicleSearch);
+
+    CheckCdkResponseForError(null, soapResponseVehicleSearch);
    const [
      result, //rawResponse, soapheader, rawRequest
    ] = soapResponseVehicleSearch;
-    const end = performance.now();
-    CdkBase.createLogEvent(
-      socket,
-      "TRACE",
-      `soapClientVehicleInsert.getMakeModelAsync Result Length ${
-        result.return.length
-      } and took ${end - start}ms`
+
+    return result.return;
+  } catch (error) {
+    logger.log(
+      "cdk-replace-makes-models-error",
+      "ERROR",
+      req.user.email,
+      null,
+      {
+        cdk_dealerid,
+        error,
+      }
    );

-    return result.return.map((element, index) => {
-      return { id: index, ...element };
-    });
-  } catch (error) {
-    CdkBase.createLogEvent(
-      socket,
-      "ERROR",
-      `Error in GetCdkMakes - ${JSON.stringify(error, null, 2)}`
-    );
    throw new Error(error);
  }
 }
--- a/server/cdk/cdk-job-export.js
+++ b/server/cdk/cdk-job-export.js
--- a/server/cdk/cdk-wsdl.js
+++ b/server/cdk/cdk-wsdl.js
@@ -78,11 +78,12 @@ exports.checkIndividualResult = checkIndividualResult;
 const cdkDomain = "https://uat-3pa.dmotorworks.com";
 exports.default = {
  // VehicleSearch: `${cdkDomain}/pip-vehicle/services/VehicleSearch?wsdl`,
+  AccountingGLInsertUpdate: `${cdkDomain}/pip-accounting-gl/services/AccountingGLInsertUpdate?wsdl`,
  VehicleInsertUpdate: `${cdkDomain}/pip-vehicle/services/VehicleInsertUpdate?wsdl`,
  CustomerInsertUpdate: `${cdkDomain}/pip-customer/services/CustomerInsertUpdate?wsdl`,
  CustomerSearch: `${cdkDomain}/pip-customer/services/CustomerSearch?wsdl`,
  VehicleSearch: `${cdkDomain}/pip-vehicle/services/VehicleSearch?wsdl`,
-  VehicleInsert: `${cdkDomain}/pip-vehicle/services/VehicleInsertUpdate?wsdl`,
+  ServiceHistoryInsert: `${cdkDomain}/pip-service-history-insert/services/ServiceHistoryInsert?wsdl`,
 };

 // The following login credentials will be used for all PIPs and all environments (User Acceptance Testing and Production).
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -114,6 +114,7 @@ query QUERY_JOBS_FOR_RECEIVABLES_EXPORT($ids: [uuid!]!) {
    id
    md_responsibility_centers
    accountingconfig
+    md_ins_cos
  }
 }
  `;
@@ -133,6 +134,7 @@ query QUERY_JOBS_FOR_CDK_EXPORT($id: uuid!) {
    ownr_fn
    ownr_addr1
    ownr_addr2
+    ownr_ph1
    ownr_zip
    ownr_city
    ownr_st
@@ -932,6 +934,19 @@ exports.GET_AUTOHOUSE_SHOPS = `query GET_AUTOHOUSE_SHOPS {
      imexshopid
  }
 }
+`;
+exports.DELETE_ALL_DMS_VEHICLES = `mutation DELETE_ALL_DMS_VEHICLES{
+  delete_dms_vehicles(where: {}) {
+    affected_rows
+  }
+}
+`;
+exports.INSERT_DMS_VEHICLES = `mutation INSERT_DMS_VEHICLES($vehicles: [dms_vehicles_insert_input!]!) {
+  insert_dms_vehicles(objects: $vehicles) {
+affected_rows
+  }
+}
+
 `;

 exports.GET_CDK_ALLOCATIONS = `
@@ -1035,3 +1050,17 @@ exports.GET_CDK_ALLOCATIONS = `
    }
  }
 `;
+
+exports.GET_QBO_AUTH = `query GET_QBO_AUTH($email: String!) {
+  associations(where: {_and: {active: {_eq: true}, useremail: {_eq: $email}}}){
+    id
+    qbo_auth
+  }
+}`;
+
+exports.SET_QBO_AUTH = `mutation SET_QBO_AUTH($email: String!, $qbo_auth: jsonb!) {
+  update_associations(_set: {qbo_auth: $qbo_auth}, where: {_and: {active: {_eq: true}, useremail: {_eq: $email}}}){
+    affected_rows
+  }
+}
+`;
--- a/server/web-sockets/web-socket.js
+++ b/server/web-sockets/web-socket.js
@@ -8,7 +8,10 @@ require("dotenv").config({

 const { io } = require("../../server");
 const { admin } = require("../firebase/firebase-handler");
-const CdkJobExport = require("../cdk/cdk-job-export").default;
+const {
+  default: CdkJobExport,
+  CdkSelectedCustomer,
+} = require("../cdk/cdk-job-export");
 const CdkGetMakes = require("../cdk/cdk-get-makes").default;
 const CdkCalculateAllocations =
  require("../cdk/cdk-calculate-allocations").default;
@@ -60,7 +63,7 @@ io.on("connection", (socket) => {
      `User selected customer ID  ${selectedCustomerId}`
    );
    socket.selectedCustomerId = selectedCustomerId;
-    //CdkJobExport(socket, jobid);
+    CdkSelectedCustomer(socket, selectedCustomerId);
  });

  socket.on("cdk-get-makes", async (cdk_dealerid, callback) => {
@@ -123,8 +126,40 @@ function createLogEvent(socket, level, message) {
  }
 }

+function createXmlEvent(socket, xml, message, isError = false) {
+  if (LogLevelHierarchy(socket.log_level) >= LogLevelHierarchy("TRACE")) {
+    socket.emit("log-event", {
+      timestamp: new Date(),
+      level: isError ? "ERROR" : "TRACE",
+      message: `${message}: ${xml}`,
+    });
+  }
+
+  logger.log(
+    isError ? "ws-log-event-xml-error" : "ws-log-event-xml",
+    isError ? "ERROR" : "TRACE",
+    socket.user.email,
+    socket.recordid,
+    {
+      wsmessage: message,
+      xml,
+    }
+  );
+
+  if (socket.logEvents && isArray(socket.logEvents)) {
+    socket.logEvents.push({
+      timestamp: new Date(),
+      level: isError ? "ERROR" : "TRACE",
+      message,
+      xml,
+    });
+  }
+}
+
 function LogLevelHierarchy(level) {
  switch (level) {
+    case "XML":
+      return 5;
    case "TRACE":
      return 5;
    case "DEBUG":
@@ -141,3 +176,4 @@ function LogLevelHierarchy(level) {
 }

 exports.createLogEvent = createLogEvent;
+exports.createXmlEvent = createXmlEvent;
--- a/yarn.lock
+++ b/yarn.lock
@@ -210,10 +210,10 @@
  resolved "https://registry.yarnpkg.com/@jonkemp/package-utils/-/package-utils-1.0.7.tgz#6550ea56c9bd61bb4161c99e7ca38b972ad3a25d"
  integrity sha512-OoK+K1RmhtS8SlORrlH7sW0CNdrnm0BxKNcv4pQIk6y6VORsHiX91gV3dh6XD2eS7J+iCXROcu5sGuH0tjmNEQ==

-"@oozcitak/dom@1.15.8":
-  version "1.15.8"
-  resolved "https://registry.yarnpkg.com/@oozcitak/dom/-/dom-1.15.8.tgz#0c0c7bb54cfdaadc07fd637913e706101721d15d"
-  integrity sha512-MoOnLBNsF+ok0HjpAvxYxR4piUhRDCEWK0ot3upwOOHYudJd30j6M+LNcE8RKpwfnclAX9T66nXXzkytd29XSw==
+"@oozcitak/dom@1.15.10":
+  version "1.15.10"
+  resolved "https://registry.yarnpkg.com/@oozcitak/dom/-/dom-1.15.10.tgz#dca7289f2b292cff2a901ea4fbbcc0a1ab0b05c2"
+  integrity sha512-0JT29/LaxVgRcGKvHmSrUTEvZ8BXvZhGl2LASRUgHqDTC1M5g1pLmVv56IYNyt3bG2CUjDkc67wnyZC14pbQrQ==
  dependencies:
    "@oozcitak/infra" "1.0.8"
    "@oozcitak/url" "1.0.4"
@@ -329,12 +329,12 @@
  dependencies:
    "@types/node" "*"

-"@types/cookie@^0.4.0":
+"@types/cookie@^0.4.1":
  version "0.4.1"
  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
  integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==

-"@types/cors@^2.8.10":
+"@types/cors@^2.8.12":
  version "2.8.12"
  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
  integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
@@ -428,6 +428,11 @@
  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.8.tgz#511fc1569cc32b0cf50941fe9f00bf70f94116bb"
  integrity sha512-7axfYN8SW9pWg78NgenHasSproWQee5rzyPVLC9HpaQSDgNArsnKJD88EaMfi4Pl48AyciO3agYCFqpHS1gLpg==

+"@xmldom/xmldom@^0.7.0":
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.3.tgz#55de695f77afd3cc0e5bee0aa900040bc63c0f63"
+  integrity sha512-8XmJdPut2XGtfFcsNsqEsvMUmAwk7xLq7m+E/GcsU9b5qyFFIsiX4Fvnb5UoQ4wo12Wlm07YFJERoyWUYdbIpw==
+
 abort-controller@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
@@ -460,7 +465,7 @@ agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2:
  dependencies:
    debug "4"

-ajv@^6.10.0, ajv@^6.12.4:
+ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4:
  version "6.12.6"
  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -526,13 +531,18 @@ asap@^2.0.0:
  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=

-asn1@^0.2.4:
+asn1@^0.2.4, asn1@~0.2.3:
  version "0.2.4"
  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
  dependencies:
    safer-buffer "~2.1.0"

+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
 ast-types@^0.13.2:
  version "0.13.4"
  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz#ee0d77b343263965ecc3fb62da16e7222b2b6782"
@@ -572,10 +582,10 @@ atob@2.1.2:
  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==

-aws-sdk@^2.951.0:
-  version "2.971.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.971.0.tgz#84e5b119e2eb84dc484a2b1c3a81e2f91e1cbfc8"
-  integrity sha512-7mPN7HnPILMNA8YMEMCZp/bi3o4blPoQ1TbBWaowGUt8RhkxgdAAqMy2vAkhElT5xWjROZS+1NgG3khzBlb0xw==
+aws-sdk@^2.979.0:
+  version "2.979.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.979.0.tgz#d0104fec763cc3eafb123e709f94866790109da4"
+  integrity sha512-pKKhpYZwmihCvuH3757WHY8JQI9g2wvtF3s0aiyH2xCUmX/6uekhExz/utD4uqZP3m3PwKZPGQkQkH30DtHrPw==
  dependencies:
    buffer "4.9.2"
    events "1.1.1"
@@ -587,6 +597,16 @@ aws-sdk@^2.951.0:
    uuid "3.3.2"
    xml2js "0.4.19"

+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+
 axios-ntlm@^1.1.6:
  version "1.1.6"
  resolved "https://registry.yarnpkg.com/axios-ntlm/-/axios-ntlm-1.1.6.tgz#242971c9b8ee1e548e8507b22c37e15ae3f798ab"
@@ -626,7 +646,7 @@ batch@^0.6.1:
  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=

-bcrypt-pbkdf@^1.0.2:
+bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
@@ -638,7 +658,12 @@ bignumber.js@^9.0.0:
  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.1.tgz#8d7ba124c882bfd8e43260c67475518d0689e4e5"
  integrity sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==

-bluebird@^3.5.0:
+bluebird@3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.3.4.tgz#f780fe43e1a7a6510f67abd7d0d79533a40ddde6"
+  integrity sha1-94D+Q+GnplEPZ6vX0NeVM6QN3eY=
+
+bluebird@^3.5.0, bluebird@^3.7.2:
  version "3.7.2"
  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -719,6 +744,11 @@ callsites@^3.0.0:
  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==

+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
 chalk@^2.0.0, chalk@^2.4.2:
  version "2.4.2"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -835,7 +865,7 @@ colorspace@1.1.x:
    color "3.0.x"
    text-hex "1.0.x"

-combined-stream@^1.0.6, combined-stream@^1.0.8:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
  version "1.0.8"
  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -926,6 +956,11 @@ content-disposition@0.5.3:
  dependencies:
    safe-buffer "5.1.2"

+content-type-parser@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
+  integrity sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ==
+
 content-type@~1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
@@ -938,6 +973,14 @@ convert-source-map@^1.7.0:
  dependencies:
    safe-buffer "~5.1.1"

+cookie-parser@^1.4.5:
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.5.tgz#3e572d4b7c0c80f9c61daf604e4336831b5d1d49"
+  integrity sha512-f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw==
+  dependencies:
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+
 cookie-signature@1.0.6:
  version "1.0.6"
  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -963,7 +1006,7 @@ core-js@3.6.5:
  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
  integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==

-core-util-is@~1.0.0:
+core-util-is@1.0.2, core-util-is@~1.0.0:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
@@ -1040,6 +1083,13 @@ cssom@^0.4.4:
  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==

+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
 data-uri-to-buffer@3:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636"
@@ -1050,7 +1100,7 @@ date-and-time@^2.0.0:
  resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-2.0.0.tgz#99f5fb6b6c7bcd4d1f6dcbeb37553dc0ff797b65"
  integrity sha512-HJSzj25iPm8E01nt+rSmCIlwjsmjvKfUivG/kXBglpymcHF1FolWAqWwTEV4FvN1Lx5UjPf0J1W4H8yQsVBfFg==

-date-fns@^2.16.1:
+date-fns@^2.16.1, date-fns@^2.9.0:
  version "2.23.0"
  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9"
  integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==
@@ -1067,7 +1117,7 @@ debug@2.6.9:
  dependencies:
    ms "2.0.0"

-debug@4, debug@^4.0.1, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@~4.3.1:
+debug@4, debug@^4.0.1, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@~4.3.1, debug@~4.3.2:
  version "4.3.2"
  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
@@ -1210,6 +1260,14 @@ duplexify@^4.0.0, duplexify@^4.1.1:
    readable-stream "^3.1.1"
    stream-shift "^1.0.0"

+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
 ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11:
  version "1.0.11"
  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
@@ -1258,10 +1316,10 @@ engine.io-parser@~4.0.0:
  dependencies:
    base64-arraybuffer "0.1.4"

-engine.io@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-5.1.1.tgz#a1f97e51ddf10cbd4db8b5ff4b165aad3760cdd3"
-  integrity sha512-aMWot7H5aC8L4/T8qMYbLdvKlZOdJTH54FxfdFunTGvhMx1BHkJOntWArsVfgAZVwAO9LC2sryPWRcEeUzCe5w==
+engine.io@~5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-5.2.0.tgz#554cdd0230d89de7b1a49a809d7ee5a129d36809"
+  integrity sha512-d1DexkQx87IFr1FLuV+0f5kAm1Hk1uOVijLOb+D1sDO2QMb7YjE02VHtZtxo7xIXMgcWLb+vl3HRT0rI9tr4jQ==
  dependencies:
    accepts "~1.3.4"
    base64id "2.0.0"
@@ -1507,7 +1565,7 @@ express@^4.16.4:
    utils-merge "1.0.1"
    vary "~1.1.2"

-extend@^3.0.2:
+extend@^3.0.2, extend@~3.0.2:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -1527,6 +1585,16 @@ extract-files@^9.0.0:
  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-9.0.0.tgz#8a7744f2437f81f5ed3250ed9f1550de902fe54a"
  integrity sha512-CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ==

+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
  version "3.1.3"
  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -1601,10 +1669,10 @@ finalhandler@~1.1.2:
    statuses "~1.5.0"
    unpipe "~1.0.0"

-firebase-admin@^9.11.0:
-  version "9.11.0"
-  resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-9.11.0.tgz#c0c72e4480b836fb4cd15e6d834ddfbfb9cc54ba"
-  integrity sha512-68fXdwcKF99LkWBE33M5hnLwjvGpbCRznIOtZVsiBqZdM9iwxlTfNEpAckh++o3GdJcSLRUWmIN+MKqPUsxoCA==
+firebase-admin@^9.11.1:
+  version "9.11.1"
+  resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-9.11.1.tgz#b4f472ed51951937f333a4d88a0693ad37ffc90a"
+  integrity sha512-Y9fjelljy6MKqwsSbM/UN1k8gBQh5zfm5fCTe0Z6Gch2T3nDUIPsTcf+jfe4o40/MPYuybili9XJjTMmM2e5MQ==
  dependencies:
    "@firebase/database" "^0.10.0"
    "@firebase/database-types" "^0.7.2"
@@ -1645,6 +1713,11 @@ follow-redirects@^1.10.0:
  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.2.tgz#cecb825047c00f5e66b142f90fed4f515dec789b"
  integrity sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==

+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
 form-data@^2.0.0:
  version "2.5.1"
  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
@@ -1663,6 +1736,15 @@ form-data@^3.0.0:
    combined-stream "^1.0.8"
    mime-types "^2.1.12"

+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
 formidable@^1.2.2:
  version "1.2.2"
  resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9"
@@ -1773,6 +1855,13 @@ get-uri@3:
    fs-extra "^8.1.0"
    ftp "^0.3.10"

+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
 glob-parent@^5.1.2:
  version "5.1.2"
  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -1854,10 +1943,10 @@ graphql-request@^3.4.0:
    extract-files "^9.0.0"
    form-data "^3.0.0"

-graphql@^15.5.1:
-  version "15.5.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.1.tgz#f2f84415d8985e7b84731e7f3536f8bb9d383aad"
-  integrity sha512-FeTRX67T3LoE3LWAxxOlW2K3Bz+rMYAC18rRguK4wgXaTZMiJwSUwDmPFo3UadAKbzirKIg5Qy+sNJXbpPRnQw==
+graphql@^15.5.2:
+  version "15.5.2"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.2.tgz#efa19f8f2bf1a48eb7d5c85bf17e144ba8bb0480"
+  integrity sha512-dZjLPWNQqYv0dqV2RNbiFed0LtSp6yd4jchsDGnuhDKa9OQHJYCfovaOEvY91w9gqbYO7Se9LKDTl3xxYva/3w==

 graylog2@^0.2.1:
  version "0.2.1"
@@ -1880,6 +1969,19 @@ gzip-size@^6.0.0:
  dependencies:
    duplexer "^0.1.2"

+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.0:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
 has-flag@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -1967,6 +2069,28 @@ http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1:
    agent-base "6"
    debug "4"

+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+httpntlm@^1.5.2:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/httpntlm/-/httpntlm-1.7.7.tgz#51b914f18e5de2868d4bfe50aeecdb1db23218a1"
+  integrity sha512-Pv2Rvrz8H0qv1Dne5mAdZ9JegG1uc6Vu5lwLflIY6s8RKHdZQbW39L4dYswSgqMDT0pkJILUTKjeyU0VPNRZjA==
+  dependencies:
+    httpreq ">=0.4.22"
+    underscore "~1.12.1"
+
+httpreq@>=0.4.22:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/httpreq/-/httpreq-0.5.2.tgz#be6777292fa1038d7771d7c01d9a5e1219de951c"
+  integrity sha512-2Jm+x9WkExDOeFRrdBCBSpLPT5SokTcRHkunV3pjKmX/cx6av8zQ0WtHUMDrYb6O4hBFzNU6sxJEypvRUVYKnw==
+
 https-proxy-agent@5, https-proxy-agent@^5.0.0:
  version "5.0.0"
  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
@@ -2023,6 +2147,11 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, i
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==

+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+
 inherits@2.0.3:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
@@ -2118,7 +2247,7 @@ is-stream@^2.0.0:
  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==

-is-typedarray@^1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -2145,6 +2274,11 @@ isexe@^2.0.0:
  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=

+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
 jake@^10.6.1:
  version "10.8.2"
  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"
@@ -2188,6 +2322,11 @@ js-yaml@^3.13.1:
    argparse "^1.0.7"
    esprima "^4.0.0"

+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
 json-bigint@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1"
@@ -2210,11 +2349,21 @@ json-schema-traverse@^1.0.0:
  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==

+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
 json-stable-stringify-without-jsonify@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=

+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
 jsonfile@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -2238,6 +2387,16 @@ jsonwebtoken@^8.3.0, jsonwebtoken@^8.5.1:
    ms "^2.1.1"
    semver "^5.6.0"

+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
 jwa@^1.4.1:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
@@ -2283,6 +2442,13 @@ jws@^4.0.0:
    jwa "^2.0.0"
    safe-buffer "^5.0.1"

+jxon@^2.0.0-beta.5:
+  version "2.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/jxon/-/jxon-2.0.0-beta.5.tgz#3b6a94104f9801ee682fd056645ff5473d9b343e"
+  integrity sha1-O2qUEE+YAe5oL9BWZF/1Rz2bND4=
+  dependencies:
+    xmldom "^0.1.21"
+
 kuler@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
@@ -2529,7 +2695,7 @@ mime-db@1.49.0, "mime-db@>= 1.43.0 < 2":
  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed"
  integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==

-mime-types@^2.0.8, mime-types@^2.1.12, mime-types@~2.1.24:
+mime-types@^2.0.8, mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24:
  version "2.1.32"
  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5"
  integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==
@@ -2636,6 +2802,21 @@ node-mailjet@^3.3.4:
    superagent "^6.1.0"
    superagent-proxy "^2.1.0"

+node-quickbooks@^2.0.39:
+  version "2.0.39"
+  resolved "https://registry.yarnpkg.com/node-quickbooks/-/node-quickbooks-2.0.39.tgz#a2534d24063e8a0cea5bb80c66b0727c1c942081"
+  integrity sha512-HFC5okMoK+DYaXvfU7CLkp5JAuLZ/KxGIn900bjbxiDf/XNhV7BhNFP3v73HbVlEKJTwwabNY5SF/pEJw5+nOA==
+  dependencies:
+    bluebird "3.3.4"
+    date-fns "^2.9.0"
+    jxon "^2.0.0-beta.5"
+    querystring "0.2.0"
+    request "2.88.0"
+    request-debug "0.2.0"
+    underscore "1.12.1"
+    util "0.10.3"
+    uuid "^3.1.0"
+
 nodemailer@^6.6.3:
  version "6.6.3"
  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.6.3.tgz#31fb53dd4d8ae16fc088a65cb9ffa8d928a69b48"
@@ -2658,6 +2839,11 @@ nth-check@~1.0.1:
  dependencies:
    boolbase "~1.0.0"

+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
 object-assign@^4:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -2811,10 +2997,15 @@ path-to-regexp@0.1.7:
  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=

-phone@^3.1.2:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/phone/-/phone-3.1.5.tgz#94b4c029bbb05594602b2c859acfbf22f8ee41c6"
-  integrity sha512-eKZnXpD6leGmumG3DUzt3Wi8Dwu11q302Qqer15Q7luX1bnwoYoP2A1j9aOYImSwr7uQo8a0ksyVrQqt+LC78A==
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+phone@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/phone/-/phone-3.1.6.tgz#eefff0be1ce4ce9f2ee028c67be6b58dc5616ef1"
+  integrity sha512-46WCdbDG32OKoPsntTg2l0VBaWVWg0A3zvH5dUhApwOupyn7owXRtDBz6vAjsJiZQGTft++WvTxEZeqxlCUv9g==

 pick-util@^1.1.3:
  version "1.1.3"
@@ -2926,7 +3117,7 @@ pseudomap@^1.0.1:
  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=

-psl@^1.1.28:
+psl@^1.1.24, psl@^1.1.28:
  version "1.8.0"
  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
@@ -2953,6 +3144,11 @@ punycode@1.3.2:
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=

+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
 punycode@^2.1.0, punycode@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@@ -2984,6 +3180,11 @@ qs@^6.5.0, qs@^6.6.0, qs@^6.9.4:
  dependencies:
    side-channel "^1.0.4"

+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
 query-string@^6.12.1:
  version "6.14.1"
  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a"
@@ -2994,6 +3195,16 @@ query-string@^6.12.1:
    split-on-first "^1.0.0"
    strict-uri-encode "^2.0.0"

+query-string@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.0.1.tgz#45bd149cf586aaa582dffc7ec7a8ad97dd02f75d"
+  integrity sha512-uIw3iRvHnk9to1blJCG3BTc+Ro56CBowJXKmNNAm3RulvPBzWLRqKSiiDk+IplJhsydwtuNMHi8UGQFcCLVfkA==
+  dependencies:
+    decode-uri-component "^0.2.0"
+    filter-obj "^1.1.0"
+    split-on-first "^1.0.0"
+    strict-uri-encode "^2.0.0"
+
 querystring@0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
@@ -3090,6 +3301,39 @@ remote-content@^2.0.0:
    superagent "^6.1.0"
    superagent-proxy "^2.1.0"

+request-debug@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/request-debug/-/request-debug-0.2.0.tgz#fc054ec817181b04ca41a052c136f61c48abaf78"
+  integrity sha1-/AVOyBcYGwTKQaBSwTb2HEirr3g=
+  dependencies:
+    stringify-clone "^1.0.0"
+
+request@2.88.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.0"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.4.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 require-directory@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -3177,12 +3421,12 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==

-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@~5.2.0:
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
  version "5.2.1"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==

-"safer-buffer@>= 2.1.2 < 3", safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -3310,25 +3554,28 @@ snakeize@^0.1.0:
  resolved "https://registry.yarnpkg.com/snakeize/-/snakeize-0.1.0.tgz#10c088d8b58eb076b3229bb5a04e232ce126422d"
  integrity sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0=

-soap@^0.40.0:
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/soap/-/soap-0.40.0.tgz#c0d95520dd3528593ff0c12bd1c959620d2089b6"
-  integrity sha512-66GjEXIWyRsc24RXtzzoVaXtHzd3+DRy0PsXxMGrqGU26mqKfORbtDLFJIyp2OXcCHch5pM0LkXUXI/d/KouNw==
+soap@^0.42.0:
+  version "0.42.0"
+  resolved "https://registry.yarnpkg.com/soap/-/soap-0.42.0.tgz#33f6ce109f9e6fdc9b61c3665c592c6d0e18e0ab"
+  integrity sha512-7q4tYAkK0+KIeYRK0n/JBFP7XdZChqfGUfcDQRXt5uvKkRtj0gxTEc7WbfLnOqjyif86v5/MosE/4K+8ZYaB1Q==
  dependencies:
    axios "^0.21.1"
    axios-ntlm "^1.1.6"
+    content-type-parser "^1.0.2"
    debug "^4.3.1"
+    formidable "^1.2.2"
    get-stream "^6.0.1"
+    httpntlm "^1.5.2"
    lodash "^4.17.21"
    sax ">=0.6"
    strip-bom "^3.0.0"
    uuid "^8.3.2"
-    xml-crypto "^2.1.0"
+    xml-crypto "^2.1.3"

-socket.io-adapter@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.3.1.tgz#a442720cb09a4823cfb81287dda1f9b52d4ccdb2"
-  integrity sha512-8cVkRxI8Nt2wadkY6u60Y4rpW3ejA1rxgcK2JuyIhmF+RMNpTy1QRtkHIDUOf3B4HlQwakMsWbKftMv/71VMmw==
+socket.io-adapter@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.3.2.tgz#039cd7c71a52abad984a6d57da2c0b7ecdd3c289"
+  integrity sha512-PBZpxUPYjmoogY0aoaTmo1643JelsaS1CiAwNjRVdrI0X9Seuc19Y2Wife8k88avW6haG8cznvwbubAZwH4Mtg==

 socket.io-parser@~4.0.4:
  version "4.0.4"
@@ -3339,19 +3586,19 @@ socket.io-parser@~4.0.4:
    component-emitter "~1.3.0"
    debug "~4.3.1"

-socket.io@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.1.3.tgz#d114328ef27ab31b889611792959c3fa6d502500"
-  integrity sha512-tLkaY13RcO4nIRh1K2hT5iuotfTaIQw7cVIe0FUykN3SuQi0cm7ALxuyT5/CtDswOMWUzMGTibxYNx/gU7In+Q==
+socket.io@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.2.0.tgz#9e1c09d3ea647e24963a2e7ba8ea5c847778e2ed"
+  integrity sha512-sjlGfMmnaWvTRVxGRGWyhd9ctpg4APxWAxu85O/SxekkxHhfxmePWZbaYCkeX5QQX0z1YEnKOlNt6w82E4Nzug==
  dependencies:
-    "@types/cookie" "^0.4.0"
-    "@types/cors" "^2.8.10"
+    "@types/cookie" "^0.4.1"
+    "@types/cors" "^2.8.12"
    "@types/node" ">=10.0.0"
    accepts "~1.3.4"
    base64id "~2.0.0"
-    debug "~4.3.1"
-    engine.io "~5.1.1"
-    socket.io-adapter "~2.3.1"
+    debug "~4.3.2"
+    engine.io "~5.2.0"
+    socket.io-adapter "~2.3.2"
    socket.io-parser "~4.0.4"

 socks-proxy-agent@5, socks-proxy-agent@^5.0.0:
@@ -3445,10 +3692,10 @@ sprintf-js@~1.0.2:
  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=

-ssh2-sftp-client@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/ssh2-sftp-client/-/ssh2-sftp-client-7.0.2.tgz#0470b3f5e17da5971242ba9f532d740a4476f60a"
-  integrity sha512-6DeNKZFFNiWFt2oVrOghmvWaMQe0We5OJLuFoEFKhcDEK1rvMbgEu8BqU1rB6hmyzcbbNPo62IlIPRI3GdUxvA==
+ssh2-sftp-client@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/ssh2-sftp-client/-/ssh2-sftp-client-7.0.3.tgz#6940c5fb7dad4c3a5199ee154775f66050ccfc0b"
+  integrity sha512-h2Zy0GNNOJ7ESyRwBXEdjWEnj7E5z1nVGxtZr7uE77UaIipHbGJ2aQwj7kDBXV/1Mq3YJNu38st8QC48f8ufoA==
  dependencies:
    concat-stream "^2.0.0"
    promise-retry "^2.0.1"
@@ -3465,6 +3712,21 @@ ssh2@^1.2.0:
    cpu-features "0.0.2"
    nan "^2.15.0"

+sshpk@^1.7.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
 stack-trace@0.0.x:
  version "0.0.10"
  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
@@ -3525,6 +3787,11 @@ string_decoder@~1.1.1:
  dependencies:
    safe-buffer "~5.1.0"

+stringify-clone@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stringify-clone/-/stringify-clone-1.1.1.tgz#309a235fb4ecfccd7d388dbe18ba904facaf433b"
+  integrity sha1-MJojX7Ts/M19OI2+GLqQT6yvQzs=
+
 strip-ansi@^6.0.0:
  version "6.0.0"
  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
@@ -3542,10 +3809,10 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==

-stripe@^8.164.0:
-  version "8.169.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.169.0.tgz#5970cc055872fccbc49713f6428a682ece7f3e76"
-  integrity sha512-h4JVMGnhYwkEu8dFHX0MewtTFEWcjJQ2zTiFcvhW5toa/2JcEeObfwH27Z29A6t/6s2vnXrXxEnuyL7gBBAXqA==
+stripe@^8.171.0:
+  version "8.171.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.171.0.tgz#9c52d2e3928c7ebf708ce1f9eb2d3cc2f682f8bf"
+  integrity sha512-SriWXEVukmnrE40BoRe18Zsw9zftpnDlZlgxhZd6qJqP/RwN59op5YoW2mA0LE6Grxn8FH8RB9CXVxCAHNTk8w==
  dependencies:
    "@types/node" ">=8.1.0"
    qs "^6.6.0"
@@ -3664,6 +3931,14 @@ tough-cookie@^2.0.0:
    psl "^1.1.28"
    punycode "^2.1.1"

+tough-cookie@~2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+  dependencies:
+    psl "^1.1.24"
+    punycode "^1.4.1"
+
 tree-kill@^1.2.2:
  version "1.2.2"
  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
@@ -3689,15 +3964,22 @@ tsscmp@1.0.6:
  resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
  integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==

-tweetnacl@^0.14.3:
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
  version "0.14.5"
  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=

-twilio@^3.66.0:
-  version "3.67.0"
-  resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.67.0.tgz#24d5d1ca7371b99179a08b0b36c914d1b6cdd196"
-  integrity sha512-MY0qsb895IDS3GEeBVVkNThr/ONy6a+jstkxeRVLdva52PMkIsrub68PWIXX2ubpiCMJWcX3ZroxRbRmfumFBQ==
+twilio@^3.67.1:
+  version "3.67.1"
+  resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.67.1.tgz#7734c1c186b1309ca58555dd13ff7a2140f3d056"
+  integrity sha512-JpdPLqPyYpMyrW39ByUbHimqeHpcWuMv7DD1R215C5wf8dS9EzYfAHqFvrZCEOZkdpB3QeR0UZfvh96jb8FB7Q==
  dependencies:
    axios "^0.21.1"
    dayjs "^1.8.29"
@@ -3708,7 +3990,7 @@ twilio@^3.66.0:
    qs "^6.9.4"
    rootpath "^0.1.2"
    scmp "^2.1.0"
-    url-parse "^1.5.0"
+    url-parse "^1.5.3"
    xmlbuilder "^13.0.2"

 type-check@^0.4.0, type-check@~0.4.0:
@@ -3762,6 +4044,11 @@ uid-safe@2.1.5:
  dependencies:
    random-bytes "~1.0.0"

+underscore@1.12.1, underscore@~1.12.1:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.1.tgz#7bb8cc9b3d397e201cf8553336d262544ead829e"
+  integrity sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==
+
 unique-string@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@@ -3786,7 +4073,7 @@ uri-js@^4.2.2:
  dependencies:
    punycode "^2.1.0"

-url-parse@^1.5.0:
+url-parse@^1.5.3:
  version "1.5.3"
  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
  integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
@@ -3807,6 +4094,13 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=

+util@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
+  dependencies:
+    inherits "2.0.1"
+
 utils-merge@1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
@@ -3817,6 +4111,11 @@ uuid@3.3.2:
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==

+uuid@^3.1.0, uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 uuid@^8.0.0, uuid@^8.3.2:
  version "8.3.2"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
@@ -3840,6 +4139,15 @@ vary@^1, vary@~1.1.2:
  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=

+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
 weak-map@^1.0.5:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.5.tgz#79691584d98607f5070bd3b70a40e6bb22e401eb"
@@ -3928,12 +4236,12 @@ xdg-basedir@^4.0.0:
  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==

-xml-crypto@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.2.tgz#501506d42e466f6cd908c5a03182217231b4e4b8"
-  integrity sha512-DBhZXtBjENtLwJmeJhLUBwUm9YWNjCRvAx6ESP4VJyM9PDuKqZu2Fp5Y5HKqcdJT7vV7eI25Z4UBMezji6QloQ==
+xml-crypto@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.3.tgz#6a7272b610ea3e4ea7f13e9e4876f1b20cbc32c8"
+  integrity sha512-MpXZwnn9JK0mNPZ5mnFIbNnQa+8lMGK4NtnX2FlJMfMWR60sJdFO9X72yO6ji068pxixzk53O7x0/iSKh6IhyQ==
  dependencies:
-    xmldom "^0.6.0"
+    "@xmldom/xmldom" "^0.7.0"
    xpath "0.0.32"

 xml2js@0.4.19:
@@ -3944,12 +4252,12 @@ xml2js@0.4.19:
    sax ">=0.6.0"
    xmlbuilder "~9.0.1"

-xmlbuilder2@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder2/-/xmlbuilder2-2.4.1.tgz#899c783a833188c5a5aa6f3c5428a3963f3e479d"
-  integrity sha512-vliUplZsk5vJnhxXN/mRcij/AE24NObTUm/Zo4vkLusgayO6s3Et5zLEA14XZnY1c3hX5o1ToR0m0BJOPy0UvQ==
+xmlbuilder2@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/xmlbuilder2/-/xmlbuilder2-3.0.2.tgz#fc499688b35a916f269e7b459c2fa02bb5c0822a"
+  integrity sha512-h4MUawGY21CTdhV4xm3DG9dgsqyhDkZvVJBx88beqX8wJs3VgyGQgAn5VreHuae6unTQxh115aMK5InCVmOIKw==
  dependencies:
-    "@oozcitak/dom" "1.15.8"
+    "@oozcitak/dom" "1.15.10"
    "@oozcitak/infra" "1.0.8"
    "@oozcitak/util" "8.3.8"
    "@types/node" "*"
@@ -3965,10 +4273,10 @@ xmlbuilder@~9.0.1:
  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=

-xmldom@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f"
-  integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==
+xmldom@^0.1.21:
+  version "0.1.31"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
+  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==

 xpath@0.0.32:
  version "0.0.32"