Merged in release/2021-12-10 (pull request #299)

release/2021-12-10

Approved-by: Patrick Fic

client/package.json

@@ -4,21 +4,21 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@apollo/client": "^3.5.5",
+    "@apollo/client": "^3.4.17",
     "@asseinfo/react-kanban": "^2.2.0",
-    "@craco/craco": "^6.4.2",
+    "@craco/craco": "^6.4.0",
     "@fingerprintjs/fingerprintjs": "^3.3.0",
-    "@openreplay/tracker": "^3.4.10",
+    "@openreplay/tracker": "^3.4.7",
-    "@openreplay/tracker-assist": "^3.4.9",
+    "@openreplay/tracker-assist": "^3.4.4",
     "@openreplay/tracker-graphql": "^3.0.0",
-    "@openreplay/tracker-redux": "^3.4.8",
+    "@openreplay/tracker-redux": "^3.0.0",
-    "@sentry/react": "^6.15.0",
+    "@sentry/react": "^6.14.3",
-    "@sentry/tracing": "^6.15.0",
+    "@sentry/tracing": "^6.14.3",
     "@splitsoftware/splitio-react": "^1.3.0",
     "@stripe/react-stripe-js": "^1.6.0",
-    "@stripe/stripe-js": "^1.21.2",
+    "@stripe/stripe-js": "^1.21.1",
     "@tanem/react-nprogress": "^3.0.82",
-    "antd": "^4.17.3",
+    "antd": "^4.16.13",
     "apollo-link-logger": "^2.0.0",
     "axios": "^0.24.0",
     "craco-less": "^1.20.0",
@@ -27,17 +27,17 @@
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
-    "firebase": "^9.6.0",
+    "firebase": "^9.4.1",
     "graphql": "^16.0.1",
-    "i18next": "^21.5.4",
+    "i18next": "^21.4.2",
     "i18next-browser-languagedetector": "^6.1.2",
     "jsoneditor": "^9.5.7",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.9.44",
+    "libphonenumber-js": "^1.9.42",
-    "logrocket": "^2.1.2",
+    "logrocket": "^2.1.1",
-    "markerjs2": "^2.17.2",
+    "markerjs2": "^2.17.0",
     "moment-business-days": "^1.2.0",
-    "phone": "^3.1.10",
+    "phone": "^3.1.9",
     "preval.macro": "^5.0.0",
     "prop-types": "^15.7.2",
     "query-string": "^7.0.1",
@@ -51,7 +51,7 @@
     "react-drag-listview": "^0.1.8",
     "react-grid-gallery": "^0.5.5",
     "react-grid-layout": "^1.3.0",
-    "react-i18next": "^11.14.3",
+    "react-i18next": "^11.14.2",
     "react-icons": "^4.3.1",
     "react-number-format": "^4.8.0",
     "react-redux": "^7.2.6",
@@ -65,24 +65,24 @@
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.1.3",
     "redux-state-sync": "^3.1.2",
-    "reselect": "^4.1.5",
+    "reselect": "^4.1.2",
-    "sass": "^1.44.0",
+    "sass": "^1.43.4",
-    "socket.io-client": "^4.4.0",
+    "socket.io-client": "^4.3.2",
     "styled-components": "^5.3.3",
     "subscriptions-transport-ws": "^0.11.0",
     "web-vitals": "^2.1.2",
-    "workbox-background-sync": "^6.4.2",
+    "workbox-background-sync": "^6.3.0",
-    "workbox-broadcast-update": "^6.4.2",
+    "workbox-broadcast-update": "^6.3.0",
-    "workbox-cacheable-response": "^6.4.2",
+    "workbox-cacheable-response": "^6.3.0",
-    "workbox-core": "^6.4.2",
+    "workbox-core": "^6.3.0",
-    "workbox-expiration": "^6.4.2",
+    "workbox-expiration": "^6.3.0",
-    "workbox-google-analytics": "^6.4.2",
+    "workbox-google-analytics": "^6.3.0",
-    "workbox-navigation-preload": "^6.4.2",
+    "workbox-navigation-preload": "^6.3.0",
-    "workbox-precaching": "^6.4.2",
+    "workbox-precaching": "^6.3.0",
-    "workbox-range-requests": "^6.4.2",
+    "workbox-range-requests": "^6.3.0",
-    "workbox-routing": "^6.4.2",
+    "workbox-routing": "^6.3.0",
-    "workbox-strategies": "^6.4.2",
+    "workbox-strategies": "^6.3.0",
-    "workbox-streams": "^6.4.2"
+    "workbox-streams": "^6.3.0"
   },
   "scripts": {
     "postinstall": "patch-package",

client/src/App/App.container.jsx

@@ -1,7 +1,4 @@
 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";
@@ -10,30 +7,13 @@ import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
-//import trackerAssist from "@openreplay/tracker-assist";
-import { getCurrentUser } from "../firebase/firebase.utils";
 import client from "../utils/GraphQLClient";
 import App from "./App";
 
+
 moment.locale("en-US");
 
-export const tracker = new Tracker({
-  projectKey: "trDmOZlEXUpjGsMtHroA",
-  ingestPoint: "https://replay.imex.online/ingest",
-  ...(process.env.NODE_ENV === null || process.env.NODE_ENV === "development"
-    ? { __DISABLE_SECURE_MODE: true }
-    : {}),
-  // beaconSize: 10485760,
-  onStart: async ({ sessionID }) => {
-    const user = await getCurrentUser();
-    if (user) tracker.setUserID(user.email);
-  },
-});
 
-// tracker.use(
-//   trackerAssist({ confirmText: "Technical support is about to assist you." })
-// ); // check the list of available options below
-export const recordGraphQL = tracker.use(trackerGraphQL());
 //tracker.start();
 if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");
 

client/src/components/error-boundary/error-boundary.component.jsx

@@ -9,7 +9,6 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import { tracker } from "../../App/App.container";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -37,7 +36,6 @@ class ErrorBoundary extends React.Component {
   componentDidCatch(error, info) {
     console.log("Exception Caught by Error Boundary.", error, info);
     this.setState({ ...this.state, error, info });
-    tracker.event("error_boundary", error, true);
   }
 
   handleErrorSubmit = () => {

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

@@ -15,6 +15,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { useHistory } from "react-router-dom";
 
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
@@ -29,7 +30,7 @@ export function JobsCloseExportButton({
 }) {
   const history = useHistory();
   const { t } = useTranslation();
-  const [updateJob] = useMutation(UPDATE_JOB, {});
+  const [updateJob] = useMutation(UPDATE_JOB);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
   const [loading, setLoading] = useState(false);
 
@@ -45,9 +46,13 @@ export function JobsCloseExportButton({
     //Check if it's a QBO Setup.
     let PartnerResponse;
     if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
-      PartnerResponse = await axios.post(`/qbo/receivables`, {
+      PartnerResponse = await axios.post(
-        jobIds: [jobId],
+        `/qbo/receivables`,
-      });
+        {
+          jobIds: [jobId],
+        },
+        
+      );
     } else {
       //Default is QBD
 
@@ -150,7 +155,6 @@ export function JobsCloseExportButton({
             date_exported: new Date(),
           },
         },
-        refetchQueries: ["QUERY_JOBS_FOR_EXPORT "],
       });
 
       if (!jobUpdateResponse.errors) {

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

@@ -28,9 +28,7 @@ export function JobsExportAllButton({
   completedCallback,
 }) {
   const { t } = useTranslation();
-  const [updateJob] = useMutation(UPDATE_JOBS, {
+  const [updateJob] = useMutation(UPDATE_JOBS);
-    refetchQueries: ["QUERY_JOBS_FOR_EXPORT "],
-  });
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
 
   const [loading, setLoading] = useState(false);

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

@@ -29,9 +29,7 @@ export function PayableExportAll({
   completedCallback,
 }) {
   const { t } = useTranslation();
-  const [updateBill] = useMutation(UPDATE_BILLS, {
+  const [updateBill] = useMutation(UPDATE_BILLS);
-    refetchQueries: ["QUERY_BILLS_FOR_EXPORT "],
-  });
   const [loading, setLoading] = useState(false);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
 

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

@@ -28,9 +28,7 @@ export function PayableExportButton({
   setSelectedBills,
 }) {
   const { t } = useTranslation();
-  const [updateBill] = useMutation(UPDATE_BILLS, {
+  const [updateBill] = useMutation(UPDATE_BILLS);
-    refetchQueries: ["QUERY_BILLS_FOR_EXPORT "],
-  });
   const [loading, setLoading] = useState(false);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
 

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

@@ -28,9 +28,7 @@ export function PaymentExportButton({
   setSelectedPayments,
 }) {
   const { t } = useTranslation();
-  const [updatePayment] = useMutation(UPDATE_PAYMENTS, {
+  const [updatePayment] = useMutation(UPDATE_PAYMENTS);
-    refetchQueries: ["QUERY_PAYMENTS_FOR_EXPORT "],
-  });
   const [loading, setLoading] = useState(false);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
 

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

@@ -27,9 +27,7 @@ export function PaymentsExportAllButton({
   completedCallback,
 }) {
   const { t } = useTranslation();
-  const [updatePayments] = useMutation(UPDATE_PAYMENTS, {
+  const [updatePayments] = useMutation(UPDATE_PAYMENTS);
-    refetchQueries: ["QUERY_PAYMENTS_FOR_EXPORT "],
-  });
   const [loading, setLoading] = useState(false);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
 

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

@@ -1,7 +1,6 @@
 import Fingerprint2 from "@fingerprintjs/fingerprintjs";
 import * as Sentry from "@sentry/browser";
 import { notification } from "antd";
-import { auth, analytics, firestore } from "../../firebase/firebase.utils";
 import { setUserId, setUserProperties } from "firebase/analytics";
 import {
   checkActionCode,
@@ -13,8 +12,11 @@ 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 { factory, tracker } from "../../App/App.container";
+import { factory } from "../../App/App.container";
 import {
+  analytics,
+  auth,
+  firestore,
   getCurrentUser,
   logImEXEvent,
   updateCurrentUser,
@@ -75,7 +77,7 @@ export function* isUserAuthenticated() {
     }
 
     LogRocket.identify(user.email);
-    tracker.setUserID(user.email);
+
     yield put(
       signInSuccess({
         uid: user.uid,
@@ -174,7 +176,6 @@ export function* onSignInSuccess() {
 
 export function* signInSuccessSaga({ payload }) {
   LogRocket.identify(payload.email);
-  tracker.setUserID(payload.email);
 
   try {
     // window.$crisp.push(["set", "user:email", [payload.email]]);

server/data/autohouse.js

@@ -74,7 +74,7 @@ exports.default = async (req, res) => {
             {
               version: "1.0",
               encoding: "UTF-8",
-              keepNullNodes: true,
+              //keepNullNodes: true,
             },
             autoHouseObject
           )
@@ -110,7 +110,8 @@ exports.default = async (req, res) => {
         });
       }
     }
-
+    res.json(allxmlsToUpload);
+    return;
     if (process.env.NODE_ENV !== "production") {
       res.sendStatus(200);
       return;
@@ -184,31 +185,31 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         }${job.est_ct_fn ? job.est_ct_fn : ""}`,
       },
       CustomerInformation: {
-        FirstName: job.ownr_fn,
+        FirstName: job.ownr_fn || "",
-        LastName: job.ownr_ln,
+        LastName: job.ownr_ln || "",
-        Street: job.ownr_addr1,
+        Street: job.ownr_addr1 || "",
-        City: job.ownr_city,
+        City: job.ownr_city || "",
-        State: job.ownr_st,
+        State: job.ownr_st || "",
-        Zip: job.ownr_zip,
+        Zip: job.ownr_zip || "",
-        Phone1: job.ownr_ph1,
+        Phone1: job.ownr_ph1 || "",
         Phone2: null,
         Phone2Extension: null,
         Phone3: null,
         Phone3Extension: null,
         FileComments: null,
         Source: null,
-        Email: job.ownr_ea,
+        Email: job.ownr_ea || "",
         RetWhsl: null,
         Cat: null,
         InsuredorClaimantFlag: null,
       },
       VehicleInformation: {
-        Year: job.v_model_yr,
+        Year: job.v_model_yr || "",
-        Make: job.v_make_desc,
+        Make: job.v_make_desc || "",
-        Model: job.v_model_desc,
+        Model: job.v_model_desc || "",
-        VIN: job.v_vin,
+        VIN: job.v_vin || "",
         License: job.plate_no,
-        MileageIn: job.kmin,
+        MileageIn: job.kmin || 0,
         Vehiclecolor: job.v_color,
         VehicleProductionDate: null,
         VehiclePaintCode: null,
@@ -218,18 +219,18 @@ const CreateRepairOrderTag = (job, errorCallback) => {
       },
 
       InsuranceInformation: {
-        InsuranceCo: job.ins_co_nm,
+        InsuranceCo: job.ins_co_nm || "",
-        CompanyName: job.ins_co_nm,
+        CompanyName: job.ins_co_nm || "",
-        Address: job.ins_addr1,
+        Address: job.ins_addr1 || "",
-        City: job.ins_addr1,
+        City: job.ins_addr1 || "",
-        State: job.ins_city,
+        State: job.ins_city || "",
-        Zip: job.ins_zip,
+        Zip: job.ins_zip || "",
-        Phone: job.ins_ph1,
+        Phone: job.ins_ph1 || "",
-        Fax: null,
+        Fax: job.ins_fax || "",
         ClaimType: null,
-        LossType: null,
+        LossType: job.loss_type || "",
-        Policy: null,
+        Policy: job.policy_no || "",
-        Claim: job.clm_no,
+        Claim: job.clm_no || "",
         InsuredLastName: null,
         InsuredFirstName: null,
         ClaimantLastName: null,
@@ -242,23 +243,28 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         OutsideAdjuster: null,
       },
       Dates: {
-        DateofLoss: job.loss_date && moment(job.loss_date).format(AhDateFormat),
+        DateofLoss:
+          (job.loss_date && moment(job.loss_date).format(AhDateFormat)) || "",
         InitialCustomerContactDate: null,
         FirstFollowUpDate: null,
         ReferralDate: null,
         EstimateAppointmentDate: null,
         SecondFollowUpDate: null,
         AssignedDate:
-          job.asgn_date && moment(job.asgn_date).format(AhDateFormat),
+          (job.asgn_date && moment(job.asgn_date).format(AhDateFormat)) || "",
         EstComplete: null,
         CustomerAuthorizationDate: null,
         InsuranceAuthorizationDate: null,
-        DateOpened: job.date_open && moment(job.date_open).format(AhDateFormat),
+        DateOpened:
+          (job.date_open && moment(job.date_open).format(AhDateFormat)) || "",
         ScheduledArrivalDate:
-          job.scheduled_in && moment(job.scheduled_in).format(AhDateFormat),
+          (job.scheduled_in && moment(job.scheduled_in).format(AhDateFormat)) ||
-        CarinShop: job.actual_in && moment(job.actual_in).format(AhDateFormat),
+          "",
+        CarinShop:
+          (job.actual_in && moment(job.actual_in).format(AhDateFormat)) || "",
         InsInspDate: null,
-        StartDate: job.actual_in && moment(job.actual_in).format(AhDateFormat),
+        StartDate:
+          (job.actual_in && moment(job.actual_in).format(AhDateFormat)) || "",
         PartsOrder: null,
         TeardownHold: null,
         SupplementSubmittedDate: null,
@@ -268,22 +274,28 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         AssntoPaint: null,
         AssntoDetail: null,
         PromiseDate:
-          job.scheduled_completion &&
+          (job.scheduled_completion &&
-          moment(job.scheduled_completion).format(AhDateFormat),
+            moment(job.scheduled_completion).format(AhDateFormat)) ||
-        InsuranceTargetOut: null,
+          "",
+        //InsuranceTargetOut: null,
         CarComplete:
-          job.actual_completion &&
+          (job.actual_completion &&
-          moment(job.actual_completion).format(AhDateFormat),
+            moment(job.actual_completion).format(AhDateFormat)) ||
+          "",
         DeliveryAppointmentDate:
-          job.scheduled_delivery &&
+          (job.scheduled_delivery &&
-          moment(job.scheduled_delivery).format(AhDateFormat),
+            moment(job.scheduled_delivery).format(AhDateFormat)) ||
+          "",
         DateClosed:
-          job.date_invoiced && moment(job.date_invoiced).format(AhDateFormat),
+          (job.date_invoiced &&
+            moment(job.date_invoiced).format(AhDateFormat)) ||
+          "",
         CustomerPaidInFullDate: null,
         InsurancePaidInFullDate: null,
         CustPickup:
-          job.actual_delivery &&
+          (job.actual_delivery &&
-          moment(job.actual_delivery).format(AhDateFormat),
+            moment(job.actual_delivery).format(AhDateFormat)) ||
+          "",
         AccountPostedDate:
           job.date_exported && moment(job.date_exported).format(AhDateFormat),
         CSIProcessedDate: null,
@@ -291,85 +303,86 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         AdditionalFollowUpDate: null,
       },
       Rates: {
-        BodyRate: job.rate_lab,
+        BodyRate: job.rate_lab || 0,
-        RefinishRate: job.rate_lar,
+        RefinishRate: job.rate_lar || 0,
-        MechanicalRate: job.rate_lam,
+        MechanicalRate: job.rate_lam || 0,
-        StructuralRate: job.rate_las,
+        StructuralRate: job.rate_las || 0,
-        PMRate: job.rate_mapa,
+        PMRate: job.rate_mapa || 0,
-        BMRate: job.rate_mash,
+        BMRate: job.rate_mash || 0,
         TaxRate:
-          job.parts_tax_rates &&
+          (job.parts_tax_rates &&
-          job.parts_tax_rates.PAN &&
+            job.parts_tax_rates.PAN &&
-          job.parts_tax_rates.PAN.prt_tax_rt,
+            job.parts_tax_rates.PAN.prt_tax_rt) ||
-        StorageRateperDay: null,
+          0,
-        DaysStored: null,
+        StorageRateperDay: 0,
-      },
+        DaysStored: 0,
-      EstimateTotals: {
-        BodyHours: null,
-        RefinishHours: null,
-        MechanicalHours: null,
-        StructuralHours: null,
-        PartsTotal: null,
-        PartsOEM: null,
-        PartsAM: null,
-        PartsReconditioned: null,
-        PartsRecycled: null,
-        PartsOther: null,
-        SubletTotal: null,
-        BodyLaborTotal: null,
-        RefinishLaborTotal: null,
-        MechanicalLaborTotal: null,
-        StructuralLaborTotal: null,
-        MiscellaneousChargeTotal: null,
-        PMTotal: null,
-        BMTotal: null,
-        MiscTotal: null,
-        TowingTotal: null,
-        StorageTotal: null,
-        DetailTotal: null,
-        SalesTaxTotal: null,
-        GrossTotal: null,
-        DeductibleTotal: null,
-        DepreciationTotal: null,
-        Discount: null,
-        CustomerPay: null,
-        InsurancePay: null,
-        Deposit: null,
-        AmountDue: null,
-      },
-      SupplementTotals: {
-        BodyHours: null,
-        RefinishHours: null,
-        MechanicalHours: null,
-        StructuralHours: null,
-        PartsTotal: null,
-        PartsOEM: null,
-        PartsAM: null,
-        PartsReconditioned: null,
-        PartsRecycled: null,
-        PartsOther: null,
-        SubletTotal: null,
-        BodyLaborTotal: null,
-        RefinishLaborTotal: null,
-        MechanicalLaborTotal: null,
-        StructuralLaborTotal: null,
-        MiscellaneousChargeTotal: null,
-        PMTotal: null,
-        BMTotal: null,
-        MiscTotal: null,
-        TowingTotal: null,
-        StorageTotal: null,
-        DetailTotal: null,
-        SalesTaxTotal: null,
-        GrossTotal: null,
-        DeductibleTotal: null,
-        DepreciationTotal: null,
-        Discount: null,
-        CustomerPay: null,
-        InsurancePay: null,
-        Deposit: null,
-        AmountDue: null,
       },
+      // EstimateTotals: {
+      //   BodyHours: null,
+      //   RefinishHours: null,
+      //   MechanicalHours: null,
+      //   StructuralHours: null,
+      //   PartsTotal: null,
+      //   PartsOEM: null,
+      //   PartsAM: null,
+      //   PartsReconditioned: null,
+      //   PartsRecycled: null,
+      //   PartsOther: null,
+      //   SubletTotal: null,
+      //   BodyLaborTotal: null,
+      //   RefinishLaborTotal: null,
+      //   MechanicalLaborTotal: null,
+      //   StructuralLaborTotal: null,
+      //   MiscellaneousChargeTotal: null,
+      //   PMTotal: null,
+      //   BMTotal: null,
+      //   MiscTotal: null,
+      //   TowingTotal: null,
+      //   StorageTotal: null,
+      //   DetailTotal: null,
+      //   SalesTaxTotal: null,
+      //   GrossTotal: null,
+      //   DeductibleTotal: null,
+      //   DepreciationTotal: null,
+      //   Discount: null,
+      //   CustomerPay: null,
+      //   InsurancePay: null,
+      //   Deposit: null,
+      //   AmountDue: null,
+      // },
+      // SupplementTotals: {
+      //   BodyHours: null,
+      //   RefinishHours: null,
+      //   MechanicalHours: null,
+      //   StructuralHours: null,
+      //   PartsTotal: null,
+      //   PartsOEM: null,
+      //   PartsAM: null,
+      //   PartsReconditioned: null,
+      //   PartsRecycled: null,
+      //   PartsOther: null,
+      //   SubletTotal: null,
+      //   BodyLaborTotal: null,
+      //   RefinishLaborTotal: null,
+      //   MechanicalLaborTotal: null,
+      //   StructuralLaborTotal: null,
+      //   MiscellaneousChargeTotal: null,
+      //   PMTotal: null,
+      //   BMTotal: null,
+      //   MiscTotal: null,
+      //   TowingTotal: null,
+      //   StorageTotal: null,
+      //   DetailTotal: null,
+      //   SalesTaxTotal: null,
+      //   GrossTotal: null,
+      //   DeductibleTotal: null,
+      //   DepreciationTotal: null,
+      //   Discount: null,
+      //   CustomerPay: null,
+      //   InsurancePay: null,
+      //   Deposit: null,
+      //   AmountDue: null,
+      // },
       RevisedTotals: {
         BodyHours: job.job_totals.rates.lab.hours,
         BodyRepairHours: job.joblines
@@ -441,8 +454,8 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         ),
         StructuralLaborTotalCost:
           repairCosts.StructuralLaborTotalCost.toFormat(AHDineroFormat),
-        MiscellaneousChargeTotal: null,
+        MiscellaneousChargeTotal: 0,
-        MiscellaneousChargeTotalCost: null,
+        MiscellaneousChargeTotalCost: 0,
         PMTotal: Dinero(job.job_totals.rates.mapa.total).toFormat(
           AHDineroFormat
         ),
@@ -461,17 +474,17 @@ const CreateRepairOrderTag = (job, errorCallback) => {
           AHDineroFormat
         ),
         StorageTotalCost: repairCosts.StorageTotalCost.toFormat(AHDineroFormat),
-        DetailTotal: null,
+        DetailTotal: 0,
-        DetailTotalCost: null,
+        DetailTotalCost: 0,
         SalesTaxTotal: Dinero(job.job_totals.totals.local_tax)
           .add(Dinero(job.job_totals.totals.state_tax))
           .add(Dinero(job.job_totals.totals.federal_tax))
           .toFormat(AHDineroFormat),
-        SalesTaxTotalCost: null,
+        SalesTaxTotalCost: 0,
         GrossTotal: Dinero(job.job_totals.totals.net_repairs).toFormat(
           AHDineroFormat
         ),
-        DeductibleTotal: job.ded_amt,
+        DeductibleTotal: job.ded_amt || 0,
         DepreciationTotal: Dinero(
           job.job_totals.totals.custPayable.dep_taxes
         ).toFormat(AHDineroFormat),
@@ -496,8 +509,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         InsScreenCommentsLine2: null,
         AssignmentCaller: null,
         AssignmentDivision: null,
-        LocationofPrimaryImpact: "12",
+        LocationofPrimaryImpact:
-        LocationofSecondaryImpact: null,
+          (job.area_of_damage && job.area_of_damage.impact1) || 0,
+        LocationofSecondaryImpact:
+          (job.area_of_damage && job.area_of_damage.impact2) || 0,
         PaintTechID: null,
         PaintTechName: null,
         ImportType: null,
@@ -517,7 +532,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         RentalDueDate: null,
         RentalActRetDate: null,
         RentalCompanyID: null,
-        CSIID: null,
+        // CSIID: null,
         InsGroupCode: null,
       },
 
@@ -669,36 +684,39 @@ const GenerateDetailLines = (line, statuses) => {
   const ret = {
     BackOrdered: line.status === statuses.default_bo ? "1" : "0",
     Cost:
-      line.billlines[0] &&
+      (line.billlines[0] &&
-      (line.billlines[0].actual_cost * line.billlines[0].quantity).toFixed(2),
+        (line.billlines[0].actual_cost * line.billlines[0].quantity).toFixed(
-    Critical: null,
+          2
-    Description: line.line_desc,
+        )) ||
-    DiscountMarkup: null,
+      0,
+    //Critical: null,
+    Description: line.line_desc || "",
+    DiscountMarkup: line.prt_dsmk_m || "",
     InvoiceNumber: line.billlines[0] && line.billlines[0].bill.invoice_number,
-    IOUPart: null,
+    IOUPart: 0,
-    LineNumber: line.line_no,
+    LineNumber: line.line_no || 0,
     MarkUp: null,
     OrderedOn: null,
     OriginalCost: null,
     OriginalInvoiceNumber: null,
-    PriceEach: line.billlines[0] && line.billlines[0].actual_cost,
+    PriceEach: (line.billlines[0] && line.billlines[0].actual_cost) || 0,
     PartNumber: _.escape(line.oem_partno),
     ProfitPercent: null,
     PurchaseOrderNumber: null,
-    Qty: line.part_qty,
+    Qty: line.part_qty || 0,
-    Status: line.status,
+    Status: line.status || "",
-    SupplementNumber: null,
+    SupplementNumber: line.line_ind || "",
-    Type: line.part_type,
+    Type: line.part_type || "",
-    Vendor: line.billlines[0] && line.billlines[0].bill.vendor.name,
+    Vendor: (line.billlines[0] && line.billlines[0].bill.vendor.name) || "",
     VendorPaid: null,
-    VendorPrice: line.billlines[0] && line.billlines[0].actual_price,
+    VendorPrice: (line.billlines[0] && line.billlines[0].actual_price) || 0,
     Deleted: null,
     ExpectedOn: null,
     ReceivedOn: null,
     OrderedBy: null,
     ShipVia: null,
     VendorContact: null,
-    EstimateAmount: line.act_price,
+    EstimateAmount: line.act_price || 0,
   };
   return ret;
 };
@@ -709,9 +727,9 @@ const generateNullDetailLine = () => {
     Cost: 0,
     Critical: null,
     Description: "No Lines on Estimate",
-    DiscountMarkup: null,
+    DiscountMarkup: 0,
     InvoiceNumber: null,
-    IOUPart: null,
+    IOUPart: 0,
     LineNumber: 0,
     MarkUp: null,
     OrderedOn: null,
@@ -722,12 +740,12 @@ const generateNullDetailLine = () => {
     ProfitPercent: null,
     PurchaseOrderNumber: null,
     Qty: 0,
-    Status: null,
+    Status: "",
-    SupplementNumber: null,
+    SupplementNumber: 0,
-    Type: null,
+    Type: "",
-    Vendor: null,
+    Vendor: "",
     VendorPaid: null,
-    VendorPrice: null,
+    VendorPrice: 0,
     Deleted: null,
     ExpectedOn: null,
     ReceivedOn: null,

server/graphql-client/queries.js

@@ -525,7 +525,7 @@ exports.QUERY_EMPLOYEE_PIN = `query QUERY_EMPLOYEE_PIN($shopId: uuid!, $employee
 }`;
 
 exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshopid: uuid!) {
-  jobs(where: {_and: [{converted :{_eq: true}},{updated_at: {_gt: $start}}, {shopid: {_eq: $bodyshopid}}]}) {
+  jobs(where: {_and: [{converted: {_eq: true}}, {updated_at: {_gt: $start}}, {shopid: {_eq: $bodyshopid}}]}, limit: 50) {
     id
     ro_number
     status
@@ -533,6 +533,7 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
     est_ct_ln
     ownr_zip
     referral_source
+    loss_type
     v_model_yr
     v_model_desc
     v_make_desc
@@ -607,6 +608,7 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
     joblines(where: {removed: {_eq: false}}) {
       id
       line_no
+      line_ind
       status
       line_ind
       db_price
@@ -676,6 +678,7 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
   }
 }
 
+
 `;
 
 exports.ENTEGRAL_EXPORT = `