Merged in release/2021-10-22 (pull request #253)

release/2021-10-22

Approved-by: Patrick Fic

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -4283,6 +4283,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>md_ded_notes</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>
                                     <folder_node>
                                         <name>md_hour_split</name>
                                         <children>
@@ -7120,6 +7141,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>color</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>default_arrived</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -7456,6 +7498,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>production_colors</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>production_statuses</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -8019,6 +8082,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>estimators</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>insurancecos</name>
                                         <definition_loaded>false</definition_loaded>
@@ -17449,6 +17533,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>changestimator</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>convert</name>
                                         <definition_loaded>false</definition_loaded>
@@ -19695,6 +19800,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>ded_note</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>ded_status</name>
                                         <definition_loaded>false</definition_loaded>
@@ -21159,6 +21285,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>loss_of_use</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>ma2s</name>
                                         <definition_loaded>false</definition_loaded>

client/package.json

@@ -9,14 +9,15 @@
     "@fingerprintjs/fingerprintjs": "^3.3.0",
     "@lourenci/react-kanban": "^2.1.0",
     "@openreplay/tracker": "^3.4.4",
-    "@openreplay/tracker-assist": "^3.4.3",
+    "@openreplay/tracker-assist": "^3.4.4",
     "@openreplay/tracker-graphql": "^3.0.0",
     "@openreplay/tracker-redux": "^3.0.0",
     "@sentry/react": "^6.13.3",
     "@sentry/tracing": "^6.13.3",
+    "@splitsoftware/splitio-react": "^1.3.0",
     "@stripe/react-stripe-js": "^1.6.0",
-    "@stripe/stripe-js": "^1.19.1",
+    "@stripe/stripe-js": "^1.20.2",
-    "@tanem/react-nprogress": "^3.0.80",
+    "@tanem/react-nprogress": "^3.0.81",
     "antd": "^4.16.13",
     "apollo-link-logger": "^2.0.0",
     "axios": "^0.23.0",
@@ -26,15 +27,15 @@
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
-    "firebase": "^9.1.2",
+    "firebase": "^9.1.3",
     "graphql": "^15.6.1",
-    "i18next": "^21.3.0",
+    "i18next": "^21.3.2",
     "i18next-browser-languagedetector": "^6.1.2",
     "jsoneditor": "^9.5.6",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.9.37",
+    "libphonenumber-js": "^1.9.38",
-    "logrocket": "^2.1.0",
+    "logrocket": "^2.1.1",
-    "markerjs2": "^2.14.0",
+    "markerjs2": "^2.15.0",
     "moment-business-days": "^1.2.0",
     "phone": "^3.1.8",
     "preval.macro": "^5.0.0",
@@ -59,14 +60,14 @@
     "react-scripts": "^4.0.3",
     "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.3",
-    "recharts": "^2.1.4",
+    "recharts": "^2.1.5",
     "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.42.1",
+    "sass": "^1.43.2",
-    "socket.io-client": "^4.2.0",
+    "socket.io-client": "^4.3.2",
     "styled-components": "^5.3.1",
     "subscriptions-transport-ws": "^0.9.18",
     "web-vitals": "^2.1.2",
@@ -114,7 +115,7 @@
     ]
   },
   "devDependencies": {
-    "@sentry/webpack-plugin": "^1.18.0",
+    "@sentry/webpack-plugin": "^1.18.1",
     "patch-package": "^6.4.7",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.2"

client/src/App/App.container.jsx

@@ -1,4 +1,8 @@
 import { ApolloProvider } from "@apollo/client";
+//import trackerRedux from "@openreplay/tracker-redux";
+import Tracker from "@openreplay/tracker";
+import trackerGraphQL from "@openreplay/tracker-graphql";
+import { SplitFactory, SplitSdk } from "@splitsoftware/splitio-react";
 import { ConfigProvider } from "antd";
 import enLocale from "antd/es/locale/en_US";
 import LogRocket from "logrocket";
@@ -6,13 +10,11 @@ import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
-import client from "../utils/GraphQLClient";
-import App from "./App";
-import trackerGraphQL from "@openreplay/tracker-graphql";
-//import trackerRedux from "@openreplay/tracker-redux";
-import Tracker from "@openreplay/tracker";
 //import trackerAssist from "@openreplay/tracker-assist";
 import { getCurrentUser } from "../firebase/firebase.utils";
+import client from "../utils/GraphQLClient";
+import App from "./App";
+
 moment.locale("en-US");
 
 export const tracker = new Tracker({
@@ -36,6 +38,13 @@ export const recordGraphQL = tracker.use(trackerGraphQL());
 tracker.start();
 if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");
 
+export const factory = SplitSdk({
+  core: {
+    authorizationKey: process.env.REACT_APP_SPLIT_API,
+    key: "anon",
+  },
+});
+
 export default function AppContainer() {
   const { t } = useTranslation();
 
@@ -53,7 +62,9 @@ export default function AppContainer() {
         }}
       >
         <GlobalLoadingBar />
-        <App />
+        <SplitFactory factory={factory}>
+          <App />
+        </SplitFactory>
       </ConfigProvider>
     </ApolloProvider>
   );

client/src/App/App.styles.scss

@@ -128,3 +128,9 @@
 .react-kanban-column {
   background-color: #ddd !important;
 }
+
+.production-list-table {
+  td.ant-table-column-sort {
+    background: unset;
+  }
+}

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

@@ -199,7 +199,7 @@ export function AccountingReceivablesTableComponent({
     <Card
       extra={
         <Space wrap>
-          {!bodyshop.cdk_dealerid && (
+          {!bodyshop.cdk_dealerid && !bodyshop.pbs_serialnumber && (
             <JobsExportAllButton
               jobIds={selectedJobs}
               disabled={transInProgress || selectedJobs.length === 0}

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

@@ -216,7 +216,7 @@ function BillEnterModalContainer({
 
     if (enterAgain) {
       form.resetFields();
-      form.setFieldsValue(formValues);
+      form.setFieldsValue({ ...form.getFieldsValue(), billlines: [] });
     } else {
       toggleModalVisible();
     }

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

@@ -156,7 +156,6 @@ export function BillEnterModalLinesComponent({
               setFieldsValue({
                 billlines: getFieldsValue("billlines").billlines.map(
                   (item, idx) => {
-                    console.log("Checking", index, idx);
                     if (idx === index) {
                       console.log(
                         "Found and setting.",
@@ -502,9 +501,9 @@ const EditableCell = ({
             labelCol={{ span: 0 }}
             {...(formItemProps && formItemProps(record))}
           >
-            {(formInput && formInput(record, record.key)) || children}
+            {(formInput && formInput(record, record.name)) || children}
           </Form.Item>
-          {additional && additional(record, record.key)}
+          {additional && additional(record, record.name)}
         </Space>
       </td>
     );
@@ -516,7 +515,7 @@ const EditableCell = ({
         name={dataIndex}
         {...(formItemProps && formItemProps(record))}
       >
-        {(formInput && formInput(record, record.key)) || children}
+        {(formInput && formInput(record, record.name)) || children}
       </Form.Item>
     </td>
   );

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

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

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

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

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

@@ -209,6 +209,9 @@ export function ScheduleEventComponent({
                 jobId: event.job.id,
                 job: event.job,
                 previousEvent: event.id,
+                color: event.color,
+                alt_transport: event.job && event.job.alt_transport,
+                note: event.note,
               },
             });
           }}

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

@@ -14,7 +14,7 @@ import {
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { useHistory } from "react-router-dom";
-import { useCookies } from "react-cookie";
+
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -33,11 +33,10 @@ export function JobsCloseExportButton({
   const [updateJob] = useMutation(UPDATE_JOB);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
   const [loading, setLoading] = useState(false);
-  const [cookies] = useCookies();
 
   const handleQbxml = async () => {
     //Check if it's a CDK setup.
-    if (bodyshop.cdk_dealerid) {
+    if (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) {
       history.push(`/manage/dms?jobId=${jobId}`);
       return;
     }
@@ -52,7 +51,7 @@ export function JobsCloseExportButton({
         {
           jobIds: [jobId],
         },
-        { withCredentials: true }
+        
       );
     } else {
       //Default is QBD
@@ -182,16 +181,7 @@ export function JobsCloseExportButton({
   };
 
   return (
-    <Button
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
-      onClick={handleQbxml}
-      loading={loading}
-      disabled={
-        disabled ||
-        (bodyshop.accountingconfig &&
-          bodyshop.accountingconfig.qbo &&
-          !cookies.qbo_realmId)
-      }
-    >
       {t("jobs.actions.export")}
     </Button>
   );

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

@@ -150,6 +150,9 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
             <Form.Item label={t("jobs.fields.loss_desc")} name="loss_desc">
               <Input />
             </Form.Item>
+            <Form.Item label={t("jobs.fields.loss_of_use")} name="loss_of_use">
+              <Input />
+            </Form.Item>
             <Form.Item label={t("jobs.fields.ponumber")} name="po_number">
               <Input />
             </Form.Item>

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

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

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

@@ -1,4 +1,13 @@
-import { Col, Form, Input, InputNumber, Row, Select, Switch } from "antd";
+import {
+  Col,
+  Divider,
+  Form,
+  Input,
+  InputNumber,
+  Row,
+  Select,
+  Switch,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -12,6 +21,7 @@ import FormItemPhone, {
   PhoneItemFormatterValidation,
 } from "../form-items-formatted/phone-form-item.component";
 import Car from "../job-damage-visual/job-damage-visual.component";
+import JobsDetailChangeEstimator from "../jobs-detail-change-estimator/jobs-detail-change-estimator.component";
 import FormRow from "../layout-form-row/layout-form-row.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -46,6 +56,13 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
         <Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
           <CurrencyInput disabled={jobRO} min={0} />
         </Form.Item>
+        <Form.Item label={t("jobs.fields.ded_note")} name="ded_note">
+          <Select disabled={jobRO}>
+            {bodyshop.md_ded_notes.map((n, index) => (
+              <Select.Option key={index}>{n}</Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
         <Form.Item label={t("jobs.fields.policy_no")} name="policy_no">
           <Input disabled={jobRO} />
         </Form.Item>
@@ -139,6 +156,9 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
             <Form.Item label={t("jobs.fields.loss_date")} name="loss_date">
               <FormDatePicker disabled={jobRO} />
             </Form.Item>
+            <Form.Item label={t("jobs.fields.loss_of_use")} name="loss_of_use">
+              <Input disabled={jobRO} />
+            </Form.Item>
             <Form.Item label={t("jobs.fields.kmin")} name="kmin">
               <InputNumber precision={0} min={0} disabled={jobRO} />
             </Form.Item>
@@ -191,8 +211,16 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
           )}
         </Col>
       </Row>
+      <Divider
+        orientation="left"
+        type="horizontal"
+        style={{ marginTop: ".8rem", float: "right" }}
+      >
+        {t("jobs.forms.appraiserinfo")}
+      </Divider>
 
-      <FormRow header={t("jobs.forms.appraiserinfo")}>
+      <JobsDetailChangeEstimator form={form} disabled={jobRO} />
+      <FormRow noDivider>
         <Form.Item label={t("jobs.fields.est_co_nm")} name="est_co_nm">
           <Input disabled={jobRO} />
         </Form.Item>

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

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

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

@@ -23,14 +23,10 @@ export function JobsDetailHeaderActionexportCustomerData({
     logImEXEvent("job_export_cust_data");
     let PartnerResponse;
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
-      PartnerResponse = await axios.post(
+      PartnerResponse = await axios.post(`/qbo/receivables`, {
-        `/qbo/receivables`,
+        jobIds: [job.id],
-        {
+        custDataOnly: true,
-          jobIds: [job.id],
+      });
-          custDataOnly: true,
-        },
-        { withCredentials: true }
-      );
     } else {
       //Default is QBD
 

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

@@ -16,6 +16,7 @@ import JobEmployeeAssignments from "../job-employee-assignments/job-employee-ass
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import "./jobs-detail-header.styles.scss";
 import JobsRelatedRos from "../jobs-related-ros/jobs-related-ros.component";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -70,6 +71,12 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 {job.production_vars && job.production_vars.alert ? (
                   <ExclamationCircleFilled className="production-alert" />
                 ) : null}
+                {job.status === bodyshop.md_ro_statuses.default_scheduled &&
+                job.scheduled_in ? (
+                  <Tag>
+                    <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
+                  </Tag>
+                ) : null}
               </Space>
             </DataLabel>
             <DataLabel label={t("jobs.fields.ins_co_nm_short")}>

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

@@ -124,7 +124,6 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
         {t("jobs.forms.laborrates")}
       </Divider>
       <Space>
-        <div></div>
         <JobsDetailRatesChangeButton form={form} disabled={jobRO} />
         <JobsMarkPstExempt form={form} />
       </Space>

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

@@ -13,7 +13,6 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import { useCookies } from "react-cookie";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -31,7 +30,6 @@ export function JobsExportAllButton({
   const { t } = useTranslation();
   const [updateJob] = useMutation(UPDATE_JOBS);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
-  const [cookies] = useCookies();
 
   const [loading, setLoading] = useState(false);
   const handleQbxml = async () => {
@@ -39,13 +37,9 @@ export function JobsExportAllButton({
     let PartnerResponse;
     setLoading(true);
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
-      PartnerResponse = await axios.post(
+      PartnerResponse = await axios.post(`/qbo/receivables`, {
-        `/qbo/receivables`,
+        jobIds: jobIds,
-        {
+      });
-          jobIds: jobIds,
-        },
-        { withCredentials: true }
-      );
     } else {
       let QbXmlResponse;
       try {
@@ -175,16 +169,7 @@ export function JobsExportAllButton({
   };
 
   return (
-    <Button
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
-      onClick={handleQbxml}
-      loading={loading}
-      disabled={
-        disabled ||
-        (bodyshop.accountingconfig &&
-          bodyshop.accountingconfig.qbo &&
-          !cookies.qbo_realmId)
-      }
-    >
       {t("jobs.actions.export")}
     </Button>
   );

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

@@ -14,7 +14,6 @@ import {
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import _ from "lodash";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
-import { useCookies } from "react-cookie";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -33,7 +32,6 @@ export function PayableExportAll({
   const [updateBill] = useMutation(UPDATE_BILLS);
   const [loading, setLoading] = useState(false);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
-  const [cookies] = useCookies();
 
   const handleQbxml = async () => {
     logImEXEvent("accounting_payables_export_all");
@@ -42,13 +40,9 @@ export function PayableExportAll({
     setLoading(true);
     if (!!loadingCallback) loadingCallback(true);
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
-      PartnerResponse = await axios.post(
+      PartnerResponse = await axios.post(`/qbo/payables`, {
-        `/qbo/receivables`,
+        bills: billids,
-        {
+      });
-          bills: billids,
-        },
-        { withCredentials: true }
-      );
     } else {
       let QbXmlResponse;
       try {
@@ -174,16 +168,7 @@ export function PayableExportAll({
   };
 
   return (
-    <Button
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
-      onClick={handleQbxml}
-      loading={loading}
-      disabled={
-        disabled ||
-        (bodyshop.accountingconfig &&
-          bodyshop.accountingconfig.qbo &&
-          !cookies.qbo_realmId)
-      }
-    >
       {t("jobs.actions.exportselected")}
     </Button>
   );

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

@@ -13,7 +13,6 @@ import {
 } from "../../redux/user/user.selectors";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
-import { useCookies } from "react-cookie";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -32,7 +31,6 @@ export function PayableExportButton({
   const [updateBill] = useMutation(UPDATE_BILLS);
   const [loading, setLoading] = useState(false);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
-  const [cookies] = useCookies();
 
   const handleQbxml = async () => {
     logImEXEvent("accounting_export_payable");
@@ -43,13 +41,9 @@ export function PayableExportButton({
     //Check if it's a QBO Setup.
     let PartnerResponse;
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
-      PartnerResponse = await axios.post(
+      PartnerResponse = await axios.post(`/qbo/payables`, {
-        `/qbo/payables`,
+        bills: [billId],
-        {
+      });
-          bills: [billId],
-        },
-        { withCredentials: true }
-      );
     } else {
       //Default is QBD
 
@@ -176,16 +170,7 @@ export function PayableExportButton({
   };
 
   return (
-    <Button
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
-      onClick={handleQbxml}
-      loading={loading}
-      disabled={
-        disabled ||
-        (bodyshop.accountingconfig &&
-          bodyshop.accountingconfig.qbo &&
-          !cookies.qbo_realmId)
-      }
-    >
       {t("jobs.actions.export")}
     </Button>
   );

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

@@ -8,7 +8,6 @@ import { createStructuredSelector } from "reselect";
 import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_PAYMENTS } from "../../graphql/payments.queries";
-import { useCookies } from "react-cookie";
 
 import {
   selectBodyshop,
@@ -32,7 +31,6 @@ export function PaymentExportButton({
   const [updatePayment] = useMutation(UPDATE_PAYMENTS);
   const [loading, setLoading] = useState(false);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
-  const [cookies] = useCookies();
 
   const handleQbxml = async () => {
     logImEXEvent("accounting_payment_export");
@@ -40,13 +38,9 @@ export function PaymentExportButton({
     //Check if it's a QBO Setup.
     let PartnerResponse;
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
-      PartnerResponse = await axios.post(
+      PartnerResponse = await axios.post(`/qbo/payments`, {
-        `/qbo/payments`,
+        payments: [paymentId],
-        {
+      });
-          payments: [paymentId],
-        },
-        { withCredentials: true }
-      );
     } else {
       //Default is QBD
 
@@ -177,16 +171,7 @@ export function PaymentExportButton({
   };
 
   return (
-    <Button
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
-      onClick={handleQbxml}
-      loading={loading}
-      disabled={
-        disabled ||
-        (bodyshop.accountingconfig &&
-          bodyshop.accountingconfig.qbo &&
-          !cookies.qbo_realmId)
-      }
-    >
       {t("jobs.actions.export")}
     </Button>
   );

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

@@ -8,7 +8,6 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_PAYMENTS } from "../../graphql/payments.queries";
-import { useCookies } from "react-cookie";
 
 import {
   selectBodyshop,
@@ -31,20 +30,15 @@ export function PaymentsExportAllButton({
   const [updatePayments] = useMutation(UPDATE_PAYMENTS);
   const [loading, setLoading] = useState(false);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
-  const [cookies] = useCookies();
 
   const handleQbxml = async () => {
     setLoading(true);
     if (!!loadingCallback) loadingCallback(true);
     let PartnerResponse;
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
-      PartnerResponse = await axios.post(
+      PartnerResponse = await axios.post(`/qbo/payments`, {
-        `/qbo/payments`,
+        payments: paymentIds,
-        {
+      });
-          payments: paymentIds,
-        },
-        { withCredentials: true }
-      );
     } else {
       let QbXmlResponse;
       try {
@@ -158,16 +152,7 @@ export function PaymentsExportAllButton({
   };
 
   return (
-    <Button
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
-      onClick={handleQbxml}
-      loading={loading}
-      disabled={
-        disabled ||
-        (bodyshop.accountingconfig &&
-          bodyshop.accountingconfig.qbo &&
-          !cookies.qbo_realmId)
-      }
-    >
       {t("jobs.actions.exportselected")}
     </Button>
   );

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

@@ -40,7 +40,7 @@ export default function ProductionListColumnBodyPriority({ record }) {
             key="set"
             title={t("production.actions.bodypriority-set")}
           >
-            {new Array(9).fill().map((value, index) => (
+            {new Array(15).fill().map((value, index) => (
               <Menu.Item key={index + 1}>{index + 1}</Menu.Item>
             ))}
           </Menu.SubMenu>

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

@@ -40,7 +40,7 @@ export default function ProductionListColumnDetailPriority({ record }) {
             key="set"
             title={t("production.actions.detailpriority-set")}
           >
-            {new Array(9).fill().map((value, index) => (
+            {new Array(15).fill().map((value, index) => (
               <Menu.Item key={index + 1}>{index + 1}</Menu.Item>
             ))}
           </Menu.SubMenu>

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

@@ -40,7 +40,7 @@ export default function ProductionListColumnPaintPriority({ record }) {
             key="set"
             title={t("production.actions.paintpriority-set")}
           >
-            {new Array(9).fill().map((value, index) => (
+            {new Array(15).fill().map((value, index) => (
               <Menu.Item key={index + 1}>{index + 1}</Menu.Item>
             ))}
           </Menu.SubMenu>

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

@@ -24,6 +24,7 @@ import ProductionListSaveConfigButton from "../production-list-save-config-butto
 import ProductionListPrint from "./production-list-print.component";
 import ProductionListTableViewSelect from "./production-list-table-view-select.component";
 import ResizeableTitle from "./production-list-table.resizeable.component";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -39,7 +40,9 @@ export function ProductionListTable({
   currentUser,
 }) {
   const [searchText, setSearchText] = useState("");
-
+  const { Production_List_Status_Colors } = useTreatments([
+    "Production_List_Status_Colors",
+  ]);
   const assoc = bodyshop.associations.find(
     (a) => a.useremail === currentUser.email
   );
@@ -165,7 +168,6 @@ export function ProductionListTable({
   // };
 
   if (!!!columns) return <div>No columns found.</div>;
-  console.log(data);
 
   const totalHrs = data
     .reduce(
@@ -218,8 +220,28 @@ export function ProductionListTable({
         handleSelector=".prod-header-dropdown"
       >
         <Table
+          sticky
           pagination={false}
           size="small"
+          className="production-list-table"
+          onRow={
+            Production_List_Status_Colors.treatment === "on" &&
+            ((record, index) => {
+              if (!bodyshop.md_ro_statuses.production_colors) return null;
+
+              const color = bodyshop.md_ro_statuses.production_colors.find(
+                (x) => x.status === record.status
+              );
+
+              if (!color) return null;
+
+              return {
+                style: {
+                  backgroundColor: `rgb(${color.color.r},${color.color.g},${color.color.b},${color.color.a})`,
+                },
+              };
+            })
+          }
           components={{
             header: {
               cell: ResizeableTitle,

client/src/components/qbo-authorize/qbo-authorize.component.jsx

@@ -1,4 +1,4 @@
-import { Space, Tag } from "antd";
+import { Space } from "antd";
 import Axios from "axios";
 import queryString from "query-string";
 import React, { useEffect } from "react";
@@ -9,7 +9,7 @@ import QboSignIn from "../../assets/qbo/C2QB_green_btn_med_default.svg";
 export default function QboAuthorizeComponent() {
   const location = useLocation();
   const history = useHistory();
-  const [cookies, setCookie] = useCookies(["access_token", "refresh_token"]);
+  const [, setCookie] = useCookies(["access_token", "refresh_token"]);
 
   const handleQbSignIn = async () => {
     const result = await Axios.post("/qbo/authorize");
@@ -24,20 +24,20 @@ export default function QboAuthorizeComponent() {
     const hasBeenCalledBack = code && realmId && state;
 
     if (hasBeenCalledBack) {
-      setCookie("qbo_code", code, { path: "/" });
+      // setCookie("qbo_code", code, { path: "/" });
-      setCookie("qbo_state", state, { path: "/" });
+      // setCookie("qbo_state", state, { path: "/" });
 
-      let expires = new Date();
+      // let expires = new Date();
-      expires.setTime(expires.getTime() + 8726400 * 1000);
+      // expires.setTime(expires.getTime() + 8726400 * 1000);
 
-      setCookie("qbo_realmId", realmId, {
+      // setCookie("qbo_realmId", realmId, {
-        path: "/",
+      //   path: "/",
-        expires,
+      //   expires,
 
-        ...(process.env.NODE_ENV !== "development"
+      //   ...(process.env.NODE_ENV !== "development"
-          ? { domain: `.${window.location.host}` }
+      //     ? { domain: `.${window.location.host}` }
-          : {}),
+      //     : {}),
-      });
+      // });
 
       history.push({ pathname: `/manage/accounting/receivables` });
     }
@@ -52,9 +52,7 @@ export default function QboAuthorizeComponent() {
         src={QboSignIn}
         style={{ cursor: "pointer" }}
       />
-      {!cookies.qbo_realmId && (
+
-        <Tag color="red">No QuickBooks company has been connected.</Tag>
-      )}
       {error && JSON.parse(decodeURIComponent(error)).error_description}
     </Space>
   );

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

@@ -63,6 +63,20 @@ export function ScheduleJobModalContainer({
     skip: !visible || !!!jobId,
   });
 
+  useEffect(() => {
+    if (
+      existingAppointments.data &&
+      existingAppointments.data.appointments.length > 0 &&
+      !existingAppointments.data.appointments[0].canceled
+    ) {
+      form.setFieldsValue({
+        color: existingAppointments.data.appointments[0].color,
+
+        note: existingAppointments.data.appointments[0].note,
+      });
+    }
+  }, [existingAppointments.data, form]);
+
   const handleFinish = async (values) => {
     logImEXEvent("schedule_new_appointment");
 
@@ -105,7 +119,7 @@ export function ScheduleJobModalContainer({
           start: moment(values.start),
           end: moment(values.start).add(bodyshop.appt_length || 60, "minutes"),
           color: values.color,
-          note:values.note
+          note: values.note,
         },
         jobId: jobId,
         altTransport: values.alt_transport,
@@ -188,6 +202,9 @@ export function ScheduleJobModalContainer({
           start: null,
           // smartDates: [],
           scheduled_completion: null,
+          color: context.color,
+          alt_transport: context.alt_transport,
+          note: context.note,
         }}
       >
         <ScheduleJobModalComponent

client/src/components/shop-info/shop-info.general.component.jsx

@@ -17,6 +17,8 @@ import PhoneFormItem, {
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
+import FormItemEmail from "../form-items-formatted/email-form-item.component";
+
 export default function ShopInfoGeneral({ form }) {
   const { t } = useTranslation();
   return (
@@ -472,6 +474,19 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Switch />
         </Form.Item>
+        <Form.Item
+          name={["md_ded_notes"]}
+          label={t("bodyshop.fields.md_ded_notes")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+              type: "array",
+            },
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow grow header={t("bodyshop.labels.messagingpresets")}>
         <Form.List name={["md_messaging_presets"]}>
@@ -706,7 +721,7 @@ export default function ShopInfoGeneral({ form }) {
                       >
                         <Input />
                       </Form.Item>
-                      <Space wrap>
+                      <Space>
                         <Form.Item
                           label={t("bodyshop.fields.md_ins_co.zip")}
                           key={`${index}zip`}
@@ -744,6 +759,95 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
+      <LayoutFormRow grow header={t("bodyshop.labels.estimators")}>
+        <Form.List name={["md_estimators"]}>
+          {(fields, { add, remove, move }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider>
+                      <Form.Item
+                        label={t("jobs.fields.est_co_nm")}
+                        key={`${index}est_co_nm`}
+                        name={[field.name, "est_co_nm"]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.est_ct_fn")}
+                        key={`${index}est_ct_fn`}
+                        name={[field.name, "est_ct_fn"]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.est_ct_ln")}
+                        key={`${index}est_ct_ln`}
+                        name={[field.name, "est_ct_ln"]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.est_ph1")}
+                        key={`${index}est_ph1`}
+                        name={[field.name, "est_ph1"]}
+                        rules={[
+                          ({ getFieldValue }) =>
+                            PhoneItemFormatterValidation(getFieldValue, [
+                              field.name,
+                              "est_ph",
+                            ]),
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("jobs.fields.est_ea")}
+                        key={`${index}est_ea`}
+                        name={[field.name, "est_ea"]}
+                        rules={[
+                          {
+                            type: "email",
+                            message: "This is not a valid email address.",
+                          },
+                        ]}
+                      >
+                        <FormItemEmail
+                          email={form.getFieldValue([field.name, "est_ea"])}
+                        />
+                      </Form.Item>
+                      <Space>
+                        <DeleteFilled
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows
+                          move={move}
+                          index={index}
+                          total={fields.length}
+                        />
+                      </Space>
+                    </LayoutFormRow>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    onClick={() => {
+                      add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("general.actions.add")}
+                  </Button>
+                </Form.Item>
+              </div>
+            );
+          }}
+        </Form.List>
+      </LayoutFormRow>
       <LayoutFormRow grow header={t("bodyshop.fields.md_ccc_rates")}>
         <Form.List name={["md_ccc_rates"]}>
           {(fields, { add, remove, move }) => {

client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx

@@ -203,6 +203,14 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </LayoutFormRow>
         </>
       )}
+
+      {bodyshop.pbs_serialnumber && (
+        <>
+          <DataLabel label={t("bodyshop.labels.dms.pbs_serialnumber")}>
+            {form.getFieldValue("pbs_serialnumber")}
+          </DataLabel>
+        </>
+      )}
       <LayoutFormRow header={t("bodyshop.labels.responsibilitycenters.costs")}>
         <Form.List name={["md_responsibility_centers", "costs"]}>
           {(fields, { add, remove }) => {

client/src/components/shop-info/shop-info.rostatus.component.jsx

@@ -1,8 +1,12 @@
-import { Form, Select } from "antd";
+import { DeleteFilled } from "@ant-design/icons";
+import { useTreatments } from "@splitsoftware/splitio-react";
+import { Button, Form, Select, Space } from "antd";
 import React, { useState } from "react";
+import { ChromePicker } from "react-color";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+
 const SelectorDiv = styled.div`
   .ant-form-item .ant-select {
     width: 200px;
@@ -11,6 +15,9 @@ const SelectorDiv = styled.div`
 
 export default function ShopInfoROStatusComponent({ form }) {
   const { t } = useTranslation();
+  const { Production_List_Status_Colors } = useTreatments([
+    "Production_List_Status_Colors",
+  ]);
 
   const [options, setOptions] = useState(
     form.getFieldValue(["md_ro_statuses", "statuses"]) || []
@@ -257,6 +264,97 @@ export default function ShopInfoROStatusComponent({ form }) {
           </Select>
         </Form.Item>
       </LayoutFormRow>
+      {Production_List_Status_Colors.treatment === "on" && (
+        <LayoutFormRow
+          grow
+          header={t("bodyshop.fields.statuses.production_colors")}
+        >
+          <Form.List name={["md_ro_statuses", "production_colors"]}>
+            {(fields, { add, remove, move }) => {
+              return (
+                <div>
+                  <LayoutFormRow>
+                    {fields.map((field, index) => (
+                      <Form.Item key={field.key}>
+                        <Space direction="vertical">
+                          <div style={{ display: "flex" }}>
+                            <Form.Item
+                              style={{ flex: 1 }}
+                              label={t("jobs.fields.status")}
+                              key={`${index}status`}
+                              name={[field.name, "status"]}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                            >
+                              <Select>
+                                {options.map((item, idx) => (
+                                  <Select.Option key={idx} value={item}>
+                                    {item}
+                                  </Select.Option>
+                                ))}
+                              </Select>
+                            </Form.Item>
+                            <DeleteFilled
+                              onClick={() => {
+                                remove(field.name);
+                              }}
+                            />
+                          </div>
+                          <Form.Item
+                            label={t("bodyshop.fields.statuses.color")}
+                            key={`${index}color`}
+                            name={[field.name, "color"]}
+                            rules={[
+                              {
+                                required: true,
+                                //message: t("general.validation.required"),
+                              },
+                            ]}
+                          >
+                            <ColorPicker />
+                          </Form.Item>
+                        </Space>
+                      </Form.Item>
+                    ))}
+                  </LayoutFormRow>
+                  <Form.Item>
+                    <Button
+                      type="dashed"
+                      onClick={() => {
+                        add();
+                      }}
+                      style={{ width: "100%" }}
+                    >
+                      {t("general.actions.add")}
+                    </Button>
+                  </Form.Item>
+                </div>
+              );
+            }}
+          </Form.List>
+        </LayoutFormRow>
+      )}
     </SelectorDiv>
   );
 }
+
+const ColorPicker = ({ value, onChange, style, ...restProps }) => {
+  const handleChange = (color) => {
+    console.log(
+      "🚀  ~ file: shop-info.rostatus.component.jsx  ~ line 345  ~ color",
+      color
+    );
+    if (onChange) onChange(color.rgb);
+  };
+  return (
+    <ChromePicker
+      {...restProps}
+      color={value}
+      onChangeComplete={handleChange}
+    />
+  );
+};

client/src/components/shop-info/shop-info.scheduling.component.jsx

@@ -44,7 +44,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
             },
           ]}
         >
-          <TimePicker showSecond={false} format="hh:mm" />
+          <TimePicker showSecond={false} format="HH:mm" />
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.schedule_end_time")}
@@ -56,7 +56,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
             },
           ]}
         >
-          <TimePicker showSecond={false} format="hh:mm" />
+          <TimePicker showSecond={false} format="HH:mm" />
         </Form.Item>
         <Form.Item
           name={["appt_alt_transport"]}

client/src/graphql/appointments.queries.js

@@ -196,10 +196,11 @@ export const CANCEL_APPOINTMENT_BY_ID = gql`
 
 export const QUERY_APPOINTMENTS_BY_JOBID = gql`
   query QUERY_APPOINTMENTS_BY_JOBID($jobid: uuid!) {
-    appointments(where: { jobid: { _eq: $jobid } }) {
+    appointments(where: { jobid: { _eq: $jobid } }, order_by: { start: desc }) {
       start
       id
       end
+      color
       isintake
       arrived
       canceled

client/src/graphql/bodyshop.queries.js

@@ -94,6 +94,10 @@ export const QUERY_BODYSHOP = gql`
       attach_pdf_to_email
       tt_allow_post_to_invoiced
       cdk_configuration
+      md_estimators
+      md_ded_notes
+      pbs_configuration
+      pbs_serialnumber
       employees {
         id
         active
@@ -184,6 +188,10 @@ export const UPDATE_SHOP = gql`
         attach_pdf_to_email
         tt_allow_post_to_invoiced
         cdk_configuration
+        md_estimators
+        md_ded_notes
+        pbs_configuration
+        pbs_serialnumber
         employees {
           id
           first_name

client/src/graphql/jobs.queries.js

@@ -385,6 +385,7 @@ export const GET_JOB_BY_PK = gql`
       vehicleid
       driveable
       towin
+      loss_of_use
       vehicle {
         id
         plate_no
@@ -463,6 +464,7 @@ export const GET_JOB_BY_PK = gql`
       production_vars
       ca_gst_registrant
       ownerid
+      ded_note
       owner {
         id
         ownr_fn
@@ -735,6 +737,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       actual_completion
       actual_delivery
       actual_in
+      scheduled_in
       po_number
       id
       ins_co_nm

client/src/index.js

@@ -23,6 +23,11 @@ Dinero.globalRoundingMode = "HALF_EVEN";
 if (process.env.NODE_ENV !== "development") {
   Sentry.init({
     dsn: "https://fd7e89369b6b4bdc9c6c4c9f22fa4ee4@o492140.ingest.sentry.io/5651027",
+    ignoreErrors: [
+      "ResizeObserver loop",
+      "Module specifier, 'fs' does not start",
+      "Module specifier, 'zlib' does not start with",
+    ],
     integrations: [
       // new Integrations.BrowserTracing(),
       // new Sentry.Integrations.Breadcrumbs({ console: true }),

client/src/pages/manage/manage.page.component.jsx

@@ -5,12 +5,12 @@ import preval from "preval.macro";
 import React, { lazy, Suspense, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import ErrorBoundary from "../../components/error-boundary/error-boundary.component";
 import { Link, Route, Switch } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import BreadCrumbs from "../../components/breadcrumbs/breadcrumbs.component";
 import ChatAffixContainer from "../../components/chat-affix/chat-affix.container";
 import ConflictComponent from "../../components/conflict/conflict.component";
-import ErrorBoundary from "../../components/error-boundary/error-boundary.component";
 import FcmNotification from "../../components/fcm-notification/fcm-notification.component";
 //import FooterComponent from "../../components/footer/footer.component";
 //Component Imports

client/src/pages/manage/manage.page.container.jsx

@@ -6,8 +6,8 @@ import AlertComponent from "../../components/alert/alert.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import { QUERY_BODYSHOP } from "../../graphql/bodyshop.queries";
 import { setBodyshop } from "../../redux/user/user.actions";
-import ManagePage from "./manage.page.component";
 import "../../utils/RegisterSw";
+import ManagePage from "./manage.page.component";
 
 const mapDispatchToProps = (dispatch) => ({
   setBodyshop: (bs) => dispatch(setBodyshop(bs)),
@@ -21,7 +21,9 @@ function ManagePageContainer({ match, setBodyshop }) {
   const { t } = useTranslation();
 
   useEffect(() => {
-    if (data) setBodyshop(data.bodyshops[0] || { notfound: true });
+    if (data) {
+      setBodyshop(data.bodyshops[0] || { notfound: true });
+    }
   }, [data, setBodyshop]);
 
   if (loading)

client/src/redux/user/user.sagas.js

@@ -13,7 +13,7 @@ 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 { factory, tracker } from "../../App/App.container";
 import {
   getCurrentUser,
   logImEXEvent,
@@ -250,6 +250,8 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
   try {
     const userEmail = yield select((state) => state.user.currentUser.email);
 
+    factory.client(payload.imexshopid);
+
     const authRecord = payload.associations.filter(
       (a) => a.useremail === userEmail
     );

client/src/translations/en_us/common.json

@@ -270,6 +270,7 @@
 				"md_categories": "Categories",
 				"md_ccc_rates": "Courtesy Car Contract Rate Presets",
 				"md_classes": "Classes",
+				"md_ded_notes": "Deductible Notes",
 				"md_hour_split": {
 					"paint": "Paint Hour Split",
 					"prep": "Prep Hour Split"
@@ -450,6 +451,7 @@
 				"status": "Status Label",
 				"statuses": {
 					"active_statuses": "Active Statuses (Filtering for Active Jobs throughout system)",
+					"color": "Color",
 					"default_arrived": "Default Arrived Status (Transition to Production)",
 					"default_bo": "Default Backordered Status",
 					"default_canceled": "Default Canceled Status",
@@ -466,6 +468,7 @@
 					"open_statuses": "Open Statuses",
 					"post_production_statuses": "Post-Production Statuses",
 					"pre_production_statuses": "Pre-Production Statuses",
+					"production_colors": "Production Status Colors",
 					"production_statuses": "Production Statuses"
 				},
 				"target_touchtime": "Target Touch Time",
@@ -499,6 +502,7 @@
 				},
 				"emaillater": "Email Later",
 				"employees": "Employees",
+				"estimators": "Estimators",
 				"insurancecos": "Insurance Companies",
 				"intakechecklist": "Intake Checklist",
 				"jobstatuses": "Job Statuses",
@@ -1089,6 +1093,7 @@
 				"autoallocate": "Auto Allocate",
 				"changelaborrate": "Change Labor Rate",
 				"changestatus": "Change Status",
+				"changestimator": "Change Estimator",
 				"convert": "Convert",
 				"deliver": "Deliver",
 				"dms": {
@@ -1203,6 +1208,7 @@
 				"date_open": "Open",
 				"date_scheduled": "Scheduled",
 				"ded_amt": "Deductible",
+				"ded_note": "Deductible Note",
 				"ded_status": "Deductible Status",
 				"depreciation_taxes": "Depreciation/Taxes",
 				"dms": {
@@ -1278,6 +1284,7 @@
 				"local_tax_rate": "Local Tax Rate",
 				"loss_date": "Loss Date",
 				"loss_desc": "Loss Description",
+				"loss_of_use": "Loss of Use",
 				"ma2s": "2 Stage Paint",
 				"ma3s": "3 Stage Pain",
 				"mabl": "MABL?",

client/src/translations/es/common.json

@@ -270,6 +270,7 @@
 				"md_categories": "",
 				"md_ccc_rates": "",
 				"md_classes": "",
+				"md_ded_notes": "",
 				"md_hour_split": {
 					"paint": "",
 					"prep": ""
@@ -450,6 +451,7 @@
 				"status": "",
 				"statuses": {
 					"active_statuses": "",
+					"color": "",
 					"default_arrived": "",
 					"default_bo": "",
 					"default_canceled": "",
@@ -466,6 +468,7 @@
 					"open_statuses": "",
 					"post_production_statuses": "",
 					"pre_production_statuses": "",
+					"production_colors": "",
 					"production_statuses": ""
 				},
 				"target_touchtime": "",
@@ -499,6 +502,7 @@
 				},
 				"emaillater": "",
 				"employees": "",
+				"estimators": "",
 				"insurancecos": "",
 				"intakechecklist": "",
 				"jobstatuses": "",
@@ -1089,6 +1093,7 @@
 				"autoallocate": "",
 				"changelaborrate": "",
 				"changestatus": "Cambiar Estado",
+				"changestimator": "",
 				"convert": "Convertir",
 				"deliver": "",
 				"dms": {
@@ -1203,6 +1208,7 @@
 				"date_open": "Abierto",
 				"date_scheduled": "Programado",
 				"ded_amt": "Deducible",
+				"ded_note": "",
 				"ded_status": "Estado deducible",
 				"depreciation_taxes": "Depreciación / Impuestos",
 				"dms": {
@@ -1278,6 +1284,7 @@
 				"local_tax_rate": "",
 				"loss_date": "Fecha de pérdida",
 				"loss_desc": "",
+				"loss_of_use": "",
 				"ma2s": "",
 				"ma3s": "",
 				"mabl": "",

client/src/translations/fr/common.json

@@ -270,6 +270,7 @@
 				"md_categories": "",
 				"md_ccc_rates": "",
 				"md_classes": "",
+				"md_ded_notes": "",
 				"md_hour_split": {
 					"paint": "",
 					"prep": ""
@@ -450,6 +451,7 @@
 				"status": "",
 				"statuses": {
 					"active_statuses": "",
+					"color": "",
 					"default_arrived": "",
 					"default_bo": "",
 					"default_canceled": "",
@@ -466,6 +468,7 @@
 					"open_statuses": "",
 					"post_production_statuses": "",
 					"pre_production_statuses": "",
+					"production_colors": "",
 					"production_statuses": ""
 				},
 				"target_touchtime": "",
@@ -499,6 +502,7 @@
 				},
 				"emaillater": "",
 				"employees": "",
+				"estimators": "",
 				"insurancecos": "",
 				"intakechecklist": "",
 				"jobstatuses": "",
@@ -1089,6 +1093,7 @@
 				"autoallocate": "",
 				"changelaborrate": "",
 				"changestatus": "Changer le statut",
+				"changestimator": "",
 				"convert": "Convertir",
 				"deliver": "",
 				"dms": {
@@ -1203,6 +1208,7 @@
 				"date_open": "Ouvrir",
 				"date_scheduled": "Prévu",
 				"ded_amt": "Déductible",
+				"ded_note": "",
 				"ded_status": "Statut de franchise",
 				"depreciation_taxes": "Amortissement / taxes",
 				"dms": {
@@ -1278,6 +1284,7 @@
 				"local_tax_rate": "",
 				"loss_date": "Date de perte",
 				"loss_desc": "",
+				"loss_of_use": "",
 				"ma2s": "",
 				"ma3s": "",
 				"mabl": "",

hasura/metadata/tables.yaml

@@ -203,6 +203,7 @@
       - authlevel
       - default_prod_list_view
       - id
+      - qbo_realmId
       - shopid
       - useremail
       filter:
@@ -216,6 +217,7 @@
       - active
       - authlevel
       - default_prod_list_view
+      - qbo_realmId
       filter:
         bodyshop:
           associations:
@@ -824,6 +826,8 @@
       - md_categories
       - md_ccc_rates
       - md_classes
+      - md_ded_notes
+      - md_estimators
       - md_hour_split
       - md_ins_cos
       - md_jobline_presets
@@ -838,6 +842,8 @@
       - md_responsibility_centers
       - md_ro_statuses
       - messagingservicesid
+      - pbs_configuration
+      - pbs_serialnumber
       - phone
       - prodtargethrs
       - production_config
@@ -898,6 +904,8 @@
       - md_categories
       - md_ccc_rates
       - md_classes
+      - md_ded_notes
+      - md_estimators
       - md_hour_split
       - md_ins_cos
       - md_jobline_presets
@@ -2585,6 +2593,7 @@
       - date_open
       - date_scheduled
       - ded_amt
+      - ded_note
       - ded_status
       - deliverchecklist
       - depreciation_taxes
@@ -2660,6 +2669,7 @@
       - loss_cat
       - loss_date
       - loss_desc
+      - loss_of_use
       - loss_type
       - other_amount_payable
       - owner_owing
@@ -2834,6 +2844,7 @@
       - date_open
       - date_scheduled
       - ded_amt
+      - ded_note
       - ded_status
       - deliverchecklist
       - depreciation_taxes
@@ -2909,6 +2920,7 @@
       - loss_cat
       - loss_date
       - loss_desc
+      - loss_of_use
       - loss_type
       - other_amount_payable
       - owner_owing
@@ -3093,6 +3105,7 @@
       - date_open
       - date_scheduled
       - ded_amt
+      - ded_note
       - ded_status
       - deliverchecklist
       - depreciation_taxes
@@ -3168,6 +3181,7 @@
       - loss_cat
       - loss_date
       - loss_desc
+      - loss_of_use
       - loss_type
       - other_amount_payable
       - owner_owing

hasura/migrations/1634096078510_alter_table_public_bodyshops_add_column_pbs_configuration/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "pbs_configuration" jsonb
+--  null default jsonb_build_object();

hasura/migrations/1634096078510_alter_table_public_bodyshops_add_column_pbs_configuration/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "pbs_configuration" jsonb
+ null default jsonb_build_object();

hasura/migrations/1634096850340_alter_table_public_bodyshops_add_column_pbs_serialnumber/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "pbs_serialnumber" text
+--  null;

hasura/migrations/1634096850340_alter_table_public_bodyshops_add_column_pbs_serialnumber/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "pbs_serialnumber" text
+ null;

hasura/migrations/1634594799352_alter_table_public_bodyshops_add_column_entegral_id/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "entegral_id" text
+--  null;

hasura/migrations/1634594799352_alter_table_public_bodyshops_add_column_entegral_id/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "entegral_id" text
+ null;

hasura/migrations/1634611854821_alter_table_public_jobs_add_column_loss_of_use/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "loss_of_use" text
+--  null;

hasura/migrations/1634611854821_alter_table_public_jobs_add_column_loss_of_use/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "loss_of_use" text
+ null;

hasura/migrations/1634612257400_alter_table_public_bodyshops_add_column_md_estimators/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "md_estimators" jsonb
+--  null default jsonb_build_array();

hasura/migrations/1634612257400_alter_table_public_bodyshops_add_column_md_estimators/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "md_estimators" jsonb
+ null default jsonb_build_array();

hasura/migrations/1634619218756_alter_table_public_jobs_add_column_ded_note/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "ded_note" text
+--  null;

hasura/migrations/1634619218756_alter_table_public_jobs_add_column_ded_note/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "ded_note" text
+ null;

hasura/migrations/1634619355603_alter_table_public_bodyshops_add_column_md_ded_notes/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "md_ded_notes" jsonb
+--  null default jsonb_build_array();

hasura/migrations/1634619355603_alter_table_public_bodyshops_add_column_md_ded_notes/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "md_ded_notes" jsonb
+ null default jsonb_build_array();

hasura/migrations/1634749135261_alter_table_public_associations_add_column_qbo_realmId/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."associations" add column "qbo_realmId" text
+--  null;

hasura/migrations/1634749135261_alter_table_public_associations_add_column_qbo_realmId/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."associations" add column "qbo_realmId" text
+ null;

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "license": "UNLICENSED",
   "engines": {
-    "node": "12.18.3",
+    "node": "12.22.7",
     "npm": "7.17.0"
   },
   "scripts": {
@@ -17,7 +17,7 @@
     "start": "node server.js"
   },
   "dependencies": {
-    "aws-sdk": "^2.1006.0",
+    "aws-sdk": "^2.1009.0",
     "bluebird": "^3.7.2",
     "body-parser": "^1.18.3",
     "cloudinary": "^1.27.1",
@@ -30,7 +30,7 @@
     "express": "^4.16.4",
     "firebase-admin": "^9.12.0",
     "graphql": "^15.6.1",
-    "graphql-request": "^3.4.0",
+    "graphql-request": "^3.6.1",
     "graylog2": "^0.2.1",
     "inline-css": "^3.0.0",
     "intuit-oauth": "^4.0.0",
@@ -43,10 +43,11 @@
     "phone": "^3.1.8",
     "query-string": "^7.0.1",
     "soap": "^0.42.0",
-    "socket.io": "^4.2.0",
+    "socket.io": "^4.3.1",
-    "ssh2-sftp-client": "^7.0.4",
+    "ssh2-sftp-client": "^7.1.0",
-    "stripe": "^8.181.0",
+    "stripe": "^8.183.0",
     "twilio": "^3.69.0",
+    "uuid": "^8.3.2",
     "xmlbuilder2": "^3.0.2"
   },
   "devDependencies": {

server/accounting/pbs/pbs-constants.js

@@ -0,0 +1,21 @@
+const path = require("path");
+require("dotenv").config({
+  path: path.resolve(
+    process.cwd(),
+    `.env.${process.env.NODE_ENV || "development"}`
+  ),
+});
+const CdkBase = require("../web-sockets/web-socket");
+
+const IMEX_PBS_USER = process.env.IMEX_PBS_USER,
+  IMEX_PBS_PASSWORD = process.env.IMEX_PBS_PASSWORD;
+const PBS_CREDENTIALS = {
+  password: IMEX_PBS_PASSWORD,
+  username: IMEX_PBS_USER,
+};
+
+exports.PBS_CREDENTIALS = PBS_CREDENTIALS;
+// const cdkDomain =
+//   process.env.NODE_ENV === "production"
+//     ? "https://3pa.dmotorworks.com"
+//     : "https://uat-3pa.dmotorworks.com";

server/accounting/pbs/pbs-job-export.js

@@ -0,0 +1,35 @@
+const path = require("path");
+require("dotenv").config({
+  path: path.resolve(
+    process.cwd(),
+    `.env.${process.env.NODE_ENV || "development"}`
+  ),
+});
+const GraphQLClient = require("graphql-request").GraphQLClient;
+const soap = require("soap");
+const queries = require("../../graphql-client/queries");
+const CdkBase = require("../../web-sockets/web-socket");
+
+//const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl");
+//const CalcualteAllocations = require("./cdk-calculate-allocations").default;
+
+const moment = require("moment");
+
+exports.default = async function (socket, jobid) {
+  socket.logEvents = [];
+  socket.recordid = jobid;
+
+  try {
+    CdkBase.createLogEvent(
+      socket,
+      "DEBUG",
+      `Received Job export request for id ${jobid}`
+    );
+  } catch (error) {
+    CdkBase.createLogEvent(
+      socket,
+      "ERROR",
+      `Error encountered in PbsJobExport. ${error}`
+    );
+  }
+};

server/accounting/qb-receivables-lines.js

@@ -38,7 +38,9 @@ exports.default = function ({
 
       if (
         (jobline.prt_dsmk_p && jobline.prt_dsmk_p !== 0) ||
-        jobline.prt_dsmk_m !== 0
+        ((jobline.db_ref === "900511" || jobline.db_ref === "900510") &&
+          jobline.prt_dsmk_m &&
+          jobline.prt_dsmk_m !== 0)
       ) {
         // console.log("Have a part discount", jobline);
         DineroAmount = DineroAmount.add(

server/accounting/qbo/qbo-callback.js

@@ -44,9 +44,10 @@ exports.default = async (req, res) => {
         )}`
       );
     } else {
-      await client.request(queries.SET_QBO_AUTH, {
+      await client.request(queries.SET_QBO_AUTH_WITH_REALM, {
         email: params.state,
         qbo_auth: { ...authResponse.json, createdAt: Date.now() },
+        qbo_realmId: params.realmId,
       });
       logger.log(
         "qbo-callback-create-token-success",

server/accounting/qbo/qbo-payables.js

@@ -34,9 +34,13 @@ exports.default = async (req, res) => {
     const response = await apiGqlClient.request(queries.GET_QBO_AUTH, {
       email: req.user.email,
     });
+    const { qbo_realmId } = response.associations[0];
 
     oauthClient.setToken(response.associations[0].qbo_auth);
-
+    if (!qbo_realmId) {
+      res.status(401).json({ error: "No company associated." });
+      return;
+    }
     await refreshOauthToken(oauthClient, req);
 
     const BearerToken = req.headers.authorization;
@@ -60,14 +64,25 @@ exports.default = async (req, res) => {
     for (const bill of bills) {
       try {
         let vendorRecord;
-        vendorRecord = await QueryVendorRecord(oauthClient, req, bill);
+        vendorRecord = await QueryVendorRecord(
+          oauthClient,
+          qbo_realmId,
+          req,
+          bill
+        );
 
         if (!vendorRecord) {
-          vendorRecord = await InsertVendorRecord(oauthClient, req, bill);
+          vendorRecord = await InsertVendorRecord(
+            oauthClient,
+            qbo_realmId,
+            req,
+            bill
+          );
         }
 
         const insertResults = await InsertBill(
           oauthClient,
+          qbo_realmId,
           req,
           bill,
           vendorRecord
@@ -80,7 +95,7 @@ exports.default = async (req, res) => {
           success: false,
           errorMessage:
             (error && error.authResponse && error.authResponse.body) ||
-            JSON.stringify(error),
+            (error && error.message),
         });
       }
     }
@@ -93,11 +108,11 @@ exports.default = async (req, res) => {
   }
 };
 
-async function QueryVendorRecord(oauthClient, req, bill) {
+async function QueryVendorRecord(oauthClient, qbo_realmId, req, bill) {
   try {
     const result = await oauthClient.makeApiCall({
       url: urlBuilder(
-        req.cookies.qbo_realmId,
+        qbo_realmId,
         "query",
         `select * From vendor where DisplayName = '${bill.vendor.name}'`
       ),
@@ -117,19 +132,19 @@ async function QueryVendorRecord(oauthClient, req, bill) {
     logger.log("qbo-payables-error", "DEBUG", req.user.email, bill.id, {
       error:
         (error && error.authResponse && error.authResponse.body) ||
-        JSON.stringify(error),
+        (error && error.message),
       method: "QueryVendorRecord",
     });
     throw error;
   }
 }
-async function InsertVendorRecord(oauthClient, req, bill) {
+async function InsertVendorRecord(oauthClient, qbo_realmId, req, bill) {
   const Vendor = {
     DisplayName: bill.vendor.name,
   };
   try {
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(req.cookies.qbo_realmId, "vendor"),
+      url: urlBuilder(qbo_realmId, "vendor"),
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -142,15 +157,19 @@ async function InsertVendorRecord(oauthClient, req, bill) {
     logger.log("qbo-payables-error", "DEBUG", req.user.email, bill.id, {
       error:
         (error && error.authResponse && error.authResponse.body) ||
-        JSON.stringify(error),
+        (error && error.message),
       method: "InsertVendorRecord",
     });
     throw error;
   }
 }
 
-async function InsertBill(oauthClient, req, bill, vendor) {
+async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor) {
-  const { accounts, taxCodes, classes } = await QueryMetaData(oauthClient, req);
+  const { accounts, taxCodes, classes } = await QueryMetaData(
+    oauthClient,
+    qbo_realmId,
+    req
+  );
 
   const billQbo = {
     VendorRef: {
@@ -182,7 +201,7 @@ async function InsertBill(oauthClient, req, bill, vendor) {
   try {
     const result = await oauthClient.makeApiCall({
       url: urlBuilder(
-        req.cookies.qbo_realmId,
+        qbo_realmId,
         bill.is_credit_memo ? "vendorcredit" : "bill"
       ),
       method: "POST",
@@ -197,7 +216,7 @@ async function InsertBill(oauthClient, req, bill, vendor) {
     logger.log("qbo-payables-error", "DEBUG", req.user.email, bill.id, {
       error:
         (error && error.authResponse && error.authResponse.body) ||
-        JSON.stringify(error),
+        (error && error.message),
       method: "InsertBill",
     });
     throw error;
@@ -248,10 +267,10 @@ const generateBillLine = (
   };
 };
 
-async function QueryMetaData(oauthClient, req) {
+async function QueryMetaData(oauthClient, qbo_realmId, req) {
   const accounts = await oauthClient.makeApiCall({
     url: urlBuilder(
-      req.cookies.qbo_realmId,
+      qbo_realmId,
       "query",
       `select * From Account where AccountType = 'Cost of Goods Sold'`
     ),
@@ -262,7 +281,7 @@ async function QueryMetaData(oauthClient, req) {
   });
   setNewRefreshToken(req.user.email, accounts);
   const taxCodes = await oauthClient.makeApiCall({
-    url: urlBuilder(req.cookies.qbo_realmId, "query", `select * From TaxCode`),
+    url: urlBuilder(qbo_realmId, "query", `select * From TaxCode`),
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -270,7 +289,7 @@ async function QueryMetaData(oauthClient, req) {
   });
 
   const classes = await oauthClient.makeApiCall({
-    url: urlBuilder(req.cookies.qbo_realmId, "query", `select * From Class`),
+    url: urlBuilder(qbo_realmId, "query", `select * From Class`),
     method: "POST",
     headers: {
       "Content-Type": "application/json",

server/accounting/qbo/qbo-payments.js

@@ -42,9 +42,12 @@ exports.default = async (req, res) => {
     const response = await apiGqlClient.request(queries.GET_QBO_AUTH, {
       email: req.user.email,
     });
-
+    const { qbo_realmId } = response.associations[0];
     oauthClient.setToken(response.associations[0].qbo_auth);
-
+    if (!qbo_realmId) {
+      res.status(401).json({ error: "No company associated." });
+      return;
+    }
     await refreshOauthToken(oauthClient, req);
 
     const BearerToken = req.headers.authorization;
@@ -80,6 +83,7 @@ exports.default = async (req, res) => {
           //Query for top level customer, the insurance company name.
           insCoCustomerTier = await QueryInsuranceCo(
             oauthClient,
+            qbo_realmId,
             req,
             payment.job
           );
@@ -87,6 +91,7 @@ exports.default = async (req, res) => {
             //Creating the Insurance Customer.
             insCoCustomerTier = await InsertInsuranceCo(
               oauthClient,
+              qbo_realmId,
               req,
               payment.job,
               bodyshop
@@ -96,11 +101,17 @@ exports.default = async (req, res) => {
 
         if (isThreeTier || (!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, payment.job);
+          ownerCustomerTier = await QueryOwner(
+            oauthClient,
+            qbo_realmId,
+            req,
+            payment.job
+          );
           //Query for the owner itself.
           if (!ownerCustomerTier) {
             ownerCustomerTier = await InsertOwner(
               oauthClient,
+              qbo_realmId,
               req,
               payment.job,
               isThreeTier,
@@ -110,26 +121,27 @@ exports.default = async (req, res) => {
         }
 
         //Query for the Job or Create it.
-        jobTier = await QueryJob(oauthClient, req, payment.job);
+        jobTier = await QueryJob(oauthClient, qbo_realmId, req, payment.job);
 
         // Need to validate that the job tier is associated to the right individual?
 
         if (!jobTier) {
           jobTier = await InsertJob(
             oauthClient,
+            qbo_realmId,
             req,
             payment.job,
             ownerCustomerTier || insCoCustomerTier
           );
         }
 
-        await InsertPayment(oauthClient, req, payment, jobTier);
+        await InsertPayment(oauthClient, qbo_realmId, req, payment, jobTier);
         ret.push({ paymentid: payment.id, success: true });
       } catch (error) {
         logger.log("qbo-payment-create-error", "ERROR", req.user.email, {
           error:
             (error && error.authResponse && error.authResponse.body) ||
-            JSON.stringify(error),
+            (error && error.message),
         });
 
         ret.push({
@@ -137,7 +149,7 @@ exports.default = async (req, res) => {
           success: false,
           errorMessage:
             (error && error.authResponse && error.authResponse.body) ||
-            JSON.stringify(error),
+            (error && error.message),
         });
       }
     }
@@ -150,9 +162,16 @@ exports.default = async (req, res) => {
   }
 };
 
-async function InsertPayment(oauthClient, req, payment, parentRef) {
+async function InsertPayment(
+  oauthClient,
+  qbo_realmId,
+  req,
+  payment,
+  parentRef
+) {
   const { paymentMethods, invoices } = await QueryMetaData(
     oauthClient,
+    qbo_realmId,
     req,
     payment.job.ro_number
   );
@@ -199,7 +218,7 @@ async function InsertPayment(oauthClient, req, payment, parentRef) {
   });
   try {
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(req.cookies.qbo_realmId, "payment"),
+      url: urlBuilder(qbo_realmId, "payment"),
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -210,16 +229,16 @@ async function InsertPayment(oauthClient, req, payment, parentRef) {
     return result && result.Bill;
   } catch (error) {
     logger.log("qbo-payables-error", "DEBUG", req.user.email, payment.id, {
-      error: JSON.stringify(error),
+      error: error && error.message,
       method: "InsertPayment",
     });
     throw error;
   }
 }
-async function QueryMetaData(oauthClient, req, ro_number) {
+async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number) {
   const invoice = await oauthClient.makeApiCall({
     url: urlBuilder(
-      req.cookies.qbo_realmId,
+      qbo_realmId,
       "query",
       `select * From Invoice where DocNumber = '${ro_number}'`
     ),
@@ -230,11 +249,7 @@ async function QueryMetaData(oauthClient, req, ro_number) {
   });
 
   const paymentMethods = await oauthClient.makeApiCall({
-    url: urlBuilder(
+    url: urlBuilder(qbo_realmId, "query", `select * From PaymentMethod`),
-      req.cookies.qbo_realmId,
-      "query",
-      `select * From PaymentMethod`
-    ),
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -243,7 +258,7 @@ async function QueryMetaData(oauthClient, req, ro_number) {
   setNewRefreshToken(req.user.email, paymentMethods);
 
   //   const classes = await oauthClient.makeApiCall({
-  //     url: urlBuilder(req.cookies.qbo_realmId, "query", `select * From Class`),
+  //     url: urlBuilder(qbo_realmId, "query", `select * From Class`),
   //     method: "POST",
   //     headers: {
   //       "Content-Type": "application/json",

server/accounting/qbo/qbo-receivables.js

@@ -34,7 +34,11 @@ exports.default = async (req, res) => {
     const response = await apiGqlClient.request(queries.GET_QBO_AUTH, {
       email: req.user.email,
     });
-
+    const { qbo_realmId } = response.associations[0];
+    if (!qbo_realmId) {
+      res.status(401).json({ error: "No company associated." });
+      return;
+    }
     oauthClient.setToken(response.associations[0].qbo_auth);
 
     await refreshOauthToken(oauthClient, req);
@@ -69,11 +73,17 @@ exports.default = async (req, res) => {
         if (isThreeTier || (!isThreeTier && twoTierPref === "source")) {
           //Insert the insurance company tier.
           //Query for top level customer, the insurance company name.
-          insCoCustomerTier = await QueryInsuranceCo(oauthClient, req, job);
+          insCoCustomerTier = await QueryInsuranceCo(
+            oauthClient,
+            qbo_realmId,
+            req,
+            job
+          );
           if (!insCoCustomerTier) {
             //Creating the Insurance Customer.
             insCoCustomerTier = await InsertInsuranceCo(
               oauthClient,
+              qbo_realmId,
               req,
               job,
               bodyshop
@@ -83,11 +93,17 @@ exports.default = async (req, res) => {
 
         if (isThreeTier || (!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);
+          ownerCustomerTier = await QueryOwner(
+            oauthClient,
+            qbo_realmId,
+            req,
+            job
+          );
           //Query for the owner itself.
           if (!ownerCustomerTier) {
             ownerCustomerTier = await InsertOwner(
               oauthClient,
+              qbo_realmId,
               req,
               job,
               isThreeTier,
@@ -97,13 +113,14 @@ exports.default = async (req, res) => {
         }
 
         //Query for the Job or Create it.
-        jobTier = await QueryJob(oauthClient, req, job);
+        jobTier = await QueryJob(oauthClient, qbo_realmId, req, job);
 
         // Need to validate that the job tier is associated to the right individual?
 
         if (!jobTier) {
           jobTier = await InsertJob(
             oauthClient,
+            qbo_realmId,
             req,
             job,
 
@@ -112,7 +129,14 @@ exports.default = async (req, res) => {
         }
 
         if (!req.body.custDataOnly) {
-          await InsertInvoice(oauthClient, req, job, bodyshop, jobTier);
+          await InsertInvoice(
+            oauthClient,
+            qbo_realmId,
+            req,
+            job,
+            bodyshop,
+            jobTier
+          );
         }
         ret.push({ jobid: job.id, success: true });
       } catch (error) {
@@ -121,7 +145,7 @@ exports.default = async (req, res) => {
           success: false,
           errorMessage:
             (error && error.authResponse && error.authResponse.body) ||
-            JSON.stringify(error),
+            (error && error.message),
         });
       }
     }
@@ -136,11 +160,11 @@ exports.default = async (req, res) => {
   }
 };
 
-async function QueryInsuranceCo(oauthClient, req, job) {
+async function QueryInsuranceCo(oauthClient, qbo_realmId, req, job) {
   try {
     const result = await oauthClient.makeApiCall({
       url: urlBuilder(
-        req.cookies.qbo_realmId,
+        qbo_realmId,
         "query",
         `select * From Customer where DisplayName = '${job.ins_co_nm}'`
       ),
@@ -165,7 +189,7 @@ async function QueryInsuranceCo(oauthClient, req, job) {
   }
 }
 exports.QueryInsuranceCo = QueryInsuranceCo;
-async function InsertInsuranceCo(oauthClient, req, job, bodyshop) {
+async function InsertInsuranceCo(oauthClient, qbo_realmId, req, job, bodyshop) {
   const insCo = bodyshop.md_ins_cos.find((i) => i.name === job.ins_co_nm);
 
   const Customer = {
@@ -180,7 +204,7 @@ async function InsertInsuranceCo(oauthClient, req, job, bodyshop) {
   };
   try {
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(req.cookies.qbo_realmId, "customer"),
+      url: urlBuilder(qbo_realmId, "customer"),
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -198,11 +222,11 @@ async function InsertInsuranceCo(oauthClient, req, job, bodyshop) {
   }
 }
 exports.InsertInsuranceCo = InsertInsuranceCo;
-async function QueryOwner(oauthClient, req, job) {
+async function QueryOwner(oauthClient, qbo_realmId, req, job) {
   const ownerName = generateOwnerTier(job, true, null);
   const result = await oauthClient.makeApiCall({
     url: urlBuilder(
-      req.cookies.qbo_realmId,
+      qbo_realmId,
       "query",
       `select * From Customer where DisplayName = '${ownerName}'`
     ),
@@ -220,7 +244,14 @@ async function QueryOwner(oauthClient, req, job) {
   );
 }
 exports.QueryOwner = QueryOwner;
-async function InsertOwner(oauthClient, req, job, isThreeTier, parentTierRef) {
+async function InsertOwner(
+  oauthClient,
+  qbo_realmId,
+  req,
+  job,
+  isThreeTier,
+  parentTierRef
+) {
   const ownerName = generateOwnerTier(job, true, null);
   const Customer = {
     DisplayName: ownerName,
@@ -242,7 +273,7 @@ async function InsertOwner(oauthClient, req, job, isThreeTier, parentTierRef) {
   };
   try {
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(req.cookies.qbo_realmId, "customer"),
+      url: urlBuilder(qbo_realmId, "customer"),
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -260,10 +291,10 @@ async function InsertOwner(oauthClient, req, job, isThreeTier, parentTierRef) {
   }
 }
 exports.InsertOwner = InsertOwner;
-async function QueryJob(oauthClient, req, job) {
+async function QueryJob(oauthClient, qbo_realmId, req, job) {
   const result = await oauthClient.makeApiCall({
     url: urlBuilder(
-      req.cookies.qbo_realmId,
+      qbo_realmId,
       "query",
       `select * From Customer where DisplayName = '${job.ro_number}'`
     ),
@@ -281,7 +312,7 @@ async function QueryJob(oauthClient, req, job) {
   );
 }
 exports.QueryJob = QueryJob;
-async function InsertJob(oauthClient, req, job, parentTierRef) {
+async function InsertJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
   const Customer = {
     DisplayName: job.ro_number,
     BillAddr: {
@@ -299,7 +330,7 @@ async function InsertJob(oauthClient, req, job, parentTierRef) {
   };
   try {
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(req.cookies.qbo_realmId, "customer"),
+      url: urlBuilder(qbo_realmId, "customer"),
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -317,9 +348,9 @@ async function InsertJob(oauthClient, req, job, parentTierRef) {
   }
 }
 exports.InsertJob = InsertJob;
-async function QueryMetaData(oauthClient, req) {
+async function QueryMetaData(oauthClient, qbo_realmId, req) {
   const items = await oauthClient.makeApiCall({
-    url: urlBuilder(req.cookies.qbo_realmId, "query", `select * From Item`),
+    url: urlBuilder(qbo_realmId, "query", `select * From Item`),
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -327,7 +358,7 @@ async function QueryMetaData(oauthClient, req) {
   });
   setNewRefreshToken(req.user.email, items);
   const taxCodes = await oauthClient.makeApiCall({
-    url: urlBuilder(req.cookies.qbo_realmId, "query", `select * From TaxCode`),
+    url: urlBuilder(qbo_realmId, "query", `select * From TaxCode`),
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -335,7 +366,7 @@ async function QueryMetaData(oauthClient, req) {
   });
 
   const classes = await oauthClient.makeApiCall({
-    url: urlBuilder(req.cookies.qbo_realmId, "query", `select * From Class`),
+    url: urlBuilder(qbo_realmId, "query", `select * From Class`),
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -375,8 +406,19 @@ async function QueryMetaData(oauthClient, req) {
   };
 }
 
-async function InsertInvoice(oauthClient, req, job, bodyshop, parentTierRef) {
+async function InsertInvoice(
-  const { items, taxCodes, classes } = await QueryMetaData(oauthClient, req);
+  oauthClient,
+  qbo_realmId,
+  req,
+  job,
+  bodyshop,
+  parentTierRef
+) {
+  const { items, taxCodes, classes } = await QueryMetaData(
+    oauthClient,
+    qbo_realmId,
+    req
+  );
   const InvoiceLineAdd = CreateInvoiceLines({
     bodyshop,
     jobs_by_pk: job,
@@ -407,7 +449,7 @@ async function InsertInvoice(oauthClient, req, job, bodyshop, parentTierRef) {
 
   try {
     const result = await oauthClient.makeApiCall({
-      url: urlBuilder(req.cookies.qbo_realmId, "invoice"),
+      url: urlBuilder(qbo_realmId, "invoice"),
       method: "POST",
 
       headers: {

server/accounting/qbxml/qbxml-payments.js

@@ -111,18 +111,18 @@ const generatePayment = (payment, isThreeTier, twoTierPref) => {
           ReceivePaymentAddRq: {
             ReceivePaymentAdd: {
               CustomerRef: {
-                FullName:
+                FullName: (payment.job.bodyshop.accountingconfig.tiers === 3
-                  payment.job.bodyshop.accountingconfig.tiers === 3
+                  ? `${generateSourceTier(payment.job)}:${generateOwnerTier(
-                    ? `${generateSourceTier(payment.job)}:${generateOwnerTier(
+                      payment.job,
-                        payment.job,
+                      isThreeTier,
-                        isThreeTier,
+                      twoTierPref
-                        twoTierPref
+                    )}:${generateJobTier(payment.job)}`
-                      )}:${generateJobTier(payment.job)}`
+                  : `${generateOwnerTier(
-                    : `${generateOwnerTier(
+                      payment.job,
-                        payment.job,
+                      isThreeTier,
-                        isThreeTier,
+                      twoTierPref
-                        twoTierPref
+                    )}:${generateJobTier(payment.job)}`
-                      )}:${generateJobTier(payment.job)}`,
+                ).trim(),
               },
               ARAccountRef: {
                 FullName:
@@ -155,18 +155,18 @@ const generatePayment = (payment, isThreeTier, twoTierPref) => {
           CreditMemoAddRq: {
             CreditMemoAdd: {
               CustomerRef: {
-                FullName:
+                FullName: (payment.job.bodyshop.accountingconfig.tiers === 3
-                  payment.job.bodyshop.accountingconfig.tiers === 3
+                  ? `${generateSourceTier(payment.job)}:${generateOwnerTier(
-                    ? `${generateSourceTier(payment.job)}:${generateOwnerTier(
+                      payment.job,
-                        payment.job,
+                      isThreeTier,
-                        isThreeTier,
+                      twoTierPref
-                        twoTierPref
+                    )}:${generateJobTier(payment.job)}`
-                      )}:${generateJobTier(payment.job)}`
+                  : `${generateOwnerTier(
-                    : `${generateOwnerTier(
+                      payment.job,
-                        payment.job,
+                      isThreeTier,
-                        isThreeTier,
+                      twoTierPref
-                        twoTierPref
+                    )}:${generateJobTier(payment.job)}`
-                      )}:${generateJobTier(payment.job)}`,
+                ).trim(),
               },
               ARAccountRef: {
                 FullName:

server/accounting/qbxml/qbxml-receivables.js

@@ -122,7 +122,7 @@ const generateSourceCustomerQbxml = (jobs_by_pk, bodyshop) => {
         "@onError": "continueOnError",
         CustomerAddRq: {
           CustomerAdd: {
-            Name: jobs_by_pk.ins_co_nm,
+            Name: jobs_by_pk.ins_co_nm.trim(),
             // BillAddress: {
             //   Addr1: jobs_by_pk.ownr_addr1,
             //   Addr2: jobs_by_pk.ownr_addr2,
@@ -238,16 +238,16 @@ const generateInvoiceQbxml = (
         InvoiceAddRq: {
           InvoiceAdd: {
             CustomerRef: {
-              FullName:
+              FullName: (bodyshop.accountingconfig.tiers === 3
-                bodyshop.accountingconfig.tiers === 3
+                ? `${generateSourceTier(jobs_by_pk)}:${generateOwnerTier(
-                  ? `${generateSourceTier(jobs_by_pk)}:${generateOwnerTier(
+                    jobs_by_pk
-                      jobs_by_pk
+                  )}:${generateJobTier(jobs_by_pk)}`
-                    )}:${generateJobTier(jobs_by_pk)}`
+                : `${generateOwnerTier(
-                  : `${generateOwnerTier(
+                    jobs_by_pk,
-                      jobs_by_pk,
+                    isThreeTier,
-                      isThreeTier,
+                    twoTierPref
-                      twoTierPref
+                  )}:${generateJobTier(jobs_by_pk)}`
-                    )}:${generateJobTier(jobs_by_pk)}`,
+              ).trim(),
             },
 
             ...(jobs_by_pk.class

server/accounting/qbxml/qbxml-utils.js

@@ -6,24 +6,25 @@ exports.addQbxmlHeader = addQbxmlHeader = (xml) => {
 };
 
 exports.generateSourceTier = (jobs_by_pk) => {
-  return jobs_by_pk.ins_co_nm;
+  return jobs_by_pk.ins_co_nm && jobs_by_pk.ins_co_nm.trim();
 };
 
 exports.generateJobTier = (jobs_by_pk) => {
-  return jobs_by_pk.ro_number;
+  return jobs_by_pk.ro_number && jobs_by_pk.ro_number.trim();
 };
 
 exports.generateOwnerTier = (jobs_by_pk, isThreeTier, twotierpref) => {
   if (isThreeTier) {
     //It's always gonna be the owner now. Same as 2 tier by name
-    return jobs_by_pk.ownr_co_nm
+    return (
-      ? `${jobs_by_pk.ownr_co_nm.substring(0, 30)} #${
+      jobs_by_pk.ownr_co_nm
-          jobs_by_pk.owner.accountingid || ""
+        ? `${jobs_by_pk.ownr_co_nm.substring(0, 30)} #${
-        }`
+            jobs_by_pk.owner.accountingid || ""
-      : `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}`.substring(
+          }`
-          0,
+        : `${`${jobs_by_pk.ownr_ln || ""} ${
-          30
+            jobs_by_pk.ownr_fn || ""
-        )} #${jobs_by_pk.owner.accountingid || ""}`;
+          }`.substring(0, 30)} #${jobs_by_pk.owner.accountingid || ""}`
+    ).trim();
   } else {
     //What's the 2 tier pref?
     if (twotierpref === "source") {
@@ -31,13 +32,15 @@ exports.generateOwnerTier = (jobs_by_pk, isThreeTier, twotierpref) => {
       //It should be the insurance co.
     } else {
       //Same as 3 tier
-      return jobs_by_pk.ownr_co_nm
+      return (
-        ? `${jobs_by_pk.ownr_co_nm.substring(0, 30)} #${
+        jobs_by_pk.ownr_co_nm
-            jobs_by_pk.owner.accountingid || ""
+          ? `${jobs_by_pk.ownr_co_nm.substring(0, 30)} #${
-          }`
+              jobs_by_pk.owner.accountingid || ""
-        : `${`${jobs_by_pk.ownr_ln || ""} ${
+            }`
-            jobs_by_pk.ownr_fn || ""
+          : `${`${jobs_by_pk.ownr_ln || ""} ${
-          }`.substring(0, 30)} #${jobs_by_pk.owner.accountingid || ""}`;
+              jobs_by_pk.ownr_fn || ""
+            }`.substring(0, 30)} #${jobs_by_pk.owner.accountingid || ""}`
+      ).trim();
     }
   }
 };

server/cdk/cdk-calculate-allocations.js

@@ -70,7 +70,12 @@ exports.default = async function (socket, jobid) {
           amount: Math.round(val.act_price * 100),
         }).multiply(val.part_qty || 1);
 
-        if ((val.prt_dsmk_p && val.prt_dsmk_p !== 0) || val.prt_dsmk_m !== 0) {
+        if (
+          (val.prt_dsmk_p && val.prt_dsmk_p !== 0) ||
+          ((val.db_ref === "900511" || val.db_ref === "900510") &&
+            val.prt_dsmk_m &&
+            val.prt_dsmk_m !== 0)
+        ) {
           // console.log("Have a part discount", val);
           DineroAmount = DineroAmount.add(
             val.prt_dsmk_m && val.prt_dsmk_m !== 0

server/data/arms.js

@@ -11,14 +11,13 @@ require("dotenv").config({
     `.env.${process.env.NODE_ENV || "development"}`
   ),
 });
-let Client = require("ssh2-sftp-client");
 
 const client = require("../graphql-client/graphql-client").client;
-
+const uuid = require("uuid").v4;
 exports.default = async (req, res) => {
   //Query for the List of Bodyshop Clients.
   logger.log("arms-start", "DEBUG", "api", null, null);
-  const { bodyshops } = await client.request(queries.GET_AUTOHOUSE_SHOPS);
+  const { bodyshops } = await client.request(queries.GET_ENTEGRAL_SHOPS);
 
   const allxmlsToUpload = [];
   const allErrors = [];
@@ -29,14 +28,14 @@ exports.default = async (req, res) => {
       });
       const erroredJobs = [];
       try {
-        const { jobs } = await client.request(queries.AUTOHOUSE_QUERY, {
+        const { jobs } = await client.request(queries.ENTEGRAL_EXPORT, {
           bodyshopid: bodyshop.id,
         });
-
+        const ret = jobs.map((job) => {
-        jobs.map((job) => {
+          const transId = uuid(); // Can this actually be the job id?
           return {
             RepairOrderFolderAddRq: {
-              RqUID: "426cce3a-efa7-44d9-b76e-50b9102c4198", //TODO UID Tracking
+              RqUID: transId,
               DocumentInfo: {
                 BMSVer: "4.0.0",
                 DocumentType: "Repair Order",
@@ -48,20 +47,22 @@ exports.default = async (req, res) => {
               },
               EventInfo: {
                 AssignmentEvent: {
-                  CreateDateTime: moment(job.asgn_date).format(),
+                  CreateDateTime:
+                    job.asgn_date && moment(job.asgn_date).format(),
                 },
                 EstimateEvent: {
                   UploadDateTime: "2009-03-02T17:00:00.0000000-08:00", //TODO Figure out what this actually is. 'Date Estimate was uploaded'
                 },
                 RepairEvent: {
-                  ArrivalDateTime: moment(job.date_open).format(),
+                  ArrivalDateTime:
+                    job.date_open && moment(job.date_open).format(),
                   ArrivalOdometerReading: job.kmin,
-                  TargetCompletionDateTime: moment(
+                  TargetCompletionDateTime:
-                    job.scheduled_compltion
+                    job.scheduled_completion &&
-                  ).format(),
+                    moment(job.scheduled_completion).format(),
                   ActualCompletionDateTime:
-                    job.actual_complation &&
+                    job.actual_completion &&
-                    moment(job.actual_complation).format(),
+                    moment(job.actual_completion).format(),
                   ActualPickUpDateTime:
                     job.actual_delivery && moment(job.actual_delivery).format(),
                   CloseDateTime:
@@ -109,30 +110,30 @@ exports.default = async (req, res) => {
                       },
                     },
                   },
-                  InsuranceAgent: {
+                  // InsuranceAgent: {
-                    Party: {
+                  //   Party: {
-                      OrgInfo: {
+                  //     OrgInfo: {
-                        CompanyName: "Nationwide Insurance",
+                  //       CompanyName: "Nationwide Insurance",
-                        Communications: {
+                  //       Communications: {
-                          CommQualifier: "WP",
+                  //         CommQualifier: "WP",
-                          CommPhone: "714-5551212",
+                  //         CommPhone: "714-5551212",
-                        },
+                  //       },
-                      },
+                  //     },
-                      ContactInfo: {
+                  //     ContactInfo: {
-                        ContactJobTitle: "Insurance Agent",
+                  //       ContactJobTitle: "Insurance Agent",
-                        ContactName: {
+                  //       ContactName: {
-                          FirstName: "Paul",
+                  //         FirstName: "Paul",
-                          LastName: "White",
+                  //         LastName: "White",
-                        },
+                  //       },
-                      },
+                  //     },
-                    },
+                  //   },
-                  },
+                  // },
                   Insured: {
                     Party: {
                       PersonInfo: {
                         PersonName: {
-                          FirstName: "Jim",
+                          FirstName: job.insd_fn,
-                          LastName: "Smith",
+                          LastName: job.insd_ln,
                         },
                       },
                     },
@@ -180,8 +181,8 @@ exports.default = async (req, res) => {
                     Party: {
                       PersonInfo: {
                         PersonName: {
-                          FirstName: "Jim",
+                          FirstName: job.clm_ct_fn,
-                          LastName: "Smith",
+                          LastName: job.clm_ct_ln,
                         },
                       },
                     },
@@ -191,13 +192,13 @@ exports.default = async (req, res) => {
                     Party: {
                       PersonInfo: {
                         PersonName: {
-                          FirstName: "Jim",
+                          FirstName: job.est_ct_fn,
-                          LastName: "Smith",
+                          LastName: job.est_ct_ln,
-                        },
-                        IDInfo: {
-                          IDQualifierCode: "US",
-                          IDNum: 2941,
                         },
+                        // IDInfo: {
+                        //   IDQualifierCode: "US",
+                        //   IDNum: 2941,
+                        // },
                       },
                     },
                   },
@@ -208,7 +209,7 @@ exports.default = async (req, res) => {
                         CompanyName: bodyshop.shopname,
                         IDInfo: {
                           IDQualifierCode: "US",
-                          IDNum: 2207,
+                          IDNum: bodyshop.entegral_id,
                         },
                       },
                     },
@@ -391,6 +392,7 @@ exports.default = async (req, res) => {
                       Rate: job.rate_mahw,
                     },
                     MaterialCalcSettings: {
+                      //Todo Capture Calc Settings
                       CalcMethodCode: 2,
                       CalcMaxAmt: 10,
                     },
@@ -476,7 +478,7 @@ exports.default = async (req, res) => {
                     TotalAmt: Dinero(
                       job.job_totals.parts.parts.list.paa &&
                         job.job_totals.parts.parts.list.paa.total
-                    ).toFormat(0.0),
+                    ).toFormat("0.0"),
                   },
                   {
                     TotalType: "PAC",
@@ -484,7 +486,7 @@ exports.default = async (req, res) => {
                     TotalAmt: Dinero(
                       job.job_totals.parts.parts.list.pac &&
                         job.job_totals.parts.parts.list.pac.total
-                    ).toFormat(0.0),
+                    ).toFormat("0.0"),
                   },
                   {
                     TotalType: "PAG",
@@ -492,7 +494,7 @@ exports.default = async (req, res) => {
                     TotalAmt: Dinero(
                       job.job_totals.parts.parts.list.pag &&
                         job.job_totals.parts.parts.list.pag.total
-                    ).toFormat(0.0),
+                    ).toFormat("0.0"),
                   },
                   {
                     TotalType: "PAL",
@@ -500,7 +502,7 @@ exports.default = async (req, res) => {
                     TotalAmt: Dinero(
                       job.job_totals.parts.parts.list.pal &&
                         job.job_totals.parts.parts.list.pal.total
-                    ).toFormat(0.0),
+                    ).toFormat("0.0"),
                   },
                   {
                     TotalType: "PAM",
@@ -508,7 +510,7 @@ exports.default = async (req, res) => {
                     TotalAmt: Dinero(
                       job.job_totals.parts.parts.list.pam &&
                         job.job_totals.parts.parts.list.pam.total
-                    ).toFormat(0.0),
+                    ).toFormat("0.0"),
                   },
                   {
                     TotalType: "PAN",
@@ -516,7 +518,7 @@ exports.default = async (req, res) => {
                     TotalAmt: Dinero(
                       job.job_totals.parts.parts.list.pan &&
                         job.job_totals.parts.parts.list.pan.total
-                    ).toFormat(0.0),
+                    ).toFormat("0.0"),
                   },
                   {
                     TotalType: "PAR",
@@ -524,7 +526,7 @@ exports.default = async (req, res) => {
                     TotalAmt: Dinero(
                       job.job_totals.parts.parts.list.par &&
                         job.job_totals.parts.parts.list.par.total
-                    ).toFormat(0.0),
+                    ).toFormat("0.0"),
                   },
                 ],
                 OtherChargesTotalsInfo: [
@@ -533,7 +535,7 @@ exports.default = async (req, res) => {
                     TotalTypeDesc: "Sublet",
                     TotalAmt: Dinero(
                       job.job_totals.parts.sublets.total
-                    ).toFormat(0.0),
+                    ).toFormat("0.0"),
                   },
                   {
                     TotalType: "MAPA",
@@ -549,19 +551,19 @@ exports.default = async (req, res) => {
                       0.0
                     ),
                   },
-                  {
+                  // {
-                    TotalType: "MAHW",
+                  //   TotalType: "MAHW",
-                    TotalTypeDesc: "Hazardous Wastes Removal",
+                  //   TotalTypeDesc: "Hazardous Wastes Removal",
-                    TotalAmt: Dinero(job.job_totals.rates.mahw.total).toFormat(
+                  //   TotalAmt: Dinero(job.job_totals.rates.mahw.total).toFormat(
-                      0.0
+                  //     0.0
-                    ),
+                  //   ),
-                  },
+                  // },
                   {
                     TotalType: "OTST",
                     TotalTypeDesc: "Storage",
                     TotalAmt: Dinero(
                       job.job_totals.additional.storage
-                    ).toFormat(0.0),
+                    ).toFormat("0.0"),
                   },
                   {
                     TotalType: "OTTW",
@@ -575,7 +577,7 @@ exports.default = async (req, res) => {
                     TotalTypeDesc: "Additional Charges",
                     TotalAmt: Dinero(
                       job.job_totals.additional.additionalCosts
-                    ).toFormat(0.0),
+                    ).toFormat("0.0"),
                   },
                 ],
                 SummaryTotalsInfo: [
@@ -583,43 +585,55 @@ exports.default = async (req, res) => {
                     TotalType: "TOT",
                     TotalSubType: "T2",
                     TotalTypeDesc: "Net Total",
-                    TotalAmt: 471.3,
+                    TotalAmt: Dinero(job.job_totals.totals.subtotal).toFormat(
+                      0.0
+                    ),
                   },
                   {
                     TotalType: "TOT",
                     TotalSubType: "F7",
                     TotalTypeDesc: "Sales Tax",
-                    TotalAmt: 0,
+                    TotalAmt: Dinero(job.job_totals.totals.state_tax).toFormat(
+                      0.0
+                    ),
                   },
                   {
                     TotalType: "TOT",
                     TotalSubType: "GST",
                     TotalTypeDesc: "GST Tax",
-                    TotalAmt: 0,
+                    TotalAmt: Dinero(
+                      job.job_totals.totals.federal_tax
+                    ).toFormat("0.0"),
                   },
                   {
                     TotalType: "TOT",
                     TotalSubType: "TT",
                     TotalTypeDesc: "Gross Total",
-                    TotalAmt: 471.3,
+                    TotalAmt: Dinero(
-                  },
+                      job.job_totals.totals.total_repairs
-                  {
+                    ).toFormat("0.0"),
-                    TotalType: "TOT",
-                    TotalSubType: "SM",
-                    TotalTypeDesc: "Supplement Total",
-                    TotalAmt: 0,
                   },
+                  // {
+                  //   TotalType: "TOT",
+                  //   TotalSubType: "SM",
+                  //   TotalTypeDesc: "Supplement Total",
+                  //   TotalAmt: 0,
+                  // },
                   {
                     TotalType: "TOT",
                     TotalSubType: "D2",
                     TotalTypeDesc: "Deductible",
-                    TotalAmt: 0,
+                    TotalAmt: Dinero({
+                      amount: Math.round((job.ded_amt || 0) * 100),
+                    }).toFormat("0.0"),
                   },
                   {
                     TotalType: "TOT",
                     TotalSubType: "BTR",
                     TotalTypeDesc: "Betterment",
-                    TotalAmt: 0,
+                    TotalAmt: Dinero(
+                      job.job_totals.totals.custPayable.dep_taxes
+                    ).toFormat("0.0"),
                   },
                   {
                     TotalType: "TOT",
@@ -631,75 +645,81 @@ exports.default = async (req, res) => {
                     TotalType: "TOT",
                     TotalSubType: "D8",
                     TotalTypeDesc: "Bottom Line Discount",
-                    TotalAmt: 0,
+                    TotalAmt: Dinero(
+                      job.job_totals.additional.adjustments
+                    ).toFormat("0.0"),
                   },
                   {
                     TotalType: "TOT",
                     TotalSubType: "INS",
                     TotalTypeDesc: "Insurance Pay",
-                    TotalAmt: 471.3,
+                    TotalAmt: Dinero(job.job_totals.totals.total_repairs)
-                  },
+                      .subtract(Dinero(job.job_totals.totals.custPayable.total))
-                  {
+                      .toFormat("0.0"),
-                    TotalType: "TOT",
-                    TotalSubType: "DEPOSIT",
-                    TotalTypeDesc: "Deposit",
-                    TotalAmt: 0,
                   },
+                  // {
+                  //   TotalType: "TOT",
+                  //   TotalSubType: "DEPOSIT",
+                  //   TotalTypeDesc: "Deposit",
+                  //   TotalAmt: 0,
+                  // },
                   {
                     TotalType: "TOT",
                     TotalSubType: "CUST",
                     TotalTypeDesc: "Customer Pay",
-                    TotalAmt: 0,
+                    TotalAmt: Dinero(
+                      job.job_totals.totals.custPayable.total
+                    ).toFormat("0.0"),
                   },
                 ],
                 RepairTotalsType: 1,
               },
-              RepairLabor: {
+              // RepairLabor: {
-                LaborAllocations: {
+              //   LaborAllocations: {
-                  LaborAllocation: [
+              //     LaborAllocation: [
-                    {
+              //       {
-                      LaborAllocationUUID:
+              //         LaborAllocationUUID:
-                        "426cce3a-efa7-44d9-b76e-50b9102c4198",
+              //           "426cce3a-efa7-44d9-b76e-50b9102c4198",
-                      LaborType: "LAB",
+              //         LaborType: "LAB",
-                      Technician: {
+              //         Technician: {
-                        Employee: {
+              //           Employee: {
-                          PersonInfo: {
+              //             PersonInfo: {
-                            PersonName: {
+              //               PersonName: {
-                              FirstName: "Jose",
+              //                 FirstName: "Jose",
-                              LastName: "Gonzalez",
+              //                 LastName: "Gonzalez",
-                            },
+              //               },
-                            IDInfo: {
+              //               IDInfo: {
-                              IDQualifierCode: "US",
+              //                 IDQualifierCode: "US",
-                              IDNum: 2987,
+              //                 IDNum: 2987,
-                            },
+              //               },
-                          },
+              //             },
-                        },
+              //           },
-                      },
+              //         },
-                      AllocatedHours: 3.5,
+              //         AllocatedHours: 3.5,
-                    },
+              //       },
-                    {
+              //       {
-                      LaborAllocationUUID:
+              //         LaborAllocationUUID:
-                        "426cce3a-efa7-44d9-b76e-50b9102c4199",
+              //           "426cce3a-efa7-44d9-b76e-50b9102c4199",
-                      LaborType: "LAR",
+              //         LaborType: "LAR",
-                      Technician: {
+              //         Technician: {
-                        Employee: {
+              //           Employee: {
-                          PersonInfo: {
+              //             PersonInfo: {
-                            PersonName: {
+              //               PersonName: {
-                              FirstName: "Rcardo",
+              //                 FirstName: "Rcardo",
-                              LastName: "Himenez",
+              //                 LastName: "Himenez",
-                            },
+              //               },
-                            IDInfo: {
+              //               IDInfo: {
-                              IDQualifierCode: "US",
+              //                 IDQualifierCode: "US",
-                              IDNum: 2989,
+              //                 IDNum: 2989,
-                            },
+              //               },
-                          },
+              //             },
-                        },
+              //           },
-                      },
+              //         },
-                      AllocatedHours: 5.5,
+              //         AllocatedHours: 5.5,
-                    },
+              //       },
-                  ],
+              //     ],
-                },
+              //   },
-              },
+              // },
               ProductionStatus: {
                 ProductionStage: {
                   ProductionStageCode: 4,
@@ -713,30 +733,30 @@ exports.default = async (req, res) => {
                   RepairStatusMemo: "Waiting on back ordered parts",
                 },
               },
-              RepairOrderNotes: {
+              // RepairOrderNotes: {
-                RepairOrderNote: {
+              //   RepairOrderNote: {
-                  LineSequenceNum: 1,
+              //     LineSequenceNum: 1,
-                  Note: "Revision Requested : approved--but needs est separated.8/22/2008 11:58:53 AM",
+              //     Note: "Revision Requested : approved--but needs est separated.8/22/2008 11:58:53 AM",
-                  CreateDateTime: "2008-08-22T11:58:53",
+              //     CreateDateTime: "2008-08-22T11:58:53",
-                  AuthoredBy: {
+              //     AuthoredBy: {
-                    FirstName: {
+              //       FirstName: {
-                      "#text": "Elizabeth/FirstName>",
+              //         "#text": "Elizabeth/FirstName>",
-                      LastName: "Unis",
+              //         LastName: "Unis",
-                    },
+              //       },
-                  },
+              //     },
-                  RepairOrderNote: {
+              //     RepairOrderNote: {
-                    LineSequenceNum: 2,
+              //       LineSequenceNum: 2,
-                    Note: "Approved : 8/26/2008 12:21:08 PM",
+              //       Note: "Approved : 8/26/2008 12:21:08 PM",
-                    CreateDateTime: "2008-08-26T12:21:08",
+              //       CreateDateTime: "2008-08-26T12:21:08",
-                    AuthoredBy: {
+              //       AuthoredBy: {
-                      FirstName: {
+              //         FirstName: {
-                        "#text": "Elizabeth/FirstName>",
+              //           "#text": "Elizabeth/FirstName>",
-                        LastName: "Unis",
+              //           LastName: "Unis",
-                      },
+              //         },
-                    },
+              //       },
-                  },
+              //     },
-                },
+              //   },
-              },
+              // },
             },
           };
         });
@@ -751,6 +771,7 @@ exports.default = async (req, res) => {
         logger.log("arms-end-shop-extract", "DEBUG", "api", bodyshop.id, {
           shopname: bodyshop.shopname,
         });
+        res.json(ret);
       } catch (error) {
         //Error at the shop level.
         logger.log("arms-error-shop", "ERROR", "api", bodyshop.id, {
@@ -784,10 +805,10 @@ function GetSupplementNumber(joblines) {
 
 function GetDocumentstatus(job, bodyshop) {
   switch (job.status) {
-    case bodyshop.md_ro_status.default_void:
+    case bodyshop.md_ro_statuses.default_void:
       return "V";
-    case bodyshop.md_ro_status.default_invoiced:
+    case bodyshop.md_ro_statuses.default_invoiced:
-    case bodyshop.md_ro_status.default_exported:
+    case bodyshop.md_ro_statuses.default_exported:
       return "V";
 
     default:

server/graphql-client/queries.js

@@ -531,6 +531,94 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
 
 `;
 
+exports.ENTEGRAL_EXPORT = `
+query ENTEGRAL_EXPORT($bodyshopid: uuid!) {
+  jobs(where: {_and: [{converted: {_eq: true}}, {shopid: {_eq: $bodyshopid}}]}) {
+    joblines {
+      id
+      line_ind
+    }
+    id
+    ro_number
+    status
+    asgn_date
+    date_open
+    kmin
+    scheduled_completion
+    actual_completion
+    actual_delivery
+    date_exported
+    ins_co_nm
+    ins_addr1
+    ins_addr2
+    ins_city
+    ins_st
+    ins_zip
+    ins_ctry
+    ins_ph1
+    ins_ph2
+    est_ct_ln
+    est_ct_fn
+    insd_fn
+    insd_ln
+    ownr_fn
+    ownr_ln
+    ownr_co_nm
+    ownr_addr1
+    ownr_addr2
+    ownr_city
+    ownr_st
+    ownr_zip
+    ownr_ctry
+    ownr_ph1
+    ownr_ph2
+    ownr_ea
+    clm_ct_fn
+    clm_ct_ln
+    v_vin
+    plate_no
+    v_model_yr
+    v_make_desc
+    v_model_desc
+    v_color
+    driveable
+    clm_no
+    policy_no
+    loss_date
+    area_of_damage
+    tlos_ind
+    parts_tax_rates
+    federal_tax_rate
+    state_tax_rate
+    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
+    job_totals
+    ded_amt
+  }
+}
+`;
+
 exports.UPDATE_JOB = `
   mutation UPDATE_JOB($jobId: uuid!, $job: jobs_set_input!) {
     update_jobs(where: { id: { _eq: $jobId } }, _set: $job) {
@@ -938,7 +1026,6 @@ exports.INSERT_IOEVENT = ` mutation INSERT_IOEVENT($event: ioevents_insert_input
 
 exports.GET_AUTOHOUSE_SHOPS = `query GET_AUTOHOUSE_SHOPS {
   bodyshops(where: {autohouseid: {_is_null: false}}){
-
          id
       shopname
       address1
@@ -957,6 +1044,25 @@ exports.GET_AUTOHOUSE_SHOPS = `query GET_AUTOHOUSE_SHOPS {
 }
 `;
 
+exports.GET_ENTEGRAL_SHOPS = `query GET_AUTOHOUSE_SHOPS {
+  bodyshops(where: {entegral_id: {_is_null: false}}){
+         id
+      shopname
+      address1
+      city
+      state
+      zip_post
+      country
+      phone
+      md_ro_statuses
+      md_order_statuses
+      entegral_id
+      md_responsibility_centers
+      imexshopid
+  }
+}
+`;
+
 exports.DELETE_ALL_DMS_VEHICLES = `mutation DELETE_ALL_DMS_VEHICLES{
   delete_dms_vehicles(where: {}) {
     affected_rows
@@ -1088,9 +1194,17 @@ exports.GET_QBO_AUTH = `query GET_QBO_AUTH($email: String!) {
   associations(where: {_and: {active: {_eq: true}, useremail: {_eq: $email}}}){
     id
     qbo_auth
+    qbo_realmId
   }
 }`;
 
+exports.SET_QBO_AUTH_WITH_REALM = `mutation SET_QBO_AUTH($email: String!, $qbo_auth: jsonb!, $qbo_realmId: String) {
+  update_associations(_set: {qbo_auth: $qbo_auth, qbo_realmId: $qbo_realmId}, where: {_and: {active: {_eq: true}, useremail: {_eq: $email}}}){
+    affected_rows
+  }
+}
+`;
+
 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

server/job/job-totals.js

@@ -270,7 +270,10 @@ function CalculatePartsTotals(jobLines) {
                   })
                     .multiply(value.part_qty || 0)
                     .add(
-                      value.prt_dsmk_m && value.prt_dsmk_m !== 0
+                      (value.db_ref === "900511" ||
+                        value.db_ref === "900510") &&
+                        value.prt_dsmk_m &&
+                        value.prt_dsmk_m !== 0
                         ? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) })
                         : Dinero({
                             amount: Math.round(value.act_price * 100),
@@ -295,7 +298,9 @@ function CalculatePartsTotals(jobLines) {
               parts: {
                 ...acc.parts,
                 prt_dsmk_total: acc.parts.prt_dsmk_total.add(
-                  value.prt_dsmk_m && value.prt_dsmk_m !== 0
+                  (value.db_ref === "900511" || value.db_ref === "900510") &&
+                    value.prt_dsmk_m &&
+                    value.prt_dsmk_m !== 0
                     ? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) })
                     : Dinero({
                         amount: Math.round(value.act_price * 100),
@@ -339,7 +344,9 @@ function CalculatePartsTotals(jobLines) {
                     }).multiply(value.part_qty || 0)
                   )
                   .add(
-                    value.prt_dsmk_m && value.prt_dsmk_m !== 0
+                    (value.db_ref === "900511" || value.db_ref === "900510") &&
+                      value.prt_dsmk_m &&
+                      value.prt_dsmk_m !== 0
                       ? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) })
                       : Dinero({
                           amount: Math.round(value.act_price * 100),

server/scheduling/scheduling-job.js

@@ -87,7 +87,10 @@ exports.job = async (req, res) => {
       } else {
         //remove the date from the possible list.
         const appDate = moment(appointment.start).format("yyyy-MM-DD");
-        delete bucketMatrix[appDate];
+        bucketMatrix[appDate] = {
+          ...bucketMatrix[appDate],
+          blocked: true,
+        };
       }
     });
 
@@ -125,7 +128,9 @@ exports.job = async (req, res) => {
     const possibleDates = [];
     const bucketMatrixKeys = Object.keys(bucketMatrix);
     bucketMatrixKeys.forEach((bmkey) => {
-      const isShopOpen = workingdays[dayOfWeekMapper(moment(bmkey).day())];
+      const isShopOpen =
+        workingdays[dayOfWeekMapper(moment(bmkey).day())] &&
+        !bucketMatrix[bmkey].blocked;
 
       if (
         JobBucket.target > bucketMatrix[bmkey].in - bucketMatrix[bmkey].out &&
@@ -134,7 +139,11 @@ exports.job = async (req, res) => {
         possibleDates.push(new Date(bmkey).toISOString().substr(0, 10));
     });
 
-    res.json(possibleDates);
+    if (possibleDates.length < 6) {
+      res.json(possibleDates);
+    } else {
+      res.json(possibleDates.slice(0, 5));
+    }
   } catch (error) {
     logger.log("smart-scheduling-error", "ERROR", req.user.email, jobId, {
       error,

server/web-sockets/web-socket.js

@@ -17,6 +17,7 @@ const CdkCalculateAllocations =
   require("../cdk/cdk-calculate-allocations").default;
 const { isArray } = require("lodash");
 const logger = require("../utils/logger");
+const PbsExportJob = require("../accounting/pbs/pbs-job-export");
 
 io.use(function (socket, next) {
   try {
@@ -57,6 +58,7 @@ io.on("connection", (socket) => {
     });
   });
 
+  ///CDK
   socket.on("cdk-export-job", (jobid) => {
     CdkJobExport(socket, jobid);
   });
@@ -94,6 +96,13 @@ io.on("connection", (socket) => {
 
     callback(allocations);
   });
+  //END CDK
+
+  //PBS
+  socket.on("pbs-export-job", (jobid) => {
+    PbsExportJob(socket, jobid);
+  });
+  //End PBS
 
   socket.on("disconnect", () => {
     createLogEvent(socket, "DEBUG", `User disconnected.`);

yarn.lock

@@ -10,9 +10,9 @@
     "@babel/highlight" "^7.10.4"
 
 "@babel/helper-validator-identifier@^7.14.5":
-  version "7.14.9"
+  version "7.15.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
-  integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==
+  integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
 
 "@babel/highlight@^7.10.4":
   version "7.14.5"
@@ -489,9 +489,9 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4:
     uri-js "^4.2.2"
 
 ajv@^8.0.1:
-  version "8.6.2"
+  version "8.6.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764"
-  integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==
+  integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -508,6 +508,11 @@ ansi-regex@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
   integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
 
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -595,10 +600,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.1006.0:
+aws-sdk@^2.1009.0:
-  version "2.1006.0"
+  version "2.1009.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1006.0.tgz#fc2f7e267d19a6297f732e19449461bb944682af"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1009.0.tgz#d96217a19f259c2448f91cf24973d390de16f8e0"
-  integrity sha512-lwXAy706+1HVQqMnHaahdeBZZbdu6TWrtTY0ydeG0qanwldTFNMLczwnETTZWYsqNAU+wjl1VzmFdMO4gePLNQ==
+  integrity sha512-qKbmt+vzQ7ZSnfEvA+u6d7CkV09AcAGnxZAiNgOAEn8GFFEtERy6C39VoAuWfON/B2avJDYvtRocjVmAxWpgjQ==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
@@ -639,10 +644,10 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-arraybuffer@0.1.4:
+base64-arraybuffer@~1.0.1:
-  version "0.1.4"
+  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz#87bd13525626db4a9838e00a508c2b73efcf348c"
-  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
+  integrity sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA==
 
 base64-js@^1.0.2, base64-js@^1.3.0:
   version "1.5.1"
@@ -1326,25 +1331,28 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-engine.io-parser@~4.0.0:
+engine.io-parser@~5.0.0:
-  version "4.0.3"
+  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.3.tgz#83d3a17acfd4226f19e721bb22a1ee8f7662d2f6"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.1.tgz#6695fc0f1e6d76ad4a48300ff80db5f6b3654939"
-  integrity sha512-xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA==
+  integrity sha512-j4p3WwJrG2k92VISM0op7wiq60vO92MlF3CRGxhKHy9ywG1/Dkc72g0dXeDQ+//hrcDn8gqQzoEkdO9FN0d9AA==
   dependencies:
-    base64-arraybuffer "0.1.4"
+    base64-arraybuffer "~1.0.1"
 
-engine.io@~5.2.0:
+engine.io@~6.0.0:
-  version "5.2.0"
+  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-5.2.0.tgz#554cdd0230d89de7b1a49a809d7ee5a129d36809"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.0.0.tgz#2b993fcd73e6b3a6abb52b40b803651cd5747cf0"
-  integrity sha512-d1DexkQx87IFr1FLuV+0f5kAm1Hk1uOVijLOb+D1sDO2QMb7YjE02VHtZtxo7xIXMgcWLb+vl3HRT0rI9tr4jQ==
+  integrity sha512-Ui7yl3JajEIaACg8MOUwWvuuwU7jepZqX3BKs1ho7NQRuP4LhN4XIykXhp8bEy+x/DhA0LBZZXYSCkZDqrwMMg==
   dependencies:
+    "@types/cookie" "^0.4.1"
+    "@types/cors" "^2.8.12"
+    "@types/node" ">=10.0.0"
     accepts "~1.3.4"
     base64id "2.0.0"
     cookie "~0.4.1"
     cors "~2.8.5"
     debug "~4.3.1"
-    engine.io-parser "~4.0.0"
+    engine.io-parser "~5.0.0"
-    ws "~7.4.2"
+    ws "~8.2.3"
 
 enquirer@^2.3.5:
   version "2.3.6"
@@ -1944,10 +1952,10 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
   integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
 
-graphql-request@^3.4.0:
+graphql-request@^3.6.1:
-  version "3.5.0"
+  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-3.5.0.tgz#7e69574e15875fb3f660a4b4be3996ecd0bbc8b7"
+  resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-3.6.1.tgz#689cce1da990131b40b05651f9f32bff506a1d8e"
-  integrity sha512-Io89QpfU4rqiMbqM/KwMBzKaDLOppi8FU8sEccCE4JqCgz95W9Q8bvxQ4NfPALLSMvg9nafgg8AkYRmgKSlukA==
+  integrity sha512-Nm1EasrAQVZllyNTlHDLnLZjlhC6eRWnWP6KH//ytnAL08pjlLkdI2K+s6OV92p45hn5b/kUlLbDwACmRoLwrQ==
   dependencies:
     cross-fetch "^3.0.6"
     extract-files "^9.0.0"
@@ -2218,13 +2226,20 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-glob@^4.0.0, is-glob@^4.0.1:
+is-glob@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
+is-glob@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-obj@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
@@ -3514,18 +3529,15 @@ socket.io-parser@~4.0.4:
     component-emitter "~1.3.0"
     debug "~4.3.1"
 
-socket.io@^4.2.0:
+socket.io@^4.3.1:
-  version "4.2.0"
+  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.2.0.tgz#9e1c09d3ea647e24963a2e7ba8ea5c847778e2ed"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.3.1.tgz#c0aa14f3f916a8ab713e83a5bd20c16600245763"
-  integrity sha512-sjlGfMmnaWvTRVxGRGWyhd9ctpg4APxWAxu85O/SxekkxHhfxmePWZbaYCkeX5QQX0z1YEnKOlNt6w82E4Nzug==
+  integrity sha512-HC5w5Olv2XZ0XJ4gOLGzzHEuOCfj3G0SmoW3jLHYYh34EVsIr3EkW9h6kgfW+K3TFEcmYy8JcPWe//KUkBp5jA==
   dependencies:
-    "@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.2"
-    engine.io "~5.2.0"
+    engine.io "~6.0.0"
     socket.io-adapter "~2.3.2"
     socket.io-parser "~4.0.4"
 
@@ -3594,19 +3606,19 @@ 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.4:
+ssh2-sftp-client@^7.1.0:
-  version "7.0.4"
+  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/ssh2-sftp-client/-/ssh2-sftp-client-7.0.4.tgz#1e3182fa6a123f5d65429b2f62a76f1e9780907d"
+  resolved "https://registry.yarnpkg.com/ssh2-sftp-client/-/ssh2-sftp-client-7.1.0.tgz#1a717b6818dfcae6c7c4eb1b0fd8580dd701502b"
-  integrity sha512-4fFSTgoYlzcAtGfEjiXN6N41s1jSUmPlI00f7uD7pQOjt9yK9susminINKTRvPp35dkrATrlNZVhUxNCt3z5+w==
+  integrity sha512-RyeBnutDAbIwmQrGO+MafKuXHkg2F6AMrdZtB7fbQdGm2c8AhPEY6hMwc41DKJlNtDcQCr2vaZlrBriu6xC5PA==
   dependencies:
     concat-stream "^2.0.0"
     promise-retry "^2.0.1"
-    ssh2 "^1.4.0"
+    ssh2 "^1.5.0"
 
-ssh2@^1.4.0:
+ssh2@^1.5.0:
-  version "1.4.0"
+  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.4.0.tgz#e32e8343394364c922bad915a5a7fecd67d0f5c5"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.5.0.tgz#4dc559ba98a1cbb420e8d42998dfe35d0eda92bc"
-  integrity sha512-XvXwcXKvS452DyQvCa6Ct+chpucwc/UyxgliYz+rWXJ3jDHdtBb9xgmxJdMmnIn5bpgGAEV3KaEsH98ZGPHqwg==
+  integrity sha512-iUmRkhH9KGeszQwDW7YyyqjsMTf4z+0o48Cp4xOwlY5LjtbIAvyd3fwnsoUZW/hXmTCRA3yt7S/Jb9uVjErVlA==
   dependencies:
     asn1 "^0.2.4"
     bcrypt-pbkdf "^1.0.2"
@@ -3670,6 +3682,15 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
+string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -3701,6 +3722,13 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -3711,10 +3739,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.181.0:
+stripe@^8.183.0:
-  version "8.181.0"
+  version "8.183.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.181.0.tgz#e49514b10c54d146cc5306204410658c2d689386"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.183.0.tgz#3dc183fafff618526a576a0d9972483b08075e06"
-  integrity sha512-yEKT+/a/5OMYqGPhI/4jy/kiKHKeew1n9BvNtHbOA9lQDM8yVIYDx0nbQMj5rMowivAMqY67mejDJeSBlcPASA==
+  integrity sha512-QcM3nimH1CuP49VPPRt36Wgfu4QoS+Wm0eyGMis7Ej+seWFKqMffMdx7TE2gn8dVsJIOA1kDuIbAQGqpZHozGA==
   dependencies:
     "@types/node" ">=8.1.0"
     qs "^6.6.0"
@@ -3780,16 +3808,16 @@ supports-color@^8.1.0:
     has-flag "^4.0.0"
 
 table@^6.0.9:
-  version "6.7.1"
+  version "6.7.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0"
-  integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==
+  integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==
   dependencies:
     ajv "^8.0.1"
     lodash.clonedeep "^4.5.0"
     lodash.truncate "^4.4.2"
     slice-ansi "^4.0.0"
-    string-width "^4.2.0"
+    string-width "^4.2.3"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
 
 teeny-request@^7.0.0:
   version "7.1.1"
@@ -4115,10 +4143,10 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-ws@~7.4.2:
+ws@~8.2.3:
-  version "7.4.6"
+  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
-  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
+  integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
 
 xdg-basedir@^4.0.0:
   version "4.0.0"