Respect default import status on new creation.

Release/2023 09 01

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

@@ -401,7 +401,7 @@ export function JobLinesComponent({
       const markedTypes = [e.key];
       if (e.key === "PAN") markedTypes.push("PAP");
       if (e.key === "PAS") markedTypes.push("PASL");
-      setSelectedLines(
+      setSelectedLines((selectedLines) =>
         _.uniq([
           ...selectedLines,
           ...jobLines.filter((item) => markedTypes.includes(item.part_type)),
@@ -614,8 +614,17 @@ export function JobLinesComponent({
           onSelectAll: (selected, selectedRows, changeRows) => {
             setSelectedLines(selectedRows);
           },
-          onSelect: (record, selected, selectedRows, nativeEvent) =>
-            setSelectedLines(selectedRows),
+          onSelect: (record, selected, selectedRows, nativeEvent) => {
+            if (selected) {
+              setSelectedLines((selectedLines) =>
+                _.uniqBy([...selectedLines, record], "id")
+              );
+            } else {
+              setSelectedLines((selectedLines) =>
+                selectedLines.filter((l) => l.id !== record.id)
+              );
+            }
+          },
         }}
       />
     </div>

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

@@ -3,7 +3,7 @@ import {
   useApolloClient,
   useLazyQuery,
   useMutation,
-  useQuery
+  useQuery,
 } from "@apollo/client";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import { Col, notification, Row } from "antd";
@@ -20,7 +20,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   DELETE_AVAILABLE_JOB,
   QUERY_AVAILABLE_JOBS,
-  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK
+  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK,
 } from "../../graphql/available-jobs.queries";
 import { INSERT_NEW_JOB, UPDATE_JOB } from "../../graphql/jobs.queries";
 import { INSERT_NEW_NOTE } from "../../graphql/notes.queries";
@@ -28,7 +28,7 @@ import { SEARCH_VEHICLE_BY_VIN } from "../../graphql/vehicles.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
-  selectCurrentUser
+  selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import confirmDialog from "../../utils/asyncConfirm";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
@@ -135,6 +135,7 @@ export function JobsAvailableContainer({
       owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
       job_totals: newTotals,
       date_open: moment(),
+      status: bodyshop.md_ro_statuses.default_imported,
       notes: {
         data: {
           created_by: currentUser.email,

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

@@ -13,12 +13,26 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
 
+function updateJobCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      jobs(existingJobs = []) {
+        return existingJobs.filter(
+          (jobRef) => jobRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function JobsCloseExportButton({
   bodyshop,
   currentUser,
@@ -100,6 +114,9 @@ export function JobsCloseExportButton({
 
     //Check to see if any of them failed. If they didn't don't execute the update.
     const failedTransactions = PartnerResponse.data.filter((r) => !r.success);
+    const successfulTransactions = PartnerResponse.data.filter(
+      (r) => r.success
+    );
     if (failedTransactions.length > 0) {
       //Uh oh. At least one was no good.
       failedTransactions.forEach((ft) => {
@@ -158,12 +175,15 @@ export function JobsCloseExportButton({
           },
         });
 
-        if (!jobUpdateResponse.errors) {
+        if (!!!jobUpdateResponse.errors) {
           notification.open({
             type: "success",
             key: "jobsuccessexport",
             message: t("jobs.successes.exported"),
           });
+          updateJobCache(
+            jobUpdateResponse.data.update_jobs.returning.map((job) => job.id)
+          );
         } else {
           notification["error"]({
             message: t("jobs.errors.exporting", {
@@ -178,6 +198,18 @@ export function JobsCloseExportButton({
           key: "jobsuccessexport",
           message: t("jobs.successes.exported"),
         });
+        updateJobCache([
+          ...new Set(
+            successfulTransactions.map(
+              (st) =>
+                st[
+                  bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                    ? "jobid"
+                    : "id"
+                ]
+            )
+          ),
+        ]);
       }
       if (setSelectedJobs) {
         setSelectedJobs((selectedJobs) => {
@@ -185,7 +217,6 @@ export function JobsCloseExportButton({
         });
       }
     }
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
     setLoading(false);
   };
 

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

@@ -13,12 +13,26 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
 
+function updateJobCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      jobs(existingJobs = []) {
+        return existingJobs.filter(
+          (jobRef) => jobRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function JobsExportAllButton({
   bodyshop,
   currentUser,
@@ -96,7 +110,9 @@ export function JobsExportAllButton({
       Object.keys(groupedData).map(async (key) => {
         //Check to see if any of them failed. If they didn't don't execute the update.
         const failedTransactions = groupedData[key].filter((r) => !r.success);
-
+        const successfulTransactions = groupedData[key].filter(
+          (r) => r.success
+        );
         if (failedTransactions.length > 0) {
           //Uh oh. At least one was no good.
           failedTransactions.forEach((ft) => {
@@ -155,12 +171,17 @@ export function JobsExportAllButton({
               },
             });
 
-            if (!jobUpdateResponse.errors) {
+            if (!!!jobUpdateResponse.errors) {
               notification.open({
                 type: "success",
                 key: "jobsuccessexport",
                 message: t("jobs.successes.exported"),
               });
+              updateJobCache(
+                jobUpdateResponse.data.update_jobs.returning.map(
+                  (job) => job.id
+                )
+              );
             } else {
               notification["error"]({
                 message: t("jobs.errors.exporting", {
@@ -175,6 +196,18 @@ export function JobsExportAllButton({
               key: "jobsuccessexport",
               message: t("jobs.successes.exported"),
             });
+            updateJobCache([
+              ...new Set(
+                successfulTransactions.map(
+                  (st) =>
+                    st[
+                      bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                        ? "jobid"
+                        : "id"
+                    ]
+                )
+              ),
+            ]);
           }
         }
       })
@@ -182,7 +215,6 @@ export function JobsExportAllButton({
 
     if (!!completedCallback) completedCallback([]);
     if (!!loadingCallback) loadingCallback(false);
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
     setLoading(false);
   };
 

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

@@ -14,12 +14,26 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
 
+function updateBillCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      bills(existingJobs = []) {
+        return existingJobs.filter(
+          (billRef) => billRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function PayableExportAll({
   bodyshop,
   currentUser,
@@ -96,7 +110,9 @@ export function PayableExportAll({
       proms.push(
         (async () => {
           const failedTransactions = groupedData[key].filter((r) => !r.success);
-
+          const successfulTransactions = groupedData[key].filter(
+            (r) => r.success
+          );
           if (failedTransactions.length > 0) {
             //Uh oh. At least one was no good.
             failedTransactions.map((ft) =>
@@ -142,7 +158,15 @@ export function PayableExportAll({
 
               const billUpdateResponse = await updateBill({
                 variables: {
-                  billIdList: [key],
+                  billIdList: successfulTransactions.map(
+                    (st) =>
+                      st[
+                        bodyshop.accountingconfig &&
+                        bodyshop.accountingconfig.qbo
+                          ? "billid"
+                          : "id"
+                      ]
+                  ),
                   bill: {
                     exported: true,
                     exported_at: new Date(),
@@ -155,6 +179,11 @@ export function PayableExportAll({
                   key: "billsuccessexport",
                   message: t("bills.successes.exported"),
                 });
+                updateBillCache(
+                  billUpdateResponse.data.update_bills.returning.map(
+                    (bill) => bill.id
+                  )
+                );
               } else {
                 notification["error"]({
                   message: t("bills.errors.exporting", {
@@ -169,6 +198,19 @@ export function PayableExportAll({
                 key: "billsuccessexport",
                 message: t("bills.successes.exported"),
               });
+              updateBillCache([
+                ...new Set(
+                  successfulTransactions.map(
+                    (st) =>
+                      st[
+                        bodyshop.accountingconfig &&
+                        bodyshop.accountingconfig.qbo
+                          ? "billid"
+                          : "id"
+                      ]
+                  )
+                ),
+              ]);
             }
           }
         })()
@@ -178,7 +220,6 @@ export function PayableExportAll({
     await Promise.all(proms);
     if (!!completedCallback) completedCallback([]);
     if (!!loadingCallback) loadingCallback(false);
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
     setLoading(false);
   };
 

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

@@ -13,12 +13,26 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
 
+function updateBillCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      bills(existingJobs = []) {
+        return existingJobs.filter(
+          (billRef) => billRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function PayableExportButton({
   bodyshop,
   currentUser,
@@ -158,6 +172,11 @@ export function PayableExportButton({
             key: "billsuccessexport",
             message: t("bills.successes.exported"),
           });
+          updateBillCache(
+            billUpdateResponse.data.update_bills.returning.map(
+              (bill) => bill.id
+            )
+          );
         } else {
           notification["error"]({
             message: t("bills.errors.exporting", {
@@ -172,6 +191,18 @@ export function PayableExportButton({
           key: "billsuccessexport",
           message: t("bills.successes.exported"),
         });
+        updateBillCache([
+          ...new Set(
+            successfulTransactions.map(
+              (st) =>
+                st[
+                  bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                    ? "billid"
+                    : "id"
+                ]
+            )
+          ),
+        ]);
       }
 
       if (setSelectedBills) {
@@ -182,7 +213,6 @@ export function PayableExportButton({
     }
 
     if (!!loadingCallback) loadingCallback(false);
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
     setLoading(false);
   };
 

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

@@ -13,12 +13,26 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
 
+function updatePaymentCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      payments(existingJobs = []) {
+        return existingJobs.filter(
+          (paymentRef) => paymentRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function PaymentExportButton({
   bodyshop,
   currentUser,
@@ -157,6 +171,11 @@ export function PaymentExportButton({
             key: "paymentsuccessexport",
             message: t("payments.successes.exported"),
           });
+          updatePaymentCache(
+            paymentUpdateResponse.data.update_payments.returning.map(
+              (payment) => payment.id
+            )
+          );
         } else {
           notification["error"]({
             message: t("payments.errors.exporting", {
@@ -178,9 +197,20 @@ export function PaymentExportButton({
         key: "paymentsuccessexport",
         message: t("payments.successes.exported"),
       });
+      updatePaymentCache([
+        ...new Set(
+          successfulTransactions.map(
+            (st) =>
+              st[
+                bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                  ? "paymentid"
+                  : "id"
+              ]
+          )
+        ),
+      ]);
     }
     if (!!loadingCallback) loadingCallback(false);
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
     setLoading(false);
   };
 

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

@@ -13,11 +13,25 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
 
+function updatePaymentCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      payments(existingJobs = []) {
+        return existingJobs.filter(
+          (paymentRef) => paymentRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function PaymentsExportAllButton({
   bodyshop,
   currentUser,
@@ -84,7 +98,9 @@ export function PaymentsExportAllButton({
       proms.push(
         (async () => {
           const failedTransactions = groupedData[key].filter((r) => !r.success);
-
+          const successfulTransactions = groupedData[key].filter(
+            (r) => r.success
+          );
           if (failedTransactions.length > 0) {
             //Uh oh. At least one was no good.
             failedTransactions.map((ft) =>
@@ -130,7 +146,15 @@ export function PaymentsExportAllButton({
               });
               const paymentUpdateResponse = await updatePayments({
                 variables: {
-                  paymentIdList: [key],
+                  paymentIdList: successfulTransactions.map(
+                    (st) =>
+                      st[
+                        bodyshop.accountingconfig &&
+                        bodyshop.accountingconfig.qbo
+                          ? "paymentid"
+                          : "id"
+                      ]
+                  ),
                   payment: {
                     exportedat: new Date(),
                   },
@@ -142,6 +166,11 @@ export function PaymentsExportAllButton({
                   key: "paymentsuccessexport",
                   message: t("payments.successes.exported"),
                 });
+                updatePaymentCache(
+                  paymentUpdateResponse.data.update_payments.returning.map(
+                    (payment) => payment.id
+                  )
+                );
               } else {
                 notification["error"]({
                   message: t("payments.errors.exporting", {
@@ -156,6 +185,19 @@ export function PaymentsExportAllButton({
                 key: "paymentsuccessexport",
                 message: t("payments.successes.exported"),
               });
+              updatePaymentCache([
+                ...new Set(
+                  successfulTransactions.map(
+                    (st) =>
+                      st[
+                        bodyshop.accountingconfig &&
+                        bodyshop.accountingconfig.qbo
+                          ? "paymentid"
+                          : "id"
+                      ]
+                  )
+                ),
+              ]);
             }
           }
         })()
@@ -164,7 +206,6 @@ export function PaymentsExportAllButton({
     await Promise.all(proms);
     if (!!completedCallback) completedCallback([]);
     if (!!loadingCallback) loadingCallback(false);
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
     setLoading(false);
   };
 

client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx

@@ -2,6 +2,7 @@ import { useMutation } from "@apollo/client";
 import { Button, Card, Form, notification, Space } from "antd";
 import axios from "axios";
 import moment from "moment";
+import momenttz from "moment-timezone";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -49,14 +50,20 @@ export function TechClockInContainer({
   const handleFinish = async (values) => {
     setLoading(true);
     const theTime = (await axios.post("/utils/time")).data;
-
     const result = await insertTimeTicket({
       variables: {
         timeTicketInput: [
           {
             bodyshopid: bodyshop.id,
             employeeid: technician.id,
-            date: moment(theTime).format("YYYY-MM-DD"),
+            date:
+              typeof bodyshop.timezone === "string"
+                ? momenttz.tz(theTime, bodyshop.timezone).format("YYYY-MM-DD")
+                : typeof bodyshop.timezone === "number"
+                ? moment(theTime)
+                    .format("YYYY-MM-DD")
+                    .utcOffset(bodyshop.timezone)
+                : moment(theTime).format("YYYY-MM-DD"),
             clockon: moment(theTime),
             jobid: values.jobid,
             cost_center: values.cost_center,

client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx

@@ -2,6 +2,7 @@ import { useMutation } from "@apollo/client";
 import { Button, Form, Space, notification } from "antd";
 import axios from "axios";
 import moment from "moment";
+import momenttz from "moment-timezone";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -68,7 +69,14 @@ export function TimeTicektShiftContainer({
               employeeid: isTechConsole ? technician.id : employeeId,
               cost_center: "timetickets.labels.shift",
               clockon: theTime,
-              date: theTime,
+              date:
+                typeof bodyshop.timezone === "string"
+                  ? momenttz.tz(theTime, bodyshop.timezone).format("YYYY-MM-DD")
+                  : typeof bodyshop.timezone === "number"
+                  ? moment(theTime)
+                      .utcOffset(bodyshop.timezone)
+                      .format("YYYY-MM-DD")
+                  : moment(theTime).format("YYYY-MM-DD"),
               memo: values.memo,
               created_by: isTechConsole
                 ? currentUser.email.concat(

client/src/translations/en_us/common.json

@@ -490,7 +490,7 @@
 					"lam": "Mechanical",
 					"lar": "Refinish",
 					"las": "Structural",
-					"lau": "Detail",
+					"lau": "User Defined",
 					"local_tax": "Local Tax",
 					"mapa": "Paint Materials",
 					"mash": "Shop Materials",

hasura/migrations/1693249238670_alter_table_public_jobs_add_column_cieca_pfl/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 "cieca_pfl" jsonb
+--  null default jsonb_build_object();

hasura/migrations/1693249238670_alter_table_public_jobs_add_column_cieca_pfl/up.sql

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

server.js

@@ -42,13 +42,13 @@ const io = new Server(server, {
 });
 exports.io = io;
 require("./server/web-sockets/web-socket");
-
-//app.use(fb.validateFirebaseIdToken);
+// app.set('trust proxy', true)
+// app.use(fb.validateFirebaseIdToken);
 app.use(compression());
 app.use(cookieParser());
 app.use(bodyParser.json({ limit: "50mb" }));
 app.use(bodyParser.urlencoded({ limit: "50mb", extended: true }));
-//app.use(enforce.HTTPS({ trustProtoHeader: true }));
+// app.use(enforce.HTTPS({ trustProtoHeader: true }));
 app.use(
   cors({ credentials: true, exposedHeaders: ["set-cookie"] })
   // cors({
@@ -71,10 +71,17 @@ app.get("/test", async function (req, res) {
   const commit = require("child_process").execSync(
     "git rev-parse --short HEAD"
   );
+  // console.log(app.get('trust proxy'));
+  // console.log("remoteAddress", req.socket.remoteAddress);
+  // console.log("X-Forwarded-For", req.header('x-forwarded-for'));
   logger.log("test-api-status", "DEBUG", "api", { commit });
+  // sendEmail.sendServerEmail({
+  //   subject: `API Check - ${process.env.NODE_ENV}`,
+  //   text: `Server API check has come in. Remote IP: ${req.socket.remoteAddress}, X-Forwarded-For: ${req.header('x-forwarded-for')}`,
+  // });
   sendEmail.sendServerEmail({
     subject: `API Check - ${process.env.NODE_ENV}`,
-    text: `Server API check has come in.    `,
+    text: `Server API check has come in.`,
   });
   res.status(200).send(`OK - ${commit}`);
 });

server/data/claimscorp.js

@@ -17,7 +17,7 @@ let Client = require("ssh2-sftp-client");
 const client = require("../graphql-client/graphql-client").client;
 const { sendServerEmail } = require("../email/sendemail");
 const CCDineroFormat = "0,0.00";
-const AhDateFormat = "MM/DD/YYYY";
+const AhDateFormat = "MMDDYYYY";
 
 const repairOpCodes = ["OP4", "OP9", "OP10"];
 const replaceOpCodes = ["OP2", "OP5", "OP11", "OP12"];
@@ -62,24 +62,22 @@ exports.default = async (req, res) => {
             start: start
               ? moment(start).startOf("day")
               : moment().subtract(5, "days").startOf("day"),
-            ...(end && { end: moment(end).endOf("day") }),
+            ...(end && { end: moment(end).startOf("day") }),
           }
         );
 
         const claimsCorpObject = {
-          DataFeed: {
-            ShopInfo: {
-              ShopID: bodyshops_by_pk.claimscorpid,
-              ShopName: bodyshops_by_pk.shopname,
-              RO: jobs.map((j) =>
-                CreateRepairOrderTag(
-                  { ...j, bodyshop: bodyshops_by_pk },
-                  function ({ job, error }) {
-                    erroredJobs.push({ job: job, error: error.toString() });
-                  }
-                )
-              ),
-            },
+          ClaimsCorpExport: {
+            ShopID: bodyshops_by_pk.claimscorpid,
+            ShopName: bodyshops_by_pk.shopname,
+            RO: jobs.map((j) =>
+              CreateRepairOrderTag(
+                { ...j, bodyshop: bodyshops_by_pk },
+                function ({ job, error }) {
+                  erroredJobs.push({ job: job, error: error.toString() });
+                }
+              )
+            ),
           },
         };
 
@@ -102,9 +100,9 @@ exports.default = async (req, res) => {
           .end({ allowEmptyTags: true });
 
         allxmlsToUpload.push({
-          count: claimsCorpObject.DataFeed.ShopInfo.RO.length,
+          count: claimsCorpObject.ClaimsCorpExport.RO.length,
           xml: ret,
-          filename: `${bodyshop.claimscorpid}-${moment().format(
+          filename: `${bodyshop.claimscorpid}-MIS-${moment().format(
             "YYYYMMDDTHHMMss"
           )}.xml`,
         });
@@ -245,7 +243,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
 
   try {
     const ret = {
-      RoNumber: job.ro_number,
+      RONumber: job.ro_number,
       Customer: {
         CustomerZip: (job.ownr_zip && job.ownr_zip.substring(0, 3)) || "",
         CustomerState: job.ownr_st || "",
@@ -263,8 +261,8 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         VIN: job.v_vin || "",
       },
       Carrier: {
-        UniqueID: job.ins_co_nm || "",
-        InsuranceCompany: job.ins_co_nm || "",
+        InsuranceCo: job.ins_co_nm || "",
+        CompanyName: job.ins_co_nm || "",
       },
       Claim: job.clm_no || "",
       Contacts: {
@@ -281,7 +279,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
           : "",
         Phone1: "",
         Phone2: "",
-        Estimator: `${job.est_ct_ln ? job.est_ct_ln : ""}${
+        EstimatorName: `${job.est_ct_ln ? job.est_ct_ln : ""}${
           job.est_ct_ln ? ", " : ""
         }${job.est_ct_fn ? job.est_ct_fn : ""}`,
         BodyTechnician: job.employee_body_rel
@@ -312,7 +310,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
           (job.date_estimated &&
             moment(job.date_estimated).format(AhDateFormat)) ||
           "",
-        DateLoss:
+        DateofLoss:
           (job.loss_date && moment(job.loss_date).format(AhDateFormat)) || "",
         DateFNOL: "",
         DateContact: "",
@@ -339,7 +337,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
               .tz(job.bodyshop.timezone)
               .format(AhDateFormat)) ||
           "",
-        DateStart: job.date_repairstarted
+        StartDate: job.date_repairstarted
           ? (job.date_repairstarted &&
               moment(job.date_repairstarted)
                 .tz(job.bodyshop.timezone)
@@ -384,7 +382,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
           "",
         BilledDate: "",
         PaidInFullDate: "",
-        ROStatus: job.tlos_ind
+        RoStatus: job.tlos_ind
           ? "TOT"
           : StatusMapping(job.status, job.bodyshop.md_ro_statuses),
       },
@@ -394,10 +392,14 @@ const CreateRepairOrderTag = (job, errorCallback) => {
           .add(Dinero(job.job_totals.rates.lad.total))
           .add(Dinero(job.job_totals.rates.las.total))
           .toFormat(CCDineroFormat),
-        Paint: Dinero(job.job_totals.rates.lar.total).toFormat(CCDineroFormat),
+        Refinish: Dinero(job.job_totals.rates.lar.total).toFormat(
+          CCDineroFormat
+        ),
         Prep: Dinero().toFormat(CCDineroFormat),
         Frame: Dinero(job.job_totals.rates.laf.total).toFormat(CCDineroFormat),
-        Mech: Dinero(job.job_totals.rates.lam.total).toFormat(CCDineroFormat),
+        Mechanical: Dinero(job.job_totals.rates.lam.total).toFormat(
+          CCDineroFormat
+        ),
         Glass: Dinero(job.job_totals.rates.lag.total).toFormat(CCDineroFormat),
         Elec: Dinero(job.job_totals.rates.lae.total).toFormat(CCDineroFormat),
         Detail: detailAdjustments.amount.toFormat(CCDineroFormat),
@@ -444,7 +446,6 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         Towing: Dinero(job.job_totals.additional.towing).toFormat(
           CCDineroFormat
         ),
-        Storage: "0.00",
         Rental:
           job.job_totals.additional.additionalCostItems.includes(
             "ATS Amount"
@@ -479,17 +480,17 @@ const CreateRepairOrderTag = (job, errorCallback) => {
           .filter((line) => repairOpCodes.includes(line.lbr_op))
           .reduce((acc, val) => acc + val.mod_lb_hrs, 0)
           .toFixed(2),
-        BodyReplacehours: job.joblines
+        BodyReplaceHours: job.joblines
           .filter((line) => replaceOpCodes.includes(line.lbr_op))
           .reduce((acc, val) => acc + val.mod_lb_hrs, 0)
           .toFixed(2),
         Paint: job.job_totals.rates.lar.hours.toFixed(2),
         Prep: "0.00",
-        Frame: job.job_totals.rates.laf.hours.toFixed(2),
-        Mech: job.job_totals.rates.lam.hours.toFixed(2),
-        Glass: job.job_totals.rates.lag.hours.toFixed(2),
-        Elec: job.job_totals.rates.lae.hours.toFixed(2),
-        Detail: detailAdjustments.hours,
+        FrameHours: job.job_totals.rates.laf.hours.toFixed(2),
+        MechanicalHours: job.job_totals.rates.lam.hours.toFixed(2),
+        GlassHours: job.job_totals.rates.lag.hours.toFixed(2),
+        ElectricalHours: job.job_totals.rates.lae.hours.toFixed(2),
+        DetailHours: detailAdjustments.hours,
         Reassem: "0.00",
         Other: (
           job.job_totals.rates.la1.hours +
@@ -521,7 +522,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         AM: repairCosts.PartsAMCost.toFormat(CCDineroFormat),
         MechParts: Dinero().toFormat(CCDineroFormat),
         OtherParts: Dinero().toFormat(CCDineroFormat), //Check Synergy
-        OtherCost: repairCosts.PartsOtherCost.toFormat(CCDineroFormat),
+        OtherCosts: repairCosts.PartsOtherCost.toFormat(CCDineroFormat),
         Sublet: repairCosts.SubletTotalCost.toFormat(CCDineroFormat),
         Towing: repairCosts.TowingTotalCost.toFormat(CCDineroFormat),
         Storage: repairCosts.StorageTotalCost.toFormat(CCDineroFormat),