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

hotfix/2021-08-12

Approved-by: Patrick Fic

.platform/nginx/conf.d/proxy.conf

@@ -1 +1 @@
-client_max_body_size 15M;
+client_max_body_size 50M;

client/package.json

@@ -4,39 +4,39 @@
   "private": true,
   "proxy": "http://localhost:5000",
   "dependencies": {
-    "@apollo/client": "^3.3.17",
+    "@apollo/client": "^3.3.21",
-    "@craco/craco": "^5.9.0",
+    "@craco/craco": "^6.2.0",
-    "@fingerprintjs/fingerprintjs": "^3.1.2",
+    "@fingerprintjs/fingerprintjs": "^3.2.0",
     "@lourenci/react-kanban": "^2.1.0",
-    "@sentry/react": "^6.3.6",
+    "@sentry/react": "^6.10.0",
-    "@sentry/tracing": "^6.3.6",
+    "@sentry/tracing": "^6.10.0",
     "@stripe/react-stripe-js": "^1.4.0",
-    "@stripe/stripe-js": "^1.14.0",
+    "@stripe/stripe-js": "^1.16.0",
-    "@tanem/react-nprogress": "^3.0.65",
+    "@tanem/react-nprogress": "^3.0.74",
-    "antd": "^4.15.5",
+    "antd": "^4.16.8",
     "apollo-link-logger": "^2.0.0",
     "axios": "^0.21.1",
-    "craco-less": "^1.17.1",
+    "craco-less": "^1.18.0",
-    "dinero.js": "^1.8.1",
+    "dinero.js": "^1.9.0",
-    "dotenv": "^9.0.2",
+    "dotenv": "^10.0.0",
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
-    "exifr": "^7.0.0",
+    "exifr": "^7.1.2",
-    "firebase": "^8.6.0",
+    "firebase": "^8.7.1",
-    "graphql": "^15.5.0",
+    "graphql": "^15.5.1",
-    "i18next": "^20.2.2",
+    "i18next": "^20.3.4",
-    "i18next-browser-languagedetector": "^6.1.1",
+    "i18next-browser-languagedetector": "^6.1.2",
-    "jsoneditor": "^9.4.1",
+    "jsoneditor": "^9.5.2",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.9.17",
+    "libphonenumber-js": "^1.9.22",
     "logrocket": "^1.2.0",
-    "markerjs2": "^2.8.1",
+    "markerjs2": "^2.9.0",
     "moment-business-days": "^1.2.0",
-    "phone": "^2.4.21",
+    "phone": "^3.1.2",
     "preval.macro": "^5.0.0",
     "prop-types": "^15.7.2",
-    "query-string": "^7.0.0",
+    "query-string": "^7.0.1",
-    "rc-queue-anim": "^1.8.5",
+    "rc-queue-anim": "^2.0.0",
     "rc-scroll-anim": "^2.7.6",
     "react": "^17.0.1",
     "react-big-calendar": "^0.33.2",
@@ -45,26 +45,26 @@
     "react-drag-listview": "^0.1.8",
     "react-grid-gallery": "^0.5.5",
     "react-grid-layout": "^1.2.5",
-    "react-i18next": "^11.8.15",
+    "react-i18next": "^11.11.3",
     "react-icons": "^4.2.0",
-    "react-number-format": "^4.5.5",
+    "react-number-format": "^4.6.4",
     "react-redux": "^7.2.4",
-    "react-resizable": "^3.0.1",
+    "react-resizable": "^3.0.4",
     "react-router-dom": "^5.2.0",
     "react-scripts": "^4.0.3",
     "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.3",
-    "recharts": "^2.0.7",
+    "recharts": "^2.0.10",
     "redux": "^4.1.0",
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.1.3",
     "redux-state-sync": "^3.1.2",
     "reselect": "^4.0.0",
-    "sass": "^1.32.13",
+    "sass": "^1.35.2",
-    "socket.io-client": "^4.1.2",
+    "socket.io-client": "^4.1.3",
     "styled-components": "^5.3.0",
     "subscriptions-transport-ws": "^0.9.18",
-    "web-vitals": "^1.1.2",
+    "web-vitals": "^2.1.0",
     "workbox-background-sync": "^6.1.5",
     "workbox-broadcast-update": "^6.1.5",
     "workbox-cacheable-response": "^6.1.5",

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

@@ -121,6 +121,7 @@ export default function AccountingPayablesTableComponent({ loading, bills }) {
             billId={record.id}
             disabled={transInProgress || !!record.exported}
             loadingCallback={setTransInProgress}
+            setSelectedBills={setSelectedBills}
           />
         </div>
       ),

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

@@ -120,6 +120,7 @@ export default function AccountingPayablesTableComponent({
           paymentId={record.id}
           disabled={transInProgress || !!record.exportedat}
           loadingCallback={setTransInProgress}
+          setSelectedPayments={setSelectedPayments}
         />
       ),
     },

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

@@ -125,6 +125,7 @@ export default function AccountingReceivablesTableComponent({ loading, jobs }) {
           <JobExportButton
             jobId={record.id}
             disabled={!!record.date_exported}
+            setSelectedJobs={setSelectedJobs}
           />
           <Link to={`/manage/jobs/${record.id}/close`}>
             <Button>{t("jobs.labels.viewallocations")}</Button>

client/src/components/bill-detail-edit/bill-detail-edit.container.jsx

@@ -26,6 +26,8 @@ import BillReeportButtonComponent from "../bill-reexport-button/bill-reexport-bu
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -33,6 +35,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "partsOrder" })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export default connect(
@@ -40,7 +44,10 @@ export default connect(
   mapDispatchToProps
 )(BillDetailEditcontainer);
 
-export function BillDetailEditcontainer({ setPartsOrderContext }) {
+export function BillDetailEditcontainer({
+  setPartsOrderContext,
+  insertAuditTrail,
+}) {
   const search = queryString.parse(useLocation().search);
   const history = useHistory();
   const { t } = useTranslation();
@@ -134,6 +141,12 @@ export function BillDetailEditcontainer({ setPartsOrderContext }) {
     });
     await Promise.all(updates);
 
+    insertAuditTrail({
+      jobid: bill.jobid,
+      billid: search.billid,
+      operation: AuditTrailMapping.billupdated(bill.invoice_number),
+    });
+
     await refetch();
     form.setFieldsValue(transformData(data));
     form.resetFields();

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

@@ -11,12 +11,14 @@ import {
   QUERY_JOB_LBR_ADJUSTMENTS,
   UPDATE_JOB,
 } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectBillEnterModal } from "../../redux/modals/modals.selectors";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import BillFormContainer from "../bill-form/bill-form.container";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
 
@@ -27,6 +29,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 function BillEnterModalContainer({
@@ -34,6 +38,7 @@ function BillEnterModalContainer({
   toggleModalVisible,
   bodyshop,
   currentUser,
+  insertAuditTrail,
 }) {
   const [form] = Form.useForm();
   const { t } = useTranslation();
@@ -81,8 +86,9 @@ function BillEnterModalContainer({
           },
         ],
       },
+      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
     });
-    console.log("adjustmentsToInsert", adjustmentsToInsert);
+
     const adjKeys = Object.keys(adjustmentsToInsert);
     if (adjKeys.length > 0) {
       //Query the adjustments, merge, and update them.
@@ -115,7 +121,12 @@ function BillEnterModalContainer({
             message: JSON.stringify(jobUpdate.errors),
           }),
         });
+        return;
       }
+      insertAuditTrail({
+        jobid: values.jobid,
+        operation: AuditTrailMapping.jobmodifylbradj(),
+      });
     }
 
     if (!!r1.errors) {
@@ -171,6 +182,12 @@ function BillEnterModalContainer({
     });
     if (billEnterModal.actions.refetch) billEnterModal.actions.refetch();
 
+    insertAuditTrail({
+      jobid: values.jobid,
+      billid: billId,
+      operation: AuditTrailMapping.billposted(remainingValues.invoice_number),
+    });
+
     if (enterAgain) {
       form.resetFields();
       form.setFieldsValue({ billlines: [] });

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

@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort, dateSort } from "../../utils/sorters";
@@ -14,6 +15,7 @@ import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   //jobRO: selectJobReadOnly,
+  bodyshop: selectBodyshop,
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -26,6 +28,7 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 export function BillsListTableComponent({
+  bodyshop,
   job,
   billsQuery,
   handleOnRowClick,
@@ -52,7 +55,9 @@ export function BillsListTableComponent({
       )}
       <BillDeleteButton bill={record} />
       <Button
-        disabled={record.is_credit_memo}
+        disabled={
+          record.is_credit_memo || record.vendorid === bodyshop.inhousevendorid
+        }
         onClick={() =>
           setPartsOrderContext({
             actions: {},

client/src/components/dashboard-components/monthly-revenue-graph/monthly-revenue-graph.component.jsx

@@ -34,7 +34,9 @@ export default function DashboardMonthlyRevenueGraph({ data, ...cardProps }) {
     let dailySales;
     if (!!jobsByDate[val]) {
       dailySales = jobsByDate[val].reduce((dayAcc, dayVal) => {
-        return dayAcc.add(Dinero(dayVal.job_totals.totals.subtotal));
+        return dayAcc.add(
+          Dinero((dayVal.job_totals && dayVal.job_totals.totals.subtotal) || 0)
+        );
       }, Dinero());
     } else {
       dailySales = Dinero();

client/src/components/dashboard-components/pojected-monthly-sales/projected-monthly-sales.component.jsx

@@ -13,7 +13,14 @@ export default function DashboardProjectedMonthlySales({ data, ...cardProps }) {
   const dollars =
     data.projected_monthly_sales &&
     data.projected_monthly_sales.reduce(
-      (acc, val) => acc.add(Dinero(val.job_totals.totals.subtotal)),
+      (acc, val) =>
+        acc.add(
+          Dinero(
+            val.job_totals &&
+              val.job_totals.totals &&
+              val.job_totals.totals.subtotal
+          )
+        ),
       Dinero()
     );
   return (

client/src/components/dashboard-components/total-production-dollars/total-production-dollars.component.jsx

@@ -14,7 +14,8 @@ export default function DashboardTotalProductionDollars({
   const dollars =
     data.production_jobs &&
     data.production_jobs.reduce(
-      (acc, val) => acc.add(Dinero(val.job_totals.totals.subtotal)),
+      (acc, val) =>
+        acc.add(Dinero(val.job_totals && val.job_totals.totals.subtotal)),
       Dinero()
     );
 

client/src/components/email-overlay/email-overlay.component.jsx

@@ -37,6 +37,8 @@ export default function EmailOverlayComponent({ form, selectedMediaState }) {
       </Form.Item>
 
       <Divider>{t("emails.labels.preview")}</Divider>
+      <strong>{t("emails.labels.pdfcopywillbeattached")}</strong>
+
       <Form.Item shouldUpdate>
         {() => {
           return (

client/src/components/email-overlay/email-overlay.container.jsx

@@ -43,6 +43,10 @@ export function EmailOverlayContainer({
   const [loading, setLoading] = useState(false);
   const [sending, setSending] = useState(false);
   const [rawHtml, setRawHtml] = useState("");
+  const [pdfCopytoAttach, setPdfCopytoAttach] = useState({
+    filename: null,
+    pdf: null,
+  });
   const [selectedMedia, setSelectedMedia] = useState([]);
 
   const defaultEmailFrom = {
@@ -59,17 +63,17 @@ export function EmailOverlayContainer({
   const handleFinish = async (values) => {
     logImEXEvent("email_send_from_modal");
 
-    const attachments = [];
+    //const attachments = [];
 
-    if (values.fileList)
+    // if (values.fileList)
-      await asyncForEach(values.fileList, async (f) => {
+    //   await asyncForEach(values.fileList, async (f) => {
-        const t = {
+    //     const t = {
-          ContentType: f.type,
+    //       ContentType: f.type,
-          Filename: f.name,
+    //       Filename: f.name,
-          Base64Content: (await toBase64(f.originFileObj)).split(",")[1],
+    //       Base64Content: (await toBase64(f.originFileObj)).split(",")[1],
-        };
+    //     };
-        attachments.push(t);
+    //     attachments.push(t);
-      });
+    //   });
 
     setSending(true);
     try {
@@ -77,11 +81,28 @@ export function EmailOverlayContainer({
         ...defaultEmailFrom,
         ...values,
         html: rawHtml,
-        attachments:
+        attachments: [
-          values.fileList &&
+          ...(values.fileList
-          (await Promise.all(
+            ? await Promise.all(
-            values.fileList.map(async (f) => await toBase64(f.originFileObj))
+                values.fileList.map(async (f) => {
-          )),
+                  return {
+                    filename: f.name,
+                    path: await toBase64(f.originFileObj),
+                  };
+                })
+              )
+            : []),
+          ...(pdfCopytoAttach.pdf
+            ? [
+                {
+                  path: pdfCopytoAttach.pdf,
+                  filename:
+                    pdfCopytoAttach.filename &&
+                    `${pdfCopytoAttach.filename}.pdf`,
+                },
+              ]
+            : []),
+        ],
         media: selectedMedia.filter((m) => m.isSelected).map((m) => m.src),
         //attachments,
       });
@@ -99,13 +120,22 @@ export function EmailOverlayContainer({
   const render = async () => {
     logImEXEvent("email_render_template", { template: emailConfig.template });
     setLoading(true);
-    let html = await RenderTemplate(emailConfig.template, bodyshop, true);
+    let { html, pdf, filename } = await RenderTemplate(
+      emailConfig.template,
+      bodyshop,
+      true
+    );
 
     const response = await axios.post("/render/inlinecss", {
       html: html,
       url: `${window.location.protocol}://${window.location.host}/`,
     });
     setRawHtml(response.data);
+
+    if (pdf) {
+      setPdfCopytoAttach({ pdf, filename });
+    }
+
     form.setFieldsValue({
       ...emailConfig.messageOptions,
       cc:
@@ -166,8 +196,8 @@ const toBase64 = (file) =>
     reader.onerror = (error) => reject(error);
   });
 
-const asyncForEach = async (array, callback) => {
+// const asyncForEach = async (array, callback) => {
-  for (let index = 0; index < array.length; index++) {
+//   for (let index = 0; index < array.length; index++) {
-    await callback(array[index], index, array);
+//     await callback(array[index], index, array);
-  }
+//   }
-};
+// };

client/src/components/global-search/global-search.component.jsx

@@ -45,7 +45,7 @@ export default function GlobalSearch() {
                     <span>{`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${
                       job.v_model_desc || ""
                     }`}</span>
-                    <span>{`${job.clm_no}`}</span>
+                    <span>{`${job.clm_no || ""}`}</span>
                   </Space>
                 </Link>
               ),
@@ -91,8 +91,8 @@ export default function GlobalSearch() {
                         vehicle.v_make_desc || ""
                       } ${vehicle.v_model_desc || ""}`}
                     </span>
-                    <span>{vehicle.plate_no}</span>
+                    <span>{vehicle.plate_no || ""}</span>
-                    <span> {vehicle.v_vin}</span>
+                    <span> {vehicle.v_vin || ""}</span>
                   </Space>
                 </Link>
               ),
@@ -108,10 +108,11 @@ export default function GlobalSearch() {
               label: (
                 <Link to={`/manage/jobs/${payment.job.id}`}>
                   <Space size="small" split={<Divider type="vertical" />}>
+                    <span>{payment.paymentnum}</span>
                     <span>{payment.job.ro_number}</span>
-                    <span>{payment.job.memo}</span>
+                    <span>{payment.memo || ""}</span>
-                    <span>{payment.job.amount}</span>
+                    <span>{payment.amount || ""}</span>
-                    <span>{payment.job.transactionid}</span>
+                    <span>{payment.transactionid || ""}</span>
                   </Space>
                 </Link>
               ),

client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx

@@ -161,7 +161,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId }) {
               <Input />
             </Form.Item>
             <Form.Item
-              label={t("printcenter.jobs.3rdpartyfields.ponumber")}
+              label={t("printcenter.jobs.3rdpartyfields.refnumber")}
               name="ponumber"
             >
               <Input />

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

@@ -1,24 +1,50 @@
-import { Button, Popover, Space } from "antd";
+import { AlertFilled } from "@ant-design/icons";
+import {
+  Button,
+  Divider,
+  Dropdown,
+  Menu,
+  notification,
+  Popover,
+  Space,
+} from "antd";
+import parsePhoneNumber from "libphonenumber-js";
+import moment from "moment";
+import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import {
+  openChatByPhone,
+  setMessage,
+} from "../../redux/messaging/messaging.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import PhoneFormatter from "../../utils/PhoneFormatter";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
+import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
-import queryString from "query-string";
+import ScheduleEventNote from "./schedule-event.note.component";
 
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
 const mapDispatchToProps = (dispatch) => ({
   setScheduleContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "schedule" })),
+  openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
+  setMessage: (text) => dispatch(setMessage(text)),
 });
 
 export function ScheduleEventComponent({
+  bodyshop,
+  setMessage,
+  openChatByPhone,
   event,
   refetch,
   handleCancel,
@@ -38,7 +64,7 @@ export function ScheduleEventComponent({
   );
 
   const popoverContent = (
-    <div>
+    <div style={{ maxWidth: "40vw" }}>
       {!event.isintake ? (
         <strong>{event.title}</strong>
       ) : (
@@ -75,17 +101,19 @@ export function ScheduleEventComponent({
             {(event.job && event.job.ownr_ea) || ""}
           </DataLabel>
           <DataLabel label={t("jobs.fields.ownr_ph1")}>
-            <PhoneFormatter>
+            <ChatOpenButton
-              {(event.job && event.job.ownr_ph1) || ""}
+              phone={event.job && event.job.ownr_ph1}
-            </PhoneFormatter>
+              jobid={event.job.id}
+            />
           </DataLabel>
           <DataLabel label={t("jobs.fields.alt_transport")}>
             {(event.job && event.job.alt_transport) || ""}
             <ScheduleAtChange job={event && event.job} />
           </DataLabel>
+          <ScheduleEventNote event={event} />
         </div>
       ) : null}
-
+      <Divider />
       <Space wrap>
         {event.job ? (
           <Link to={`/manage/jobs/${event.job && event.job.id}`}>
@@ -106,23 +134,62 @@ export function ScheduleEventComponent({
             {t("appointments.actions.preview")}
           </Button>
         ) : null}
-        <Button
+
-          onClick={() => {
+        <Dropdown
-            const Template = TemplateList("job").appointment_reminder;
+          overlay={
-            GenerateDocument(
+            <Menu>
-              {
+              <Menu.Item
-                name: Template.key,
+                onClick={() => {
-                variables: { id: event.job.id },
+                  const Template = TemplateList("job").appointment_reminder;
-              },
+                  GenerateDocument(
-              { to: event.job && event.job.ownr_ea, subject: Template.subject },
+                    {
-              "e",
+                      name: Template.key,
-              event.job && event.job.id
+                      variables: { id: event.job.id },
-            );
+                    },
-          }}
+                    {
-          disabled={event.arrived}
+                      to: event.job && event.job.ownr_ea,
+                      subject: Template.subject,
+                    },
+                    "e",
+                    event.job && event.job.id
+                  );
+                }}
+                disabled={event.arrived}
+              >
+                {t("general.labels.email")}
+              </Menu.Item>
+              <Menu.Item
+                onClick={() => {
+                  const p = parsePhoneNumber(event.job.ownr_ph1, "CA");
+                  if (p && p.isValid()) {
+                    openChatByPhone({
+                      phone_num: p.formatInternational(),
+                      jobid: event.job.id,
+                    });
+                    setMessage(
+                      t("appointments.labels.reminder", {
+                        shopname: bodyshop.shopname,
+                        date: moment(event.start).format("MM/DD/YYYY"),
+                        time: moment(event.start).format("HH:MM a"),
+                      })
+                    );
+                    setVisible(false);
+                  } else {
+                    notification["error"]({
+                      message: t("messaging.error.invalidphone"),
+                    });
+                  }
+                }}
+                disabled={event.arrived || !bodyshop.messagingservicesid}
+              >
+                {t("general.labels.sms")}
+              </Menu.Item>
+            </Menu>
+          }
         >
-          {t("appointments.actions.sendreminder")}
+          <Button>{t("appointments.actions.sendreminder")}</Button>
-        </Button>
+        </Dropdown>
+
         <Button onClick={() => handleCancel(event.id)} disabled={event.arrived}>
           {t("appointments.actions.cancel")}
         </Button>
@@ -161,6 +228,7 @@ export function ScheduleEventComponent({
   const RegularEvent = event.isintake ? (
     <div style={{ display: "flex", flexWrap: "wrap" }}>
       <Space>
+        {event.note && <AlertFilled className="production-alert" />}
         <strong>{`${event.job.ro_number || t("general.labels.na")}`}</strong>
         <span>{`${(event.job && event.job.ownr_fn) || ""} ${
           (event.job && event.job.ownr_ln) || ""
@@ -202,4 +270,7 @@ export function ScheduleEventComponent({
     </Popover>
   );
 }
-export default connect(null, mapDispatchToProps)(ScheduleEventComponent);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ScheduleEventComponent);

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

@@ -0,0 +1,74 @@
+import { EditFilled, SaveFilled } from "@ant-design/icons";
+import { useMutation } from "@apollo/client";
+import { Button, Input, notification, Space } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import DataLabel from "../data-label/data-label.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export function ScheduleEventNote({ event }) {
+  const [editing, setEditing] = useState(false);
+  const [note, setNote] = useState(event.note || "");
+  const [loading, setLoading] = useState(false);
+  const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
+  const { t } = useTranslation();
+
+  const toggleEdit = async () => {
+    if (editing) {
+      //Await the update
+      setLoading(true);
+      const result = await updateAppointment({
+        variables: {
+          appid: event.id,
+          app: { note },
+        },
+      });
+
+      if (!!!result.errors) {
+        //  notification["success"]({ message: t("appointments.successes.saved") });
+      } else {
+        notification["error"]({
+          message: t("jobs.errors.saving", {
+            error: JSON.stringify(result.errors),
+          }),
+        });
+      }
+
+      setEditing(false);
+    } else {
+      setEditing(true);
+    }
+    setLoading(false);
+  };
+
+  return (
+    <DataLabel label={t("appointments.fields.note")}>
+      <Space flex>
+        {!editing ? (
+          event.note || ""
+        ) : (
+          <Input.TextArea
+            rows={3}
+            value={note}
+            onChange={(e) => setNote(e.target.value)}
+            style={{ maxWidth: "8vw" }}
+          />
+        )}
+        <Button onClick={toggleEdit} loading={loading}>
+          {editing ? <SaveFilled /> : <EditFilled />}
+        </Button>
+      </Space>
+    </DataLabel>
+  );
+}
+export default connect(mapStateToProps, mapDispatchToProps)(ScheduleEventNote);

client/src/components/job-audit-trail/job-audit-trail.component.jsx

@@ -0,0 +1,46 @@
+import { useQuery } from "@apollo/client";
+import { Card, Table } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { QUERY_AUDIT_TRAIL } from "../../graphql/audit_trail.queries";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
+
+export default function JobAuditTrail({ jobId }) {
+  const { t } = useTranslation();
+  const { loading, data } = useQuery(QUERY_AUDIT_TRAIL, {
+    variables: { jobid: jobId },
+    skip: !jobId,
+  });
+
+  const columns = [
+    {
+      title: t("audit.fields.created"),
+      dataIndex: "created",
+      key: "created",
+      render: (text, record) => (
+        <DateTimeFormatter>{record.created}</DateTimeFormatter>
+      ),
+    },
+    {
+      title: t("audit.fields.useremail"),
+      dataIndex: "useremail",
+      key: "useremail",
+    },
+    {
+      title: t("audit.fields.operation"),
+      dataIndex: "operation",
+      key: "operation",
+    },
+  ];
+
+  return (
+    <Card title={t("jobs.labels.audit")}>
+      <Table
+        loading={loading}
+        columns={columns}
+        rowKey="id"
+        dataSource={data ? data.audit_trail : []}
+      />
+    </Card>
+  );
+}

client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx

@@ -16,16 +16,21 @@ import {
 import ConfigFormComponents from "../../../config-form-components/config-form-components.component";
 import DateTimePicker from "../../../form-date-time-picker/form-date-time-picker.component";
 import moment from "moment-business-days";
+import { insertAuditTrail } from "../../../../redux/application/application.actions";
+import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
+import { UPDATE_OWNER } from "../../../../graphql/owners.queries";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function JobChecklistForm({
+  insertAuditTrail,
   formItems,
   bodyshop,
   currentUser,
@@ -37,6 +42,8 @@ export function JobChecklistForm({
   const [intakeJob] = useMutation(UPDATE_JOB);
   const [loading, setLoading] = useState(false);
   const [markAptArrived] = useMutation(MARK_LATEST_APPOINTMENT_AS_ARRIVED);
+  const [updateOwner] = useMutation(UPDATE_OWNER);
+
   const { jobId } = useParams();
   const history = useHistory();
   const search = queryString.parse(useLocation().search);
@@ -59,6 +66,12 @@ export function JobChecklistForm({
             production_vars: {
               ...job.production_vars,
               ...values.production_vars,
+              note:
+                values.production_vars &&
+                values.production_vars.note &&
+                values.production_vars.note !== ""
+                  ? job.production_vars && values.production_vars.note
+                  : job.production_vars && job.production_vars.note,
             },
           }),
           ...(type === "intake" && {
@@ -104,11 +117,40 @@ export function JobChecklistForm({
         });
       }
     }
+    if (type === "intake" && job.owner && job.owner.id) {
+      //Updae Owner Allow to Text
+      const updateOwnerResult = await updateOwner({
+        variables: {
+          ownerId: job.owner.id,
+          owner: { allow_text_message: values.allow_text_message },
+        },
+      });
+
+      if (!!updateOwnerResult.errors) {
+        notification["error"]({
+          message: t("checklist.errors.complete", {
+            error: JSON.stringify(result.errors),
+          }),
+        });
+      }
+    }
+
     setLoading(false);
 
     if (!!!result.errors) {
       notification["success"]({ message: t("checklist.successes.completed") });
       history.push(`/manage/jobs/${jobId}`);
+
+      insertAuditTrail({
+        jobid: jobId,
+        operation: AuditTrailMapping.jobchecklist(
+          type,
+          (type === "deliver" && values.removeFromProduction && false) ||
+            (type === "intake" && values.addToProduction),
+          (type === "intake" && bodyshop.md_ro_statuses.default_arrived) ||
+            (type === "deliver" && bodyshop.md_ro_statuses.default_delivered)
+        ),
+      });
     } else {
       notification["error"]({
         message: t("checklist.errors.complete", {
@@ -135,6 +177,7 @@ export function JobChecklistForm({
         initialValues={{
           ...(type === "intake" && {
             addToProduction: true,
+            allow_text_message: job.owner && job.owner.allow_text_message,
             scheduled_completion:
               (job && job.scheduled_completion) ||
               moment().businessAdd(
@@ -170,6 +213,14 @@ export function JobChecklistForm({
             >
               <Switch disabled={readOnly} />
             </Form.Item>
+            <Form.Item
+              name="allow_text_message"
+              valuePropName="checked"
+              label={t("checklist.labels.allow_text_message")}
+              disabled={readOnly}
+            >
+              <Switch disabled={readOnly} />
+            </Form.Item>
             <Form.Item
               name="scheduled_completion"
               label={t("jobs.fields.scheduled_completion")}

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

@@ -295,18 +295,18 @@ export function JobLinesComponent({
                 onClick={async () => {
                   await deleteJobLine({
                     variables: { joblineId: record.id },
-                    update(cache) {
+                    // update(cache) {
-                      cache.modify({
+                    //   cache.modify({
-                        id: cache.identify(job),
+                    //     id: cache.identify(job),
-                        fields: {
+                    //     fields: {
-                          joblines(existingJobLines, { readField }) {
+                    //       joblines(existingJobLines, { readField }) {
-                            return existingJobLines.filter(
+                    //         return existingJobLines.filter(
-                              (jlRef) => record.id !== readField("id", jlRef)
+                    //           (jlRef) => record.id !== readField("id", jlRef)
-                            );
+                    //         );
-                          },
+                    //       },
-                        },
+                    //     },
-                      });
+                    //   });
-                    },
+                    // },
                   });
                   await axios.post("/job/totalsssu", {
                     id: job.id,

client/src/components/job-employee-assignments/job-employee-assignments.component.jsx

@@ -37,8 +37,8 @@ export function JobEmployeeAssignments({
   });
   const [visibility, setVisibility] = useState(false);
 
-  const onChange = (e) => {
+  const onChange = (value, option) => {
-    setAssignment({ ...assignment, employeeid: e });
+    setAssignment({ ...assignment, employeeid: value, name: option.name });
   };
 
   const popContent = (
@@ -56,7 +56,11 @@ export function JobEmployeeAssignments({
           }
         >
           {bodyshop.employees.map((emp) => (
-            <Select.Option value={emp.id} key={emp.id}>
+            <Select.Option
+              value={emp.id}
+              key={emp.id}
+              name={`${emp.first_name} ${emp.last_name}`}
+            >
               {`${emp.first_name} ${emp.last_name}`}
             </Select.Option>
           ))}

client/src/components/job-employee-assignments/job-employee-assignments.container.jsx

@@ -6,14 +6,34 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB_ASSIGNMENTS } from "../../graphql/jobs.queries";
 import JobEmployeeAssignmentsComponent from "./job-employee-assignments.component";
 
-export default function JobEmployeeAssignmentsContainer({ job, refetch }) {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+});
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobEmployeeAssignmentsContainer);
+
+export function JobEmployeeAssignmentsContainer({
+  job,
+  refetch,
+  insertAuditTrail,
+}) {
   const { t } = useTranslation();
   const [updateJob] = useMutation(UPDATE_JOB_ASSIGNMENTS);
   const [loading, setLoading] = useState(false);
 
   const handleAdd = async (assignment) => {
     setLoading(true);
-    const { operation, employeeid } = assignment;
+    const { operation, employeeid, name } = assignment;
     logImEXEvent("job_assign_employee", { operation });
 
     let empAssignment = determineFieldName(operation);
@@ -23,6 +43,11 @@ export default function JobEmployeeAssignmentsContainer({ job, refetch }) {
     });
     if (refetch) refetch();
 
+    insertAuditTrail({
+      jobid: job.id,
+      operation: AuditTrailMapping.jobassignmentchange(operation, name),
+    });
+
     if (!!result.errors) {
       notification["error"]({
         message: t("jobs.errors.assigning", {
@@ -48,6 +73,10 @@ export default function JobEmployeeAssignmentsContainer({ job, refetch }) {
         }),
       });
     }
+    insertAuditTrail({
+      jobid: job.id,
+      operation: AuditTrailMapping.jobassignmentremoved(operation),
+    });
     setLoading(false);
   };
 

client/src/components/job-payments/job-payments.component.jsx

@@ -1,4 +1,5 @@
 import { Button, Card, Space, Table } from "antd";
+import { EditFilled } from "@ant-design/icons";
 import Dinero from "dinero.js";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -115,16 +116,29 @@ export function JobPayments({
       dataIndex: "actions",
       key: "actions",
       render: (text, record) => (
-        <PrintWrapperComponent
+        <Space wrap>
-          templateObject={{
+          <Button
-            name: TemplateList("payment").payment_receipt.key,
+            disabled={record.exportedat}
-            variables: { id: record.id },
+            onClick={() => {
-          }}
+              setPaymentContext({
-          messageObject={{
+                actions: { refetch: refetch },
-            to: job.ownr_ea,
+                context: record,
-          }}
+              });
-          id={job.id}
+            }}
-        />
+          >
+            <EditFilled />
+          </Button>
+          <PrintWrapperComponent
+            templateObject={{
+              name: TemplateList("payment").payment_receipt.key,
+              variables: { id: record.id },
+            }}
+            messageObject={{
+              to: job.ownr_ea,
+            }}
+            id={job.id}
+          />
+        </Space>
       ),
     },
   ];

client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx

@@ -1,4 +1,4 @@
-import { Checkbox, PageHeader, Table } from "antd";
+import { Checkbox, Table, Typography } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -21,6 +21,7 @@ export default function JobReconciliationBillsTable({
       title: t("billlines.fields.line_desc"),
       dataIndex: "line_desc",
       key: "line_desc",
+      width: "35%",
       sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
       sortOrder:
         state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
@@ -29,6 +30,8 @@ export default function JobReconciliationBillsTable({
       title: t("billlines.labels.from"),
       dataIndex: "from",
       key: "from",
+      width: "20%",
+      ellipsis: true,
       render: (text, record) =>
         `${record.bill.vendor && record.bill.vendor.name} / ${
           record.bill.invoice_number
@@ -57,7 +60,7 @@ export default function JobReconciliationBillsTable({
       ),
     },
     {
-      title: t("billlines.fields.quantity"),
+      title: t("joblines.fields.part_qty"),
       dataIndex: "quantity",
       key: "quantity",
       sorter: (a, b) => a.quantity - b.quantity,
@@ -86,10 +89,12 @@ export default function JobReconciliationBillsTable({
   };
 
   return (
-    <PageHeader title={t("bills.labels.bills")}>
+    <div>
+      <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
       <Table
         pagination={false}
-        scroll={{ y: "40vh", x: true }}
+        size="small"
+        scroll={{ y: "80vh", x: true }}
         columns={columns}
         rowKey="id"
         dataSource={invoiceLineData}
@@ -99,6 +104,6 @@ export default function JobReconciliationBillsTable({
           selectedRowKeys: selectedLines,
         }}
       />
-    </PageHeader>
+    </div>
   );
 }

client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx

@@ -22,21 +22,23 @@ export default function JobReconciliationModalComponent({ job, bills }) {
   );
 
   return (
-    <div>
+    <div style={{ flex: 1, display: "flex", flexDirection: "column" }}>
-      <Row gutter={[16, 16]}>
+      <div style={{ flex: 1 }}>
-        <Col span={12}>
+        <Row gutter={8}>
-          <JobReconciliationPartsTable
+          <Col span={12}>
-            jobLineData={jobLineData}
+            <JobReconciliationPartsTable
-            jobLineState={jobLineState}
+              jobLineData={jobLineData}
-          />
+              jobLineState={jobLineState}
-        </Col>
+            />
-        <Col span={12}>
+          </Col>
-          <JobReconciliationBillsTable
+          <Col span={12}>
-            invoiceLineData={invoiceLineData}
+            <JobReconciliationBillsTable
-            billLineState={billLineState}
+              invoiceLineData={invoiceLineData}
-          />
+              billLineState={billLineState}
-        </Col>
+            />
-      </Row>
+          </Col>
+        </Row>
+      </div>
       <Row>
         <JobReconciliationTotals
           jobLines={jobLineData}

client/src/components/job-reconciliation-modal/job-reconciliation-modal.styles.scss

@@ -0,0 +1,12 @@
+.imex-reconciliation-modal {
+  top: 20px;
+  .ant-modal-content {
+    height: 95vh;
+    display: flex;
+    flex-direction: column;
+    .ant-modal-body {
+      display: flex;
+      flex: 1;
+    }
+  }
+}

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

@@ -10,6 +10,7 @@ import { selectReconciliation } from "../../redux/modals/modals.selectors";
 import JobReconciliationModalComponent from "./job-reconciliation-modal.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import AlertComponent from "../alert/alert.component";
+import "./job-reconciliation-modal.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
   reconciliationModal: selectReconciliation,
@@ -38,23 +39,23 @@ function JobReconciliationModalContainer({
   return (
     <Modal
       title={t("jobs.labels.reconciliationheader")}
-      width={"90%"}
+      width={"95%"}
       visible={visible}
       okText={t("general.actions.close")}
       onOk={handleCancel}
       onCancel={handleCancel}
       cancelButtonProps={{ display: "none" }}
       destroyOnClose
+      className="imex-reconciliation-modal"
     >
-      <LoadingSpinner loading={loading}>
+      {loading && <LoadingSpinner loading={loading} />}
-        {error && <AlertComponent message={error.message} type="error" />}
+      {error && <AlertComponent message={error.message} type="error" />}
-        {data && (
+      {data && (
-          <JobReconciliationModalComponent
+        <JobReconciliationModalComponent
-            job={data && data.jobs_by_pk}
+          job={data && data.jobs_by_pk}
-            bills={data && data.bills}
+          bills={data && data.bills}
-          />
+        />
-        )}
+      )}
-      </LoadingSpinner>
     </Modal>
   );
 }

client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx

@@ -1,4 +1,4 @@
-import { PageHeader, Table } from "antd";
+import { Table, Typography } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -102,11 +102,13 @@ export default function JobReconcilitionPartsTable({
   };
 
   return (
-    <PageHeader title={t("jobs.labels.lines")}>
+    <div>
+      <Typography.Title level={4}>{t("jobs.labels.lines")}</Typography.Title>
       <Table
         pagination={false}
         columns={columns}
-        scroll={{ y: "40vh", x: true }}
+        size="small"
+        scroll={{ y: "80vh", x: true }}
         rowKey="id"
         dataSource={jobLineData}
         onChange={handleTableChange}
@@ -122,6 +124,6 @@ export default function JobReconcilitionPartsTable({
       <div style={{ fontStyle: "italic", margin: "4px" }}>
         {t("jobs.labels.reconciliation.removedpartsstrikethrough")}
       </div>
-    </PageHeader>
+    </div>
   );
 }

client/src/components/job-search-select/job-search-select.component.jsx

@@ -1,6 +1,6 @@
 import { LoadingOutlined } from "@ant-design/icons";
 import { useLazyQuery } from "@apollo/client";
-import { Empty, Select } from "antd";
+import { Empty, Select, Space, Tag } from "antd";
 import _ from "lodash";
 import React, { forwardRef, useEffect } from "react";
 import { useTranslation } from "react-i18next";
@@ -15,6 +15,7 @@ const JobSearchSelect = (
   {
     disabled,
     convertedOnly = false,
+    notInvoiced = false,
     notExported = true,
     clm_no = false,
     ...restProps
@@ -30,6 +31,7 @@ const JobSearchSelect = (
             variables: {
               ...(convertedOnly ? { isConverted: true } : {}),
               ...(notExported ? { notExported: true } : {}),
+              ...(notInvoiced ? { notInvoiced: true } : {}),
             },
           }
         : {}),
@@ -80,13 +82,20 @@ const JobSearchSelect = (
         {theOptions
           ? theOptions.map((o) => (
               <Option key={o.id} value={o.id} status={o.status}>
-                {`${clm_no && o.clm_no ? `${o.clm_no} | ` : ""}${
+                <Space align="center">
-                  o.ro_number || t("general.labels.na")
+                  <span>
-                } | ${o.ownr_ln || ""} ${o.ownr_fn || ""} ${
+                    {`${clm_no && o.clm_no ? `${o.clm_no} | ` : ""}${
-                  o.ownr_co_nm ? ` ${o.ownr_co_num}` : ""
+                      o.ro_number || t("general.labels.na")
-                }| ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${
+                    } | ${o.ownr_ln || ""} ${o.ownr_fn || ""} ${
-                  o.v_model_desc || ""
+                      o.ownr_co_nm ? ` ${o.ownr_co_num}` : ""
-                }`}
+                    }| ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${
+                      o.v_model_desc || ""
+                    }`}
+                  </span>
+                  <Tag>
+                    <strong>{o.status}</strong>
+                  </Tag>
+                </Space>
               </Option>
             ))
           : null}

client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx

@@ -0,0 +1,57 @@
+import { DownCircleFilled } from "@ant-design/icons";
+import { useMutation } from "@apollo/client";
+import { Button, Dropdown, Menu, notification } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminStatus);
+
+export function JobsAdminStatus({ bodyshop, job }) {
+  const { t } = useTranslation();
+
+  const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
+  const updateJobStatus = (status) => {
+    mutationUpdateJobstatus({
+      variables: { jobId: job.id, status: status },
+    })
+      .then((r) => {
+        notification["success"]({ message: t("jobs.successes.save") });
+        // refetch();
+      })
+      .catch((error) => {
+        notification["error"]({ message: t("jobs.errors.saving") });
+      });
+  };
+
+  const statusmenu = (
+    <Menu
+      onClick={(e) => {
+        updateJobStatus(e.key);
+      }}
+    >
+      {bodyshop.md_ro_statuses.statuses.map((item) => (
+        <Menu.Item key={item}>{item}</Menu.Item>
+      ))}
+    </Menu>
+  );
+
+  return (
+    <Dropdown overlay={statusmenu} trigger={["click"]} key="changestatus">
+      <Button shape="round">
+        <span>{job.status}</span>
+
+        <DownCircleFilled />
+      </Button>
+    </Dropdown>
+  );
+}

client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx

@@ -6,8 +6,8 @@ import { useTranslation } from "react-i18next";
 export default function JobAdminDeleteIntake({ job }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-  const [updateJob] = useMutation(gql`
+  const [deleteIntake] = useMutation(gql`
-    mutation UPDATE_JOB($jobId: uuid!) {
+    mutation DELETE_INTAKE($jobId: uuid!) {
       update_jobs_by_pk(
         pk_columns: { id: $jobId }
         _set: { intakechecklist: null }
@@ -18,9 +18,39 @@ export default function JobAdminDeleteIntake({ job }) {
     }
   `);
 
+  const [DELETE_DELIVERY] = useMutation(gql`
+    mutation DELETE_DELIVERY($jobId: uuid!) {
+      update_jobs_by_pk(
+        pk_columns: { id: $jobId }
+        _set: { deliverchecklist: null }
+      ) {
+        id
+        deliverchecklist
+      }
+    }
+  `);
+
   const handleDelete = async (values) => {
     setLoading(true);
-    const result = await updateJob({
+    const result = await deleteIntake({
+      variables: { jobId: job.id },
+    });
+
+    if (!!!result.errors) {
+      notification["success"]({ message: t("jobs.successes.save") });
+    } else {
+      notification["error"]({
+        message: t("jobs.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setLoading(false);
+  };
+
+  const handleDeleteDelivery = async (values) => {
+    setLoading(true);
+    const result = await DELETE_DELIVERY({
       variables: { jobId: job.id },
     });
 
@@ -34,12 +64,16 @@ export default function JobAdminDeleteIntake({ job }) {
       });
     }
     setLoading(false);
-    //Get the owner details, populate it all back into the job.
   };
 
   return (
-    <Button loading={loading} onClick={handleDelete}>
+    <>
-      {t("jobs.labels.deleteintake")}
+      <Button loading={loading} onClick={handleDelete}>
-    </Button>
+        {t("jobs.labels.deleteintake")}
+      </Button>
+      <Button loading={loading} onClick={handleDeleteDelivery}>
+        {t("jobs.labels.deletedelivery")}
+      </Button>
+    </>
   );
 }

client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx

@@ -7,6 +7,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import moment from "moment";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -21,8 +22,8 @@ export default connect(
 export function JobAdminMarkReexport({ bodyshop, job }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-  const [updateJob] = useMutation(gql`
+  const [markJobForReexport] = useMutation(gql`
-    mutation UPDATE_JOB($jobId: uuid!) {
+    mutation MARK_JOB_FOR_REEXPORT($jobId: uuid!) {
       update_jobs_by_pk(
         pk_columns: { id: $jobId }
         _set: { date_exported: null
@@ -30,14 +31,84 @@ export function JobAdminMarkReexport({ bodyshop, job }) {
         }
       ) {
         id
-        intakechecklist
+        date_exported
+        status
+        date_invoiced
       }
     }
   `);
 
-  const handleUpdate = async (values) => {
+  const [markJobExported] = useMutation(gql`
+    mutation MARK_JOB_AS_EXPORTED($jobId: uuid!, $date_exported: timestamptz!) {
+      update_jobs_by_pk(
+        pk_columns: { id: $jobId }
+        _set: { date_exported: $date_exported
+        status: "${bodyshop.md_ro_statuses.default_exported}"
+        }
+      ) {
+        id
+        date_exported
+        date_invoiced
+        status
+      }
+    }
+  `);
+  const [markJobUninvoiced] = useMutation(gql`
+    mutation MARK_JOB_AS_UNINVOICED($jobId: uuid!, ) {
+      update_jobs_by_pk(
+        pk_columns: { id: $jobId }
+        _set: { date_exported: null
+          date_invoiced: null
+        status: "${bodyshop.md_ro_statuses.default_delivered}"
+        }
+      ) {
+        id
+        date_exported
+        date_invoiced
+        status
+      }
+    }
+  `);
+
+  const handleMarkForExport = async () => {
     setLoading(true);
-    const result = await updateJob({
+    const result = await markJobForReexport({
+      variables: { jobId: job.id },
+    });
+
+    if (!result.errors) {
+      notification["success"]({ message: t("jobs.successes.save") });
+    } else {
+      notification["error"]({
+        message: t("jobs.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setLoading(false);
+  };
+
+  const handleMarkExported = async () => {
+    setLoading(true);
+    const result = await markJobExported({
+      variables: { jobId: job.id, date_exported: moment() },
+    });
+
+    if (!result.errors) {
+      notification["success"]({ message: t("jobs.successes.save") });
+    } else {
+      notification["error"]({
+        message: t("jobs.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setLoading(false);
+  };
+
+  const handleUninvoice = async () => {
+    setLoading(true);
+    const result = await markJobUninvoiced({
       variables: { jobId: job.id },
     });
 
@@ -51,16 +122,31 @@ export function JobAdminMarkReexport({ bodyshop, job }) {
       });
     }
     setLoading(false);
-    //Get the owner details, populate it all back into the job.
   };
 
   return (
-    <Button
+    <>
-      loading={loading}
+      <Button
-      disabled={!job.date_exported}
+        loading={loading}
-      onClick={handleUpdate}
+        disabled={!job.date_exported}
-    >
+        onClick={handleMarkForExport}
-      {t("jobs.labels.markforreexport")}
+      >
-    </Button>
+        {t("jobs.labels.markforreexport")}
+      </Button>
+      <Button
+        loading={loading}
+        disabled={job.date_exported}
+        onClick={handleMarkExported}
+      >
+        {t("jobs.actions.markasexported")}
+      </Button>
+      <Button
+        loading={loading}
+        disabled={!job.date_invoiced || job.date_exported}
+        onClick={handleUninvoice}
+      >
+        {t("jobs.actions.uninvoice")}
+      </Button>
+    </>
   );
 }

client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js

@@ -11,6 +11,7 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
     query: GET_ALL_JOBLINES_BY_PK,
     variables: { id: jobId },
   });
+
   const existingLines = _.cloneDeep(existingLinesFromDb);
   const linesToInsert = [];
   const linesToUpdate = [];
@@ -19,11 +20,14 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
     const matchingIndex = existingLines.findIndex(
       (eL) => eL.unq_seq === newLine.unq_seq
     );
+
+    //Should do a check to make sure there is only 1 matching unq sequence number.
+
     if (matchingIndex >= 0) {
       //Found a relevant matching line. Add it to lines to update.
       linesToUpdate.push({
         id: existingLines[matchingIndex].id,
-        newData: newLine,
+        newData: { ...newLine, removed: false },
       });
 
       //Splice out item we found for performance.

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

@@ -57,7 +57,7 @@ export function JobsAvailableComponent({
       title: t("jobs.fields.cieca_id"),
       dataIndex: "cieca_id",
       key: "cieca_id",
-      sorter: (a, b) => alphaSort(a, b),
+      sorter: (a, b) => alphaSort(a.cieca_id, b.cieca_id),
       sortOrder:
         state.sortedInfo.columnKey === "cieca_id" && state.sortedInfo.order,
     },
@@ -68,9 +68,10 @@ export function JobsAvailableComponent({
       //width: "8%",
       // onFilter: (value, record) => record.ro_number.includes(value),
       // filteredValue: state.filteredInfo.text || null,
-      sorter: (a, b) => alphaSort(a, b),
+      sorter: (a, b) =>
+        alphaSort(a.job && a.job.ro_number, b.job && b.job.ro_number),
       sortOrder:
-        state.sortedInfo.columnKey === "cieca_id" && state.sortedInfo.order,
+        state.sortedInfo.columnKey === "job_id" && state.sortedInfo.order,
       render: (text, record) =>
         record.job ? (
           <Link to={`/manage/jobs/${record.job.id}`}>
@@ -87,7 +88,7 @@ export function JobsAvailableComponent({
       dataIndex: "ownr_name",
       key: "ownr_name",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      sorter: (a, b) => alphaSort(a.ownr_name, b.ownr_name),
       sortOrder:
         state.sortedInfo.columnKey === "ownr_name" && state.sortedInfo.order,
     },

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

@@ -8,7 +8,6 @@ import {
 import { Col, notification, Row } from "antd";
 import Axios from "axios";
 import Dinero from "dinero.js";
-import _ from "lodash";
 import moment from "moment";
 import queryString from "query-string";
 import React, { useCallback, useEffect, useState } from "react";
@@ -25,10 +24,12 @@ import {
 import { INSERT_NEW_JOB, UPDATE_JOB } from "../../graphql/jobs.queries";
 import { INSERT_NEW_NOTE } from "../../graphql/notes.queries";
 import { SEARCH_VEHICLE_BY_VIN } from "../../graphql/vehicles.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import AlertComponent from "../alert/alert.component";
 import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component";
 import JobsFindModalContainer from "../jobs-find-modal/jobs-find-modal.container";
@@ -42,8 +43,15 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
-
+const mapDispatchToProps = (dispatch) => ({
-export function JobsAvailableContainer({ bodyshop, currentUser }) {
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+export function JobsAvailableContainer({
+  bodyshop,
+  currentUser,
+  insertAuditTrail,
+}) {
   const { loading, error, data, refetch } = useQuery(QUERY_AVAILABLE_JOBS, {
     fetchPolicy: "network-only",
   });
@@ -66,7 +74,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
   const client = useApolloClient();
 
   const estDataLazyLoad = useLazyQuery(QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK);
-  const [loadEstData, estData] = estDataLazyLoad;
+  const [loadEstData, estDataRaw] = estDataLazyLoad;
 
   const importOptionsState = useState({ overrideHeaders: false });
   const importOptions = importOptionsState[0];
@@ -79,13 +87,9 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
     setOwnerModalVisible(false);
     setInsertLoading(true);
 
-    if (
+    const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
-      !(
+
-        estData.data &&
+    if (!(estData && estData.est_data)) {
-        estData.data.available_jobs_by_pk &&
-        estData.data.available_jobs_by_pk.est_data
-      )
-    ) {
       //We don't have the right data. Error!
       setInsertLoading(false);
       notification["error"]({
@@ -97,28 +101,25 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
     const newTotals = (
       await Axios.post("/job/totals", {
         job: {
-          ...estData.data.available_jobs_by_pk.est_data,
+          ...estData.est_data,
-          joblines: estData.data.available_jobs_by_pk.est_data.joblines.data,
+          joblines: estData.est_data.joblines.data,
         },
       })
     ).data;
 
     let existingVehicles;
-    if (
+    if (estData.est_data.vehicle && estData.est_data.vin) {
-      estData.data.available_jobs_by_pk.est_data.vehicle &&
-      estData.data.available_jobs_by_pk.est_data.vin
-    ) {
       //There's vehicle data, need to double check the VIN.
       existingVehicles = await client.query({
         query: SEARCH_VEHICLE_BY_VIN,
         variables: {
-          vin: estData.data.available_jobs_by_pk.est_data.vehicle.data.v_vin,
+          vin: estData.est_data.vehicle.data.v_vin,
         },
       });
     }
 
     const newJob = {
-      ...estData.data.available_jobs_by_pk.est_data,
+      ...estData.est_data,
       clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
       owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
       job_totals: newTotals,
@@ -157,8 +158,13 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
         });
         //Job has been inserted. Clean up the available jobs record.
 
+        insertAuditTrail({
+          jobid: r.data.insert_jobs.returning[0].id,
+          operation: AuditTrailMapping.jobimported(),
+        });
+
         deleteJob({
-          variables: { id: estData.data.available_jobs_by_pk.id },
+          variables: { id: estData.id },
         }).then((r) => {
           refetch();
           setInsertLoading(false);
@@ -181,13 +187,9 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
     setJobModalVisible(false);
     setInsertLoading(true);
 
-    if (
+    const estData = estDataRaw.data.available_jobs_by_pk;
-      !(
+
-        estData.data &&
+    if (!(estData && estData.est_data)) {
-        estData.data.available_jobs_by_pk &&
-        estData.data.available_jobs_by_pk.est_data
-      )
-    ) {
       //We don't have the right data. Error!
       setInsertLoading(false);
       notification["error"]({
@@ -195,18 +197,19 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
       });
     } else {
       //create upsert job
-      let supp = _.cloneDeep(estData.data.available_jobs_by_pk.est_data);
+      let supp = replaceEmpty({ ...estData.est_data });
 
       delete supp.owner;
       delete supp.vehicle;
-      if (importOptions.overrideHeaders) {
+      delete supp.ins_co_nm;
+      if (!importOptions.overrideHeaders) {
         HeaderFields.forEach((item) => delete supp[item]);
       }
 
       let suppDelta = await GetSupplementDelta(
         client,
         selectedJob,
-        estData.data.available_jobs_by_pk.est_data.joblines.data
+        supp.joblines.data
       );
 
       delete supp.joblines;
@@ -265,7 +268,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
       //Job has been inserted. Clean up the available jobs record.
 
       deleteJob({
-        variables: { id: estData.data.available_jobs_by_pk.id },
+        variables: { id: estData.id },
       }).then((r) => {
         refetch();
         setInsertLoading(false);
@@ -283,17 +286,21 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
           ],
         },
       });
+      insertAuditTrail({
+        jobid: selectedJob,
+        operation: AuditTrailMapping.jobsupplement(),
+      });
     }
   };
 
   const owner =
-    estData.data &&
+    estDataRaw.data &&
-    estData.data.available_jobs_by_pk &&
+    estDataRaw.data.available_jobs_by_pk &&
-    estData.data.available_jobs_by_pk.est_data &&
+    estDataRaw.data.available_jobs_by_pk.est_data &&
-    estData.data.available_jobs_by_pk.est_data.owner &&
+    estDataRaw.data.available_jobs_by_pk.est_data.owner &&
-    estData.data.available_jobs_by_pk.est_data.owner.data &&
+    estDataRaw.data.available_jobs_by_pk.est_data.owner.data &&
-    !estData.data.available_jobs_by_pk.issupplement
+    !estDataRaw.data.available_jobs_by_pk.issupplement
-      ? estData.data.available_jobs_by_pk.est_data.owner.data
+      ? estDataRaw.data.available_jobs_by_pk.est_data.owner.data
       : null;
 
   const onOwnerModalCancel = () => {
@@ -331,8 +338,8 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
       message={t("jobs.labels.creating_new_job")}
     >
       <OwnerFindModalContainer
-        loading={estData.loading}
+        loading={estDataRaw.loading}
-        error={estData.error}
+        error={estDataRaw.error}
         owner={owner}
         selectedOwner={selectedOwner}
         setSelectedOwner={setSelectedOwner}
@@ -341,8 +348,8 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
         onCancel={onOwnerModalCancel}
       />
       <JobsFindModalContainer
-        loading={estData.loading}
+        loading={estDataRaw.loading}
-        error={estData.error}
+        error={estDataRaw.error}
         selectedJob={selectedJob}
         setSelectedJob={setSelectedJob}
         importOptionsState={importOptionsState}
@@ -368,4 +375,16 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
     </LoadingSpinner>
   );
 }
-export default connect(mapStateToProps, null)(JobsAvailableContainer);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsAvailableContainer);
+
+function replaceEmpty(someObj, replaceValue = null) {
+  const replacer = (key, value) =>
+    value === "" ? replaceValue || null : value;
+  //^ because you seem to want to replace (strings) "null" or "undefined" too
+  const temp = JSON.stringify(someObj, replacer);
+  console.log("Parsed", JSON.parse(temp));
+  return JSON.parse(temp);
+}

client/src/components/jobs-change-status/jobs-change-status.component.jsx

@@ -6,18 +6,21 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   jobRO: selectJobReadOnly,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
-export function JobsChangeStatus({ job, bodyshop, jobRO }) {
+export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
   const { t } = useTranslation();
 
   const [availableStatuses, setAvailableStatuses] = useState([]);
@@ -29,6 +32,10 @@ export function JobsChangeStatus({ job, bodyshop, jobRO }) {
     })
       .then((r) => {
         notification["success"]({ message: t("jobs.successes.save") });
+        insertAuditTrail({
+          jobid: job.id,
+          operation: AuditTrailMapping.jobstatuschange(status),
+        });
         // refetch();
       })
       .catch((error) => {

client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx

@@ -32,7 +32,7 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
         }
         //Verify that this is also manually updated in server/job-costing
         if (!jl.part_type && !jl.mod_lbr_ty) {
-          const lineDesc = jl.line_desc.toLowerCase();
+          const lineDesc = jl.line_desc ? jl.line_desc.toLowerCase() : "";
           if (lineDesc.includes("shop materials")) {
             ret.profitcenter_part = defaults.profits["MASH"];
           } else if (lineDesc.includes("paint/materials")) {

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

@@ -24,6 +24,7 @@ export function JobsCloseExportButton({
   currentUser,
   jobId,
   disabled,
+  setSelectedJobs,
 }) {
   const { t } = useTranslation();
   const [updateJob] = useMutation(UPDATE_JOB);
@@ -147,6 +148,11 @@ export function JobsCloseExportButton({
           }),
         });
       }
+      if (setSelectedJobs) {
+        setSelectedJobs((selectedJobs) => {
+          return selectedJobs.filter((i) => i.id !== jobId);
+        });
+      }
     }
 
     setLoading(false);

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -13,8 +13,10 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { CONVERT_JOB_TO_RO } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -22,10 +24,17 @@ const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
-export function JobsConvertButton({ bodyshop, job, refetch, jobRO }) {
+export function JobsConvertButton({
+  bodyshop,
+  job,
+  refetch,
+  jobRO,
+  insertAuditTrail,
+}) {
   const [visible, setVisible] = useState(false);
   const [loading, setLoading] = useState(false);
   const [mutationConvertJob] = useMutation(CONVERT_JOB_TO_RO);
@@ -43,6 +52,14 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO }) {
       notification["success"]({
         message: t("jobs.successes.converted"),
       });
+
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.jobconverted(
+          res.data.update_jobs.returning[0].ro_number
+        ),
+      });
+
       setVisible(false);
     }
     setLoading(false);

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

@@ -11,7 +11,8 @@ import FormItemPhone, {
   PhoneItemFormatterValidation,
 } from "../form-items-formatted/phone-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
-import { JobsDetailRatesParts } from "../jobs-detail-rates/jobs-detail-rates.parts.component";
+import JobsDetailRatesParts from "../jobs-detail-rates/jobs-detail-rates.parts.component";
+import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -187,7 +188,7 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
           header={t("menus.jobsdetail.financials")}
         >
           <JobsDetailRatesChangeButton form={form} />
-
+          <JobsMarkPstExempt form={form} />
           <LayoutFormRow>
             <Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
               <CurrencyInput />

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.addtoproduction.util.jsx

@@ -1,7 +1,10 @@
 import { notification } from "antd";
 import i18n from "i18next";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import { store } from "../../redux/store";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 export default function AddToProduction(
   apolloClient,
@@ -21,6 +24,13 @@ export default function AddToProduction(
       notification["success"]({
         message: i18n.t("jobs.successes.save"),
       });
+
+      store.dispatch(
+        insertAuditTrail({
+          jobid: jobId,
+          operation: AuditTrailMapping.jobinproductionchange(!remove),
+        })
+      );
       if (completionCallback) completionCallback();
     })
     .catch((error) => {

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

@@ -142,7 +142,10 @@ export function JobsDetailHeaderActions({
       </Menu.Item>
       <Menu.Item
         key="entertimetickets"
-        disabled={!job.converted}
+        disabled={
+          !job.converted ||
+          (!bodyshop.tt_allow_post_to_invoiced && job.date_invoiced)
+        }
         onClick={() => {
           logImEXEvent("job_header_enter_time_ticekts");
 

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

@@ -1,4 +1,13 @@
-import { Form, Input, InputNumber, Select, Space, Switch, Tooltip } from "antd";
+import {
+  Divider,
+  Form,
+  Input,
+  InputNumber,
+  Select,
+  Space,
+  Switch,
+  Tooltip,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -7,6 +16,7 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
 import CABCpvrtCalculator from "../ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
+import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
 import FormRow from "../layout-form-row/layout-form-row.component";
 import JobsDetailRatesParts from "./jobs-detail-rates.parts.component";
 
@@ -103,8 +113,19 @@ export function JobsDetailRates({ jobRO, form, job }) {
           <Switch disabled={jobRO} />
         </Form.Item>
       </FormRow>
-      <JobsDetailRatesChangeButton form={form} disabled={jobRO} />
+      <Divider
-      <FormRow header={t("jobs.forms.laborrates")}>
+        orientation="left"
+        type="horizontal"
+        style={{ marginTop: ".8rem", float: "right" }}
+      >
+        {t("jobs.forms.laborrates")}
+      </Divider>
+      <Space>
+        <div></div>
+        <JobsDetailRatesChangeButton form={form} disabled={jobRO} />
+        <JobsMarkPstExempt form={form} />
+      </Space>
+      <FormRow noDivider>
         <Form.Item
           label={t("jobs.fields.labor_rate_desc")}
           name="labor_rate_desc"
@@ -180,7 +201,6 @@ export function JobsDetailRates({ jobRO, form, job }) {
           <CurrencyInput disabled={jobRO} />
         </Form.Item>
       </FormRow>
-
       <JobsDetailRatesParts form={form} />
     </div>
   );

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

@@ -19,7 +19,11 @@ export function JobsDetailRatesParts({
 
   return (
     <Collapse defaultActiveKey={expanded && "rates"}>
-      <Collapse.Panel header={t("jobs.labels.parts_tax_rates")} key="rates">
+      <Collapse.Panel
+        forceRender
+        header={t("jobs.labels.parts_tax_rates")}
+        key="rates"
+      >
         <LayoutFormRow header={t("joblines.fields.part_types.PAA")}>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_discp")}

client/src/components/jobs-mark-pst-exempt/jobs-mark-pst-exempt.component.jsx

@@ -0,0 +1,55 @@
+import { Popconfirm, Button } from "antd";
+import React from "react";
+import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import _ from "lodash";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly,
+});
+
+export function JobsMarkPstExempt({ jobRO, form }) {
+  const { t } = useTranslation();
+
+  const handleConfirm = () => {
+    const newPartRates = _.cloneDeep(form.getFieldValue("parts_tax_rates"));
+
+    Object.keys(newPartRates).forEach((key) => {
+      newPartRates[key] = {
+        ...newPartRates[key],
+        prt_tax_in: false,
+        prt_tax_rt: 0,
+      };
+    });
+
+    form.setFieldsValue({
+      state_tax_rate: 0,
+      tax_lbr_rt: 0,
+      tax_levies_rt: 0,
+      tax_sub_rt: 0,
+      tax_shop_mat_rt: 0,
+      tax_paint_mat_rt: 0,
+      tax_str_rt: 0,
+      tax_tow_rt: 0,
+      parts_tax_rates: newPartRates,
+    });
+  };
+
+  return (
+    <Popconfirm
+      onConfirm={handleConfirm}
+      disabled={jobRO}
+      okText={t("general.labels.yes")}
+      cancelText={t("general.labels.no")}
+      title={t("jobs.actions.markpstexemptconfirm")}
+    >
+      <Button type="link" disabled={jobRO}>
+        {t("jobs.actions.markpstexempt")}
+      </Button>
+    </Popconfirm>
+  );
+}
+export default connect(mapStateToProps, null)(JobsMarkPstExempt);

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

@@ -31,11 +31,14 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       title: t("jobs.fields.vehicle"),
       dataIndex: "vehicleid",
       key: "vehicleid",
-      render: (text, record) => (
+      render: (text, record) =>
-        <Link to={`/manage/vehicles/${record.vehicleid}`}>
+        record.vehicleid ? (
-          {`${record.v_model_yr} ${record.v_make_desc} ${record.v_model_desc}`}
+          <Link to={`/manage/vehicles/${record.vehicleid}`}>
-        </Link>
+            {`${record.v_model_yr} ${record.v_make_desc} ${record.v_model_desc}`}
-      ),
+          </Link>
+        ) : (
+          t("jobs.errors.novehicle")
+        ),
     },
     {
       title: t("jobs.fields.clm_no"),

client/src/components/parts-order-list-table/parts-order-list-table.component.jsx

@@ -90,7 +90,11 @@ export function PartsOrderListTableComponent({
         </Button>
       )}
       <Button
-        disabled={jobRO || record.return}
+        disabled={
+          jobRO ||
+          record.return ||
+          record.vendor.id === bodyshop.inhousevendorid
+        }
         onClick={() => {
           logImEXEvent("parts_order_receive_bill");
           setPartsReceiveContext({
@@ -139,7 +143,10 @@ export function PartsOrderListTableComponent({
         </Button>
       </Popconfirm>
       <Button
-        disabled={jobRO ? !record.return : jobRO}
+        disabled={
+          (jobRO ? !record.return : jobRO) ||
+          record.vendor.id === bodyshop.inhousevendorid
+        }
         onClick={() => {
           logImEXEvent("parts_order_receive_bill");
 
@@ -157,7 +164,7 @@ export function PartsOrderListTableComponent({
                     quantity: pol.quantity,
 
                     actual_price: pol.act_price,
-                    cost_center: pol.jobline.part_type
+                    cost_center: pol.jobline?.part_type
                       ? responsibilityCenters.defaults.costs[
                           pol.jobline.part_type
                         ] || null

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -9,6 +9,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB_LINE_STATUS } from "../../graphql/jobs-lines.queries";
 import { INSERT_NEW_PARTS_ORDERS } from "../../graphql/parts-orders.queries";
 import { QUERY_ALL_VENDORS_FOR_ORDER } from "../../graphql/vendors.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { setEmailOptions } from "../../redux/email/email.actions";
 import {
   setModalContext,
@@ -19,6 +20,7 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import AlertComponent from "../alert/alert.component";
@@ -36,6 +38,8 @@ const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("partsOrder")),
   setBillEnterContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "billEnter" })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function PartsOrderModalContainer({
@@ -45,6 +49,7 @@ export function PartsOrderModalContainer({
   bodyshop,
   setEmailOptions,
   setBillEnterContext,
+  insertAuditTrail,
 }) {
   const { t } = useTranslation();
 
@@ -101,12 +106,26 @@ export function PartsOrderModalContainer({
 
     const jobLinesResult = await updateJobLines({
       variables: {
-        ids: values.parts_order_lines.data.map((item) => item.job_line_id),
+        ids: values.parts_order_lines.data
+          .filter((item) => item.job_line_id)
+          .map((item) => item.job_line_id),
         status: isReturn
           ? bodyshop.md_order_statuses.default_returned || "Returned*"
           : bodyshop.md_order_statuses.default_ordered || "Ordered*",
       },
     });
+
+    insertAuditTrail({
+      jobid: jobId,
+      operation: isReturn
+        ? AuditTrailMapping.jobspartsreturn(
+            insertResult.data.insert_parts_orders.returning[0].order_number
+          )
+        : AuditTrailMapping.jobspartsorder(
+            insertResult.data.insert_parts_orders.returning[0].order_number
+          ),
+    });
+
     if (!!jobLinesResult.errors) {
       notification["error"]({
         message: t("parts_orders.errors.creating"),

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

@@ -25,6 +25,7 @@ export function PayableExportButton({
   billId,
   disabled,
   loadingCallback,
+  setSelectedBills,
 }) {
   const { t } = useTranslation();
   const [updateBill] = useMutation(UPDATE_BILLS);
@@ -142,6 +143,11 @@ export function PayableExportButton({
           }),
         });
       }
+      if (setSelectedBills) {
+        setSelectedBills((selectedBills) => {
+          return selectedBills.filter((i) => i.id !== billId);
+        });
+      }
     }
 
     if (!!loadingCallback) loadingCallback(false);

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

@@ -24,6 +24,7 @@ export function PaymentExportButton({
   paymentId,
   disabled,
   loadingCallback,
+  setSelectedPayments,
 }) {
   const { t } = useTranslation();
   const [updatePayment] = useMutation(UPDATE_PAYMENTS);
@@ -141,6 +142,12 @@ export function PaymentExportButton({
           }),
         });
       }
+
+      if (setSelectedPayments) {
+        setSelectedPayments((selectedBills) => {
+          return selectedBills.filter((i) => i.id !== paymentId);
+        });
+      }
     }
 
     if (!!loadingCallback) loadingCallback(false);

client/src/components/production-board-kanban/production-board-kanban.component.jsx

@@ -14,12 +14,25 @@ import IndefiniteLoading from "../indefinite-loading/indefinite-loading.componen
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import ProductionBoardFilters from "../production-board-filters/production-board-filters.component";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   technician: selectTechnician,
 });
 
-export function ProductionBoardKanbanComponent({ data, bodyshop, technician }) {
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+
+export function ProductionBoardKanbanComponent({
+  data,
+  bodyshop,
+  technician,
+  insertAuditTrail,
+}) {
   const [boardLanes, setBoardLanes] = useState({
     columns: [{ id: "Loading...", title: "Loading...", cards: [] }],
   });
@@ -104,6 +117,11 @@ export function ProductionBoardKanbanComponent({ data, bodyshop, technician }) {
         newChildCardNewParent
       ),
     });
+    insertAuditTrail({
+      jobid: card.id,
+      operation: AuditTrailMapping.jobstatuschange(destination.toColumnId),
+    });
+
     if (update.errors) {
       notification["error"]({
         message: t("production.errors.boardupdate", {
@@ -130,4 +148,7 @@ export function ProductionBoardKanbanComponent({ data, bodyshop, technician }) {
     </div>
   );
 }
-export default connect(mapStateToProps, null)(ProductionBoardKanbanComponent);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ProductionBoardKanbanComponent);

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

@@ -16,24 +16,32 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const iconStyle = { marginLeft: ".3rem" };
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
-export function ProductionListEmpAssignment({ bodyshop, record, type }) {
+export function ProductionListEmpAssignment({
+  insertAuditTrail,
+  bodyshop,
+  record,
+  type,
+}) {
   const { t } = useTranslation();
   const [updateJob] = useMutation(UPDATE_JOB);
   const [loading, setLoading] = useState(false);
 
   const handleAdd = async (assignment) => {
     setLoading(true);
-    const { operation, employeeid } = assignment;
+    const { operation, employeeid, name } = assignment;
     logImEXEvent("job_assign_employee", { operation });
 
     let empAssignment = determineFieldName(operation);
@@ -44,6 +52,11 @@ export function ProductionListEmpAssignment({ bodyshop, record, type }) {
       awaitRefetchQueries: true,
     });
 
+    insertAuditTrail({
+      jobid: record.id,
+      operation: AuditTrailMapping.jobassignmentchange(empAssignment, name),
+    });
+
     if (!!result.errors) {
       notification["error"]({
         message: t("jobs.errors.assigning", {
@@ -64,6 +77,11 @@ export function ProductionListEmpAssignment({ bodyshop, record, type }) {
       awaitRefetchQueries: true,
     });
 
+    insertAuditTrail({
+      jobid: record.id,
+      operation: AuditTrailMapping.jobassignmentremoved(empAssignment),
+    });
+
     if (!!result.errors) {
       notification["error"]({
         message: t("jobs.errors.assigning", {
@@ -80,8 +98,8 @@ export function ProductionListEmpAssignment({ bodyshop, record, type }) {
   });
 
   const [visibility, setVisibility] = useState(false);
-  const onChange = (e) => {
+  const onChange = (e, option) => {
-    setAssignment({ ...assignment, employeeid: e });
+    setAssignment({ ...assignment, employeeid: e, name: option.name });
   };
 
   const popContent = (
@@ -99,7 +117,11 @@ export function ProductionListEmpAssignment({ bodyshop, record, type }) {
           }
         >
           {bodyshop.employees.map((emp) => (
-            <Select.Option value={emp.id} key={emp.id}>
+            <Select.Option
+              value={emp.id}
+              key={emp.id}
+              name={`${emp.first_name} ${emp.last_name}`}
+            >
               {`${emp.first_name} ${emp.last_name}`}
             </Select.Option>
           ))}

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

@@ -6,12 +6,21 @@ import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
-
+const mapDispatchToProps = (dispatch) => ({
-export function ProductionListColumnStatus({ record, bodyshop }) {
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+export function ProductionListColumnStatus({
+  record,
+  bodyshop,
+  insertAuditTrail,
+}) {
   const [updateJob] = useMutation(UPDATE_JOB);
   const [loading, setLoading] = useState(false);
 
@@ -28,6 +37,11 @@ export function ProductionListColumnStatus({ record, bodyshop }) {
         },
       },
     });
+    insertAuditTrail({
+      jobid: record.id,
+      operation: AuditTrailMapping.jobstatuschange(key),
+    });
+
     setLoading(false);
   };
 
@@ -52,4 +66,7 @@ export function ProductionListColumnStatus({ record, bodyshop }) {
     </Dropdown>
   );
 }
-export default connect(mapStateToProps, null)(ProductionListColumnStatus);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ProductionListColumnStatus);

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

@@ -25,6 +25,7 @@ export function ProductionListTable({
   currentUser,
   state,
   setColumns,
+  setState,
 }) {
   const { t } = useTranslation();
   const [updateDefaultProdView] = useMutation(UPDATE_ACTIVE_PROD_LIST_VIEW);
@@ -43,6 +44,10 @@ export function ProductionListTable({
           };
         })
     );
+    setState(
+      bodyshop.production_config.filter((pc) => pc.name === value)[0].columns
+        .tableState
+    );
 
     const assoc = bodyshop.associations.find(
       (a) => a.useremail === currentUser.email
@@ -77,6 +82,8 @@ export function ProductionListTable({
         };
       })
     );
+
+    setState(bodyshop.production_config[0].columns.tableState);
   };
 
   return (

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

@@ -41,9 +41,9 @@ export function ProductionListTable({
 
   const [state, setState] = useState(
     (bodyshop.production_config &&
-      bodyshop.production_config.find((p) => p.name === defaultView)
+      bodyshop.production_config.find((p) => p.name === defaultView)?.columns
-        ?.tableState) ||
+        .tableState) ||
-      bodyshop.production_config[0]?.tableState || {
+      bodyshop.production_config[0]?.columns.tableState || {
         sortedInfo: {},
         filteredInfo: { text: "" },
       }
@@ -173,6 +173,7 @@ export function ProductionListTable({
 
             <ProductionListTableViewSelect
               state={state}
+              setState={setState}
               setColumns={setColumns}
             />
 

client/src/components/profile-my/profile-my.component.jsx

@@ -1,11 +1,16 @@
-import { Button, Form, Input } from "antd";
+import { Button, Form, Input, notification } from "antd";
+import { LockOutlined } from "@ant-design/icons";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { updateUserDetails } from "../../redux/user/user.actions";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
-import { logImEXEvent } from "../../firebase/firebase.utils";
+import {
+  logImEXEvent,
+  updateCurrentPassword,
+} from "../../firebase/firebase.utils";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -28,33 +33,96 @@ export default connect(
     });
   };
 
+  const handleChangePassword = async ({ password }) => {
+    logImEXEvent("password_update");
+    try {
+      await updateCurrentPassword(password);
+      notification.success({
+        message: t("user.successess.passwordchanged"),
+      });
+    } catch (error) {
+      notification.error({
+        message: error.message,
+      });
+    }
+  };
+
   return (
     <div>
       <Form
         onFinish={handleFinish}
         autoComplete={"no"}
         initialValues={currentUser}
+        layout="vertical"
       >
-        <Form.Item
+        <LayoutFormRow>
-          label={t("user.fields.displayname")}
+          <Form.Item
-          rules={[
+            label={t("user.fields.displayname")}
-            {
+            rules={[
-              required: true,
+              {
-              //message: t("general.validation.required"),
+                required: true,
-            },
+                //message: t("general.validation.required"),
-          ]}
+              },
-          name="displayName"
+            ]}
-        >
+            name="displayName"
-          <Input />
+          >
-        </Form.Item>
+            <Input />
-        <Form.Item label={t("user.fields.photourl")} name="photoURL">
+          </Form.Item>
-          <Input />
+          <Form.Item label={t("user.fields.photourl")} name="photoURL">
-        </Form.Item>
+            <Input />
+          </Form.Item>
+        </LayoutFormRow>
 
         <Button type="primary" key="submit" htmlType="submit">
           {t("user.actions.updateprofile")}
         </Button>
       </Form>
+      <Form
+        onFinish={handleChangePassword}
+        autoComplete={"no"}
+        initialValues={currentUser}
+        layout="vertical"
+      >
+        <LayoutFormRow>
+          <Form.Item label={t("general.labels.newpassword")} name="password">
+            <Input
+              prefix={<LockOutlined />}
+              type="password"
+              placeholder={t("general.labels.password")}
+            />
+          </Form.Item>
+          <Form.Item
+            label={t("general.labels.confirmpassword")}
+            name="password-confirm"
+            dependencies={["password"]}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+              ({ getFieldValue }) => ({
+                validator(rule, value) {
+                  if (!value || getFieldValue("password") === value) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(
+                    t("general.labels.passwordsdonotmatch")
+                  );
+                },
+              }),
+            ]}
+          >
+            <Input
+              prefix={<LockOutlined />}
+              type="password"
+              placeholder={t("general.labels.password")}
+            />
+          </Form.Item>
+        </LayoutFormRow>
+        <Button type="primary" key="submit" htmlType="submit">
+          {t("user.actions.changepassword")}
+        </Button>
+      </Form>
     </div>
   );
 });

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -1,5 +1,5 @@
 import { useLazyQuery } from "@apollo/client";
-import { Button, DatePicker, Form, Radio } from "antd";
+import { Button, DatePicker, Form, Radio, Space } from "antd";
 import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -13,6 +13,7 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
+import "./report-center-modal.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
   reportCenterModal: selectReportCenter,
@@ -60,8 +61,12 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
       {
         name: values.key,
         variables: {
-          ...(start ? { start: moment(start).format("YYYY-MM-DD") } : {}),
+          ...(start
-          ...(end ? { end: moment(end).format("YYYY-MM-DD") } : {}),
+            ? { start: moment(start).startOf("day").format("YYYY-MM-DD") }
+            : {}),
+          ...(end
+            ? { end: moment(end).endOf("day").format("YYYY-MM-DD") }
+            : {}),
           ...(id ? { id: id } : {}),
         },
       },
@@ -86,6 +91,7 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
         <Form.Item
           name="key"
           label={t("reportcenter.labels.key")}
+          //  className="radio-group-columns"
           rules={[
             {
               required: true,
@@ -93,12 +99,21 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
             },
           ]}
         >
-          <Radio.Group style={{ columns: "3 auto" }}>
+          <Radio.Group>
-            {Object.keys(Templates).map((key) => (
+            <Space
-              <Radio key={key} value={key}>
+              direction="vertical"
-                {Templates[key].title}
+              wrap
-              </Radio>
+              size="small"
-            ))}
+              style={{
+                maxHeight: "50vh",
+              }}
+            >
+              {Object.keys(Templates).map((key) => (
+                <Radio key={key} value={key}>
+                  {Templates[key].title}
+                </Radio>
+              ))}
+            </Space>
           </Radio.Group>
         </Form.Item>
         <Form.Item dependencies={["key"]}>

client/src/components/report-center-modal/report-center-modal.container.jsx

@@ -31,7 +31,7 @@ export function ReportCenterModalContainer({
       onCancel={() => toggleModalVisible()}
       cancelButtonProps={{ style: { display: "none" } }}
       destroyOnClose
-      width="60%"
+      width="80%"
     >
       <ReportCenterModalComponent />
     </Modal>

client/src/components/report-center-modal/report-center-modal.styles.scss

@@ -0,0 +1,11 @@
+.radio-group-columns {
+  .ant-radio-group {
+    // display: block;
+  }
+  .ant-radio-wrapper {
+    display: block;
+    span {
+      word-wrap: break-word;
+    }
+  }
+}

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

@@ -1,4 +1,14 @@
-import { Button, Card, Col, Form, Row, Select, Switch } from "antd";
+import {
+  Button,
+  Col,
+  Form,
+  Input,
+  Row,
+  Select,
+  Space,
+  Switch,
+  Typography,
+} from "antd";
 import axios from "axios";
 import moment from "moment";
 import React, { useState } from "react";
@@ -91,31 +101,34 @@ export function ScheduleJobModalComponent({
             <DateTimePicker onlyFuture />
           </Form.Item>
         </LayoutFormRow>
-        <Card title={t("appointments.labels.smartscheduling")}>
+
+        <Typography.Title level={4}>
+          {t("appointments.labels.smartscheduling")}
+        </Typography.Title>
+
+        {
+          // smartOptions.length > 0 && (
+          // <div>{t("appointments.labels.suggesteddates")}</div>
+          // )
+        }
+        <Space wrap>
           <Button onClick={handleSmartScheduling} loading={loading}>
             {t("appointments.actions.calculate")}
           </Button>
-          {smartOptions.length > 0 && (
+          {smartOptions.map((d, idx) => (
-            <div>{t("appointments.labels.suggesteddates")}</div>
+            <Button
-          )}
+              className="imex-flex-row__margin"
-          <div
+              key={idx}
-            className="imex-flex-row imex-flex-row__flex-space-around"
+              onClick={() => {
-            style={{ flexWrap: "wrap" }}
+                form.setFieldsValue({ start: new moment(d).add(8, "hours") });
-          >
+                handleDateBlur();
-            {smartOptions.map((d, idx) => (
+              }}
-              <Button
+            >
-                className="imex-flex-row__margin"
+              <DateFormatter>{d}</DateFormatter>
-                key={idx}
+            </Button>
-                onClick={() => {
+          ))}
-                  form.setFieldsValue({ start: new moment(d).add(8, "hours") });
+        </Space>
-                  handleDateBlur();
+
-                }}
-              >
-                <DateFormatter>{d}</DateFormatter>
-              </Button>
-            ))}
-          </div>
-        </Card>
         <LayoutFormRow grow>
           <Form.Item
             name="notifyCustomer"
@@ -124,12 +137,9 @@ export function ScheduleJobModalComponent({
           >
             <Switch />
           </Form.Item>
-          <Form.Item shouldUpdate>
+
-            {() => (
+          <Form.Item name="email" label={t("jobs.fields.ownr_ea")}>
-              <Form.Item name="email" label={t("jobs.fields.ownr_ea")}>
+            <EmailInput disabled={!form.getFieldValue("notifyCustomer")} />
-                <EmailInput disabled={!form.getFieldValue("notifyCustomer")} />
-              </Form.Item>
-            )}
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow grow>
@@ -158,6 +168,9 @@ export function ScheduleJobModalComponent({
                 ))}
             </Select>
           </Form.Item>
+          <Form.Item name={"note"} label={t("appointments.fields.note")}>
+            <Input />
+          </Form.Item>
         </LayoutFormRow>
         {t("appointments.labels.history")}
         <ScheduleExistingAppointmentsList

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

@@ -105,6 +105,7 @@ export function ScheduleJobModalContainer({
           start: moment(values.start),
           end: moment(values.start).add(bodyshop.appt_length || 60, "minutes"),
           color: values.color,
+          note:values.note
         },
         jobId: jobId,
         altTransport: values.alt_transport,

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

@@ -436,6 +436,21 @@ export default function ShopInfoGeneral({ form }) {
         >
           <CurrencyInput />
         </Form.Item>
+
+        <Form.Item
+          name={["attach_pdf_to_email"]}
+          label={t("bodyshop.fields.attach_pdf_to_email")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
+        <Form.Item
+          name={["tt_allow_post_to_invoiced"]}
+          label={t("bodyshop.fields.tt_allow_post_to_invoiced")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow grow header={t("bodyshop.labels.messagingpresets")}>
         <Form.List name={["md_messaging_presets"]}>

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

@@ -89,7 +89,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                       >
                         <Input onBlur={handleBlur} />
                       </Form.Item>
-                      <Form.Item
+                      {/* <Form.Item
                         label={t(
                           "bodyshop.fields.responsibilitycenter_accountnumber"
                         )}
@@ -103,7 +103,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         ]}
                       >
                         <Input onBlur={handleBlur} />
-                      </Form.Item>
+                      </Form.Item> */}
                       <Form.Item
                         label={t(
                           "bodyshop.fields.responsibilitycenter_accountdesc"
@@ -119,7 +119,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                       >
                         <Input onBlur={handleBlur} />
                       </Form.Item>
-                      <Form.Item
+                      {/* <Form.Item
                         label={t(
                           "bodyshop.fields.responsibilitycenter_accountitem"
                         )}
@@ -133,7 +133,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         ]}
                       >
                         <Input onBlur={handleBlur} />
-                      </Form.Item>
+                      </Form.Item> */}
                       <DeleteFilled
                         onClick={() => {
                           remove(field.name);
@@ -182,7 +182,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                       >
                         <Input onBlur={handleBlur} />
                       </Form.Item>
-                      <Form.Item
+                      {/* <Form.Item
                         label={t(
                           "bodyshop.fields.responsibilitycenter_accountname"
                         )}
@@ -211,7 +211,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
                         ]}
                       >
                         <Input onBlur={handleBlur} />
-                      </Form.Item>
+                      </Form.Item> */}
                       <Form.Item
                         label={t(
                           "bodyshop.fields.responsibilitycenter_accountdesc"
@@ -1081,7 +1081,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
         >
           <Input />
         </Form.Item>
-        <Form.Item
+        {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
           rules={[
             {
@@ -1097,8 +1097,8 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           ]}
         >
           <Input />
-        </Form.Item>
+        </Form.Item> */}
-        <Form.Item
+        {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenter_accountname")}
           rules={[
             {
@@ -1114,7 +1114,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           ]}
         >
           <Input />
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
           rules={[
@@ -1175,7 +1175,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
         >
           <Input />
         </Form.Item>
-        <Form.Item
+        {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
           rules={[
             {
@@ -1203,7 +1203,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           name={["md_responsibility_centers", "taxes", "state", "accountname"]}
         >
           <Input />
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
           rules={[
@@ -1254,7 +1254,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
         >
           <Input />
         </Form.Item>
-        <Form.Item
+        {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
           rules={[
             {
@@ -1282,7 +1282,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           name={["md_responsibility_centers", "taxes", "local", "accountname"]}
         >
           <Input />
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
           rules={[
@@ -1320,8 +1320,8 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           <InputNumber precision={2} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow>
+      <LayoutFormRow header={<div>AR</div>}>
-        <Form.Item
+        {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.ar")}
           rules={[
             {
@@ -1344,7 +1344,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           name={["md_responsibility_centers", "ar", "accountnumber"]}
         >
           <Input />
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenter_accountname")}
           rules={[
@@ -1357,7 +1357,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
         >
           <Input />
         </Form.Item>
-        <Form.Item
+        {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
           rules={[
             {
@@ -1380,9 +1380,9 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           name={["md_responsibility_centers", "ar", "accountitem"]}
         >
           <Input />
-        </Form.Item>
+        </Form.Item> */}
       </LayoutFormRow>
-      <LayoutFormRow>
+      {/* <LayoutFormRow>
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.ap")}
           rules={[
@@ -1443,9 +1443,9 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
         >
           <Input />
         </Form.Item>
-      </LayoutFormRow>
+      </LayoutFormRow> */}
-      <LayoutFormRow>
+      <LayoutFormRow header={<div>Refund</div>}>
-        <Form.Item
+        {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.refund")}
           rules={[
             {
@@ -1456,8 +1456,8 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           name={["md_responsibility_centers", "refund", "name"]}
         >
           <Input />
-        </Form.Item>
+        </Form.Item> */}
-        <Form.Item
+        {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
           rules={[
             {
@@ -1468,8 +1468,8 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           name={["md_responsibility_centers", "refund", "accountnumber"]}
         >
           <Input />
-        </Form.Item>
+        </Form.Item> */}
-        <Form.Item
+        {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenter_accountname")}
           rules={[
             {
@@ -1492,7 +1492,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
           name={["md_responsibility_centers", "refund", "accountdesc"]}
         >
           <Input />
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenter_accountitem")}
           rules={[

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

@@ -30,7 +30,10 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
             },
           ]}
         >
-          <JobSearchSelect />
+          <JobSearchSelect
+            convertedOnly={!bodyshop.tt_allow_post_to_invoiced}
+            notExported={!bodyshop.tt_allow_post_to_invoiced}
+          />
         </Form.Item>
 
         <Form.Item

client/src/components/time-ticket-list/time-ticket-list.component.jsx

@@ -105,7 +105,8 @@ export function TimeTicketList({
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
+      sorter: (a, b) =>
+        alphaSort(a.job && a.job.ro_number, b.job && b.job.ro_number),
       sortOrder:
         state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
       render: (text, record) =>

client/src/components/time-ticket-modal/time-ticket-modal.component.jsx

@@ -82,7 +82,10 @@ export function TimeTicketModalComponent({
                 },
               ]}
             >
-              <JobSearchSelect convertedOnly notExported={false} />
+              <JobSearchSelect
+                convertedOnly={!bodyshop.tt_allow_post_to_invoiced}
+                notExported={!bodyshop.tt_allow_post_to_invoiced}
+              />
             </Form.Item>
           )}
         </Form.Item>

client/src/firebase/firebase.utils.js

@@ -35,6 +35,24 @@ export const updateCurrentUser = (userDetails) => {
   });
 };
 
+export const updateCurrentPassword = async (password) => {
+  const currentUser = await getCurrentUser();
+
+  return currentUser.updatePassword(password);
+
+  // return new Promise((resolve, reject) => {
+  //   const unsubscribe = auth.onAuthStateChanged(
+  //     (userAuth) => {
+  //       userAuth.updatePassword(password).then((r) => {
+  //         unsubscribe();
+  //         resolve(userAuth);
+  //       });
+  //     },
+  //     (error) => reject(error)
+  //   );
+  // });
+};
+
 let messaging;
 try {
   messaging = firebase.messaging();

client/src/graphql/appointments.queries.js

@@ -20,6 +20,7 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
       isintake
       block
       color
+      note
       job {
         alt_transport
         ro_number
@@ -69,6 +70,7 @@ export const INSERT_APPOINTMENT_BLOCK = gql`
         title
         isintake
         block
+        note
       }
     }
   }
@@ -90,6 +92,7 @@ export const INSERT_APPOINTMENT = gql`
         isintake
         block
         color
+        note
       }
     }
     update_jobs(
@@ -116,6 +119,7 @@ export const QUERY_APPOINTMENT_BY_DATE = gql`
       isintake
       block
       color
+      note
       job {
         alt_transport
         ro_number
@@ -168,6 +172,7 @@ export const UPDATE_APPOINTMENT = gql`
         isintake
         block
         color
+        note
       }
     }
   }
@@ -198,6 +203,7 @@ export const QUERY_APPOINTMENTS_BY_JOBID = gql`
       canceled
       created_at
       block
+      note
     }
   }
 `;

client/src/graphql/audit_trail.queries.js

@@ -1,18 +1,31 @@
 import { gql } from "@apollo/client";
 
 export const QUERY_AUDIT_TRAIL = gql`
-  query QUERY_AUDIT_TRAIL($id: uuid!) {
+  query QUERY_AUDIT_TRAIL($jobid: uuid!) {
-    audit_trail(where: { recordid: { _eq: $id } }) {
+    audit_trail(
+      where: { jobid: { _eq: $jobid } }
+      order_by: { created: desc }
+    ) {
       useremail
-      tabname
+      jobid
-      schemaname
-      recordid
       operation
-      old_val
-      new_val
       id
       created
       bodyshopid
     }
   }
 `;
+
+export const INSERT_AUDIT_TRAIL = gql`
+  mutation INSERT_AUDIT_TRAIL($auditObj: audit_trail_insert_input!) {
+    insert_audit_trail_one(object: $auditObj) {
+      id
+      jobid
+      billid
+      bodyshopid
+      created
+      operation
+      useremail
+    }
+  }
+`;

client/src/graphql/bodyshop.queries.js

@@ -91,6 +91,8 @@ export const QUERY_BODYSHOP = gql`
       md_jobline_presets
       cdk_dealerid
       features
+      attach_pdf_to_email
+      tt_allow_post_to_invoiced
       employees {
         id
         active
@@ -178,6 +180,8 @@ export const UPDATE_SHOP = gql`
         jc_hourly_rates
         md_jobline_presets
         cdk_dealerid
+        attach_pdf_to_email
+        tt_allow_post_to_invoiced
         employees {
           id
           first_name
@@ -204,6 +208,10 @@ export const QUERY_INTAKE_CHECKLIST = gql`
       scheduled_delivery
       intakechecklist
       status
+      owner {
+        allow_text_message
+        id
+      }
       labhrs: joblines_aggregate(
         where: {
           _and: [{ mod_lbr_ty: { _neq: "LAR" } }, { removed: { _eq: false } }]

client/src/graphql/jobs-lines.queries.js

@@ -23,19 +23,6 @@ export const GET_ALL_JOBLINES_BY_PK = gql`
       notes
       location
       tax_part
-      parts_order_lines {
-        id
-        parts_order {
-          id
-          order_number
-          order_date
-          user_email
-          vendor {
-            id
-            name
-          }
-        }
-      }
     }
   }
 `;
@@ -228,7 +215,11 @@ export const generateJobLinesUpdatesForInvoicing = (joblines) => {
 
 export const DELETE_JOB_LINE_BY_PK = gql`
   mutation DELETE_JOB_LINE_BY_PK($joblineId: uuid!) {
-    delete_joblines_by_pk(id: $joblineId) {
+    update_joblines_by_pk(
+      pk_columns: { id: $joblineId }
+      _set: { removed: true }
+    ) {
+      removed
       id
     }
   }

client/src/graphql/jobs.queries.js

@@ -559,6 +559,7 @@ export const GET_JOB_BY_PK = gql`
       }
       payments {
         id
+        jobid
         amount
         payer
         created_at
@@ -566,6 +567,8 @@ export const GET_JOB_BY_PK = gql`
         transactionid
         memo
         date
+        type
+        exportedat
       }
       cccontracts {
         id
@@ -686,6 +689,8 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       v_make_desc
       v_model_desc
       v_color
+      v_vin
+      plate_st
       plate_no
       vehicle {
         id
@@ -1020,6 +1025,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
     $search: String
     $isConverted: Boolean
     $notExported: Boolean
+    $notInvoiced: Boolean
   ) {
     search_jobs(
       args: { search: $search }
@@ -1028,6 +1034,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
         _and: {
           converted: { _eq: $isConverted }
           date_exported: { _is_null: $notExported }
+          date_invoiced: { _is_null: $notInvoiced }
         }
       }
     ) {
@@ -1040,6 +1047,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
       v_make_desc
       v_model_desc
       v_model_yr
+      status
     }
   }
 `;
@@ -1841,6 +1849,10 @@ export const QUERY_JOB_CHECKLISTS = gql`
       scheduled_delivery
       actual_delivery
       production_vars
+      owner {
+        id
+        allow_text_message
+      }
       bodyshop {
         id
         intakechecklist

client/src/graphql/parts-orders.queries.js

@@ -5,6 +5,7 @@ export const INSERT_NEW_PARTS_ORDERS = gql`
     insert_parts_orders(objects: $po) {
       returning {
         id
+        order_number
       }
     }
   }

client/src/graphql/search.queries.js

@@ -36,6 +36,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
     search_payments(args: { search: $search }) {
       id
       amount
+      paymentnum
       job {
         ro_number
         id

client/src/landing/index.jsx

@@ -81,48 +81,52 @@ export default class Home extends React.Component {
         dataSource={Banner00DataSource}
         isMobile={this.state.isMobile}
       />,
-      // <Content4
+      ...(process.env.NODE_ENV !== "production"
-      //   id="Content4_0"
+        ? [
-      //   key="Content4_0"
+            // <Content4
-      //   dataSource={Content40DataSource}
+            //   id="Content4_0"
-      //   isMobile={this.state.isMobile}
+            //   key="Content4_0"
-      // />,
+            //   dataSource={Content40DataSource}
-      <Content1
+            //   isMobile={this.state.isMobile}
-        id="Content1_0"
+            // />,
-        key="Content1_0"
+            <Content1
-        dataSource={Content10DataSource}
+              id="Content1_0"
-        isMobile={this.state.isMobile}
+              key="Content1_0"
-      />,
+              dataSource={Content10DataSource}
-      <Content0
+              isMobile={this.state.isMobile}
-        id="Content0_0"
+            />,
-        key="Content0_0"
+            <Content0
-        dataSource={Content00DataSource}
+              id="Content0_0"
-        isMobile={this.state.isMobile}
+              key="Content0_0"
-      />,
+              dataSource={Content00DataSource}
-      <Pricing2
+              isMobile={this.state.isMobile}
-        id="Pricing2_0"
+            />,
-        key="Pricing2_0"
+            <Pricing2
-        dataSource={Pricing20DataSource}
+              id="Pricing2_0"
-        isMobile={this.state.isMobile}
+              key="Pricing2_0"
-      />,
+              dataSource={Pricing20DataSource}
-      // <Pricing1
+              isMobile={this.state.isMobile}
-      //   id="Pricing1_1"
+            />,
-      //   key="Pricing1_1"
+            // <Pricing1
-      //   dataSource={Pricing11DataSource}
+            //   id="Pricing1_1"
-      //   isMobile={this.state.isMobile}
+            //   key="Pricing1_1"
-      // />,
+            //   dataSource={Pricing11DataSource}
-      // <Content3
+            //   isMobile={this.state.isMobile}
-      //   id="Content3_0"
+            // />,
-      //   key="Content3_0"
+            // <Content3
-      //   dataSource={Content30DataSource}
+            //   id="Content3_0"
-      //   isMobile={this.state.isMobile}
+            //   key="Content3_0"
-      // />,
+            //   dataSource={Content30DataSource}
-      // <Content12
+            //   isMobile={this.state.isMobile}
-      //   id="Content12_0"
+            // />,
-      //   key="Content12_0"
+            // <Content12
-      //   dataSource={Content120DataSource}
+            //   id="Content12_0"
-      //   isMobile={this.state.isMobile}
+            //   key="Content12_0"
-      // />,
+            //   dataSource={Content120DataSource}
+            //   isMobile={this.state.isMobile}
+            // />,
+          ]
+        : []),
       <Footer1
         id="Footer1_0"
         key="Footer1_0"

client/src/pages/export-logs/export-logs.page.component.jsx

@@ -12,7 +12,6 @@ import AlertComponent from "../../components/alert/alert.component";
 import { QUERY_EXPORT_LOG_PAGINATED } from "../../graphql/accounting.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
-import { alphaSort } from "../../utils/sorters";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -79,12 +78,10 @@ export function ExportLogsPageComponent({ bodyshop }) {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
-      sortOrder: sortcolumn === "ro_number" && sortorder,
 
       render: (text, record) =>
         record.job && (
-          <Link to={"/manage/jobs/" + record.job && record.job.id}>
+          <Link to={`/manage/jobs/${record.job.id}`}>
             {(record.job && record.job.ro_number) || t("general.labels.na")}
           </Link>
         ),

client/src/pages/jobs-admin/jobs-admin.page.jsx

@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client";
-import { Card, Col, Result, Row, Space } from "antd";
+import { Card, Col, Result, Row, Space, Typography } from "antd";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -15,6 +15,8 @@ import JobAdminOwnerReassociate from "../../components/jobs-admin-owner-reassoci
 import JobsAdminUnvoid from "../../components/jobs-admin-unvoid/jobs-admin-unvoid.component";
 import JobAdminVehicleReassociate from "../../components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
+import JobsAdminStatus from "../../components/jobs-admin-change-status/jobs-admin-change.status.component";
+
 import NotFound from "../../components/not-found/not-found.component";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { GET_JOB_BY_PK } from "../../graphql/jobs.queries";
@@ -82,6 +84,9 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
 
   return (
     <RbacWrapper action="jobs:admin">
+      <Typography.Title level={4} style={{ color: "tomato" }}>
+        {t("jobs.labels.adminwarning")}
+      </Typography.Title>
       <Row gutter={[16, 16]}>
         <Col {...colSpan}>
           <Card style={cardStyle}>
@@ -96,6 +101,7 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
               <JobsAdminDeleteIntake job={data ? data.jobs_by_pk : {}} />
               <JobsAdminMarkReexport job={data ? data.jobs_by_pk : {}} />
               <JobsAdminUnvoid job={data ? data.jobs_by_pk : {}} />
+              <JobsAdminStatus job={data ? data.jobs_by_pk : {}} />
             </Space>
           </Card>
         </Col>

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -42,9 +42,26 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
     setLoading(true);
     const result = await client.mutate({
       mutation: generateJobLinesUpdatesForInvoicing(values.joblines),
+    });
+    if (result.errors) {
+      return; // Abandon the rest of the close.
+    }
+
+    const closeResult = await closeJob({
+      variables: {
+        jobId: job.id,
+        job: {
+          status: bodyshop.md_ro_statuses.default_invoiced || "",
+          date_invoiced: new Date(),
+          actual_in: values.actual_in,
+          actual_completion: values.actual_completion,
+          actual_delivery: values.actual_delivery,
+        },
+      },
       refetchQueries: ["QUERY_JOB_CLOSE_DETAILS"],
       awaitRefetchQueries: true,
     });
+
     if (!result.errors) {
       notification["success"]({ message: t("jobs.successes.save") });
       //  form.resetFields();
@@ -56,18 +73,6 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
       });
       return; // Abandon the rest of the close.
     }
-    form.resetFields();
-    form.resetFields();
-
-    const closeResult = await closeJob({
-      variables: {
-        jobId: job.id,
-        job: {
-          status: bodyshop.md_ro_statuses.default_invoiced || "",
-          date_invoiced: new Date(),
-        },
-      },
-    });
 
     if (!closeResult.errors) {
       setLoading(false);
@@ -84,6 +89,8 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
         }),
       });
     }
+    form.resetFields();
+    form.resetFields();
 
     setLoading(false);
   };

client/src/pages/jobs-detail/jobs-detail.page.component.jsx

@@ -5,6 +5,7 @@ import Icon, {
   FileImageFilled,
   PrinterFilled,
   ToolFilled,
+  HistoryOutlined,
 } from "@ant-design/icons";
 import {
   Button,
@@ -45,6 +46,9 @@ import ScheduleJobModalContainer from "../../components/schedule-job-modal/sched
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -53,6 +57,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPrintCenterContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "printCenter" })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 export function JobsDetailPage({
   setPrintCenterContext,
@@ -60,6 +66,7 @@ export function JobsDetailPage({
   job,
   mutationUpdateJob,
   handleSubmit,
+  insertAuditTrail,
   refetch,
 }) {
   const { t } = useTranslation();
@@ -81,6 +88,7 @@ export function JobsDetailPage({
 
   const handleFinish = async (values) => {
     setLoading(true);
+
     const result = await mutationUpdateJob({
       variables: {
         jobId: job.id,
@@ -105,6 +113,62 @@ export function JobsDetailPage({
       notification["success"]({
         message: t("jobs.successes.savetitle"),
       });
+      const changedAuditFields = form.getFieldsValue(
+        [
+          "scheduled_in",
+          "actual_in",
+          "scheduled_completion",
+          "actual_completion",
+          "scheduled_delivery",
+          "actual_delivery",
+          "date_invoiced",
+          "ins_co_nm",
+          "ded_amt",
+          "ded_status",
+          "date_exported",
+          "special_coverage_policy",
+          "ca_gst_registrant",
+          "ca_bc_pvrt",
+          "scheduled_in",
+          "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_mapa",
+          "rate_mahw",
+          "rate_mash",
+          "rate_matd",
+        ],
+        (meta) => meta && meta.touched
+      );
+
+      Object.keys(changedAuditFields).forEach((key) => {
+        insertAuditTrail({
+          jobid: job.id,
+          operation: AuditTrailMapping.jobfieldchange(
+            key,
+            changedAuditFields[key] instanceof moment
+              ? moment(changedAuditFields[key]).format("MM/DD/YYYY hh:mm a")
+              : changedAuditFields[key]
+          ),
+        });
+      });
+
       await refetch();
       form.setFieldsValue(transormJobToForm(job));
       form.resetFields();
@@ -279,6 +343,17 @@ export function JobsDetailPage({
           >
             <JobNotesContainer jobId={job.id} />
           </Tabs.TabPane>
+          <Tabs.TabPane
+            tab={
+              <span>
+                <HistoryOutlined />
+                {t("jobs.labels.audit")}
+              </span>
+            }
+            key="audit"
+          >
+            <JobAuditTrail jobId={job.id} />
+          </Tabs.TabPane>
         </Tabs>
       </Form>
     </div>

client/src/redux/application/application.actions.js

@@ -53,3 +53,8 @@ export const setOnline = (isOnline) => ({
   type: ApplicationActionTypes.SET_ONLINE_STATUS,
   payload: isOnline,
 });
+
+export const insertAuditTrail = ({ jobid, billid, operation }) => ({
+  type: ApplicationActionTypes.INSERT_AUDIT_TRAIL,
+  payload: { jobid, billid, operation },
+});

client/src/redux/application/application.sagas.js

@@ -1,6 +1,7 @@
 import moment from "moment";
 import { all, call, put, select, takeLatest } from "redux-saga/effects";
 import { QUERY_SCHEDULE_LOAD_DATA } from "../../graphql/appointments.queries";
+import { INSERT_AUDIT_TRAIL } from "../../graphql/audit_trail.queries";
 import client from "../../utils/GraphQLClient";
 import { CalculateLoad, CheckJobBucket } from "../../utils/SSSUtils";
 import {
@@ -125,6 +126,56 @@ export function* calculateScheduleLoad({ payload: end }) {
   }
 }
 
-export function* applicationSagas() {
+export function* onInsertAuditTrail() {
-  yield all([call(onCalculateScheduleLoad)]);
+  yield takeLatest(
+    ApplicationActionTypes.INSERT_AUDIT_TRAIL,
+    insertAuditTrailSaga
+  );
+}
+
+export function* insertAuditTrailSaga({
+  payload: { jobid, billid, operation },
+}) {
+  const state = yield select();
+  const bodyshop = state.user.bodyshop;
+  const currentUser = state.user.currentUser;
+  console.log(
+    "Inserting audit trail for",
+    bodyshop.shopname,
+    currentUser.email,
+    jobid,
+    billid,
+    operation
+  );
+  const variables = {
+    auditObj: {
+      bodyshopid: bodyshop.id,
+      jobid,
+      billid,
+      operation,
+      useremail: currentUser.email,
+    },
+  };
+  yield client.mutate({
+    mutation: INSERT_AUDIT_TRAIL,
+    variables,
+    update(cache, { data }) {
+      cache.modify({
+        fields: {
+          audit_trail(existingAuditTrail, { readField }) {
+            const newAuditTrail = cache.writeQuery({
+              data: data.insert_audit_trail_one,
+              query: INSERT_AUDIT_TRAIL,
+              variables,
+            });
+            return [...existingAuditTrail, newAuditTrail];
+          },
+        },
+      });
+    },
+  });
+}
+
+export function* applicationSagas() {
+  yield all([call(onCalculateScheduleLoad), call(onInsertAuditTrail)]);
 }

client/src/redux/application/application.types.js

@@ -10,5 +10,6 @@ const ApplicationActionTypes = {
   SET_JOB_READONLY: "SET_JOB_READONLY",
   SET_PARTNER_VERSION: "SET_PARTNER_VERSION",
   SET_ONLINE_STATUS: "SET_ONLINE_STATUS",
+  INSERT_AUDIT_TRAIL: "INSERT_AUDIT_TRAIL",
 };
 export default ApplicationActionTypes;

client/src/redux/messaging/messaging.sagas.js

@@ -39,7 +39,7 @@ export function* openChatByPhone({ payload }) {
       data: { conversations },
     } = yield client.query({
       query: CONVERSATION_ID_BY_PHONE,
-      variables: { phone: phone(phone_num)[0] },
+      variables: { phone: phone(phone_num).phoneNumber },
       fetchPolicy: "network-only",
     });
 
@@ -53,7 +53,7 @@ export function* openChatByPhone({ payload }) {
         variables: {
           conversation: [
             {
-              phone_num: phone(phone_num)[0],
+              phone_num: phone(phone_num).phoneNumber,
               bodyshopid: bodyshop.id,
               job_conversations: jobid ? { data: { jobid: jobid } } : null,
             },

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

@@ -28,6 +28,7 @@ import {
   validatePasswordResetSuccess,
 } from "./user.actions";
 import UserActionTypes from "./user.types";
+import * as Sentry from "@sentry/browser";
 
 export function* onEmailSignInStart() {
   yield takeLatest(UserActionTypes.EMAIL_SIGN_IN_START, signInWithEmail);
@@ -100,8 +101,12 @@ export function* onUpdateUserDetails() {
 }
 export function* updateUserDetails(userDetails) {
   try {
-    yield updateCurrentUser(userDetails.payload);
+    const updatedDetails = yield updateCurrentUser(userDetails.payload);
-    yield put(updateUserDetailsSuccess(userDetails.payload));
+    console.log(
+      "🚀  ~ file: user.sagas.js  ~ line 104  ~ updatedDetails",
+      updatedDetails
+    );
+    yield put(updateUserDetailsSuccess(updatedDetails));
     notification.open({
       type: "success",
       message: i18next.t("profile.successes.updated"),
@@ -174,6 +179,11 @@ export function* signInSuccessSaga({ payload }) {
     ]);
     console.log("Setting $crisp segments", ["user"]);
     window.$crisp.push(["set", "session:segments", [["user"]]]);
+
+    Sentry.setUser({
+      email: payload.email,
+      username: payload.displayName || payload.email,
+    });
   } catch (error) {
     console.log("Error updating Crisp settings.", error);
   }

client/src/translations/en_us/common.json

@@ -37,6 +37,7 @@
 			"fields": {
 				"alt_transport": "Alt. Trans.",
 				"color": "Appointment Color",
+				"note": "Appt. Note",
 				"time": "Appointment Time",
 				"title": "Title"
 			},
@@ -52,6 +53,7 @@
 				"nocompletingjobs": "No jobs scheduled for completion.",
 				"nodateselected": "No date has been selected.",
 				"priorappointments": "Previous Appointments",
+				"reminder": "This is {{shopname}} reminding you about an appointment on {{date}} at {{time}}. Please let us know if you are not able to make the appointment. We look forward to seeing you soon. ",
 				"scheduledfor": "Scheduled appointment for: ",
 				"smartscheduling": "Smart Scheduling",
 				"suggesteddates": "Suggested Dates"
@@ -82,6 +84,24 @@
 				"values": "Values"
 			}
 		},
+		"audit_trail": {
+			"messages": {
+				"billposted": "Bill with invoice number {{invoice_number}} posted.",
+				"billupdated": "Bill with invoice number {{invoice_number}} updated.",
+				"jobassignmentchange": "Employee {{name}} assigned to {{operation}}",
+				"jobassignmentremoved": "Employee assignment removed for {{operation}}",
+				"jobchecklist": "Checklist type \"{{type}}\" completed.  In production set to {{inproduction}}.  Status set to {{status}}.",
+				"jobconverted": "Job converted and assigned number {{ro_number}}.",
+				"jobfieldchanged": "Job field $t(jobs.fields.{{field}}) changed to {{value}}.",
+				"jobimported": "Job imported.",
+				"jobinproductionchange": "Job production status set to {{inproduction}}",
+				"jobmodifylbradj": "Labor adjustments modified.",
+				"jobspartsorder": "Parts order {{order_number}} added to job.",
+				"jobspartsreturn": "Parts return {{order_number}} added to job.",
+				"jobstatuschange": "Job status changed to {{status}}.",
+				"jobsupplement": "Job supplement imported."
+			}
+		},
 		"billlines": {
 			"actions": {
 				"newline": "New Line"
@@ -199,6 +219,7 @@
 					"label": "Label"
 				},
 				"appt_length": "Default Appointment Length",
+				"attach_pdf_to_email": "Attach PDF copy to sent emails?",
 				"bill_federal_tax_rate": "Bills - Federal Tax Rate %",
 				"bill_local_tax_rate": "Bill - Provincial/State Tax Rate %",
 				"bill_state_tax_rate": "Bill - Provincial/State Tax Rate %",
@@ -425,6 +446,7 @@
 					"production_statuses": "Production Statuses"
 				},
 				"target_touchtime": "Target Touch Time",
+				"tt_allow_post_to_invoiced": "Allow Time Tickets to be posted to Invoiced & Exported Jobs",
 				"use_fippa": "Use FIPPA for Names on Generated Documents?",
 				"website": "Website",
 				"zip_post": "Zip/Postal Code"
@@ -490,6 +512,7 @@
 			},
 			"labels": {
 				"addtoproduction": "Add Job to Production?",
+				"allow_text_message": "Permission to Text?",
 				"checklist": "Checklist",
 				"printpack": "Job Intake Print Pack",
 				"removefromproduction": "Remove job from production?"
@@ -742,6 +765,7 @@
 				"attachments": "Attachments",
 				"documents": "Documents",
 				"generatingemail": "Generating email...",
+				"pdfcopywillbeattached": "A PDF copy of this email will be attached when it is sent.",
 				"preview": "Email Preview"
 			},
 			"successes": {
@@ -855,6 +879,7 @@
 				"message": "Message",
 				"monday": "Monday",
 				"na": "N/A",
+				"newpassword": "New Password",
 				"no": "No",
 				"nointernet": "It looks like you're not connected to the internet.",
 				"nointernet_sub": "Please check your connection and try again. ",
@@ -875,6 +900,7 @@
 				"sendagain": "Send Again",
 				"sendby": "Send By",
 				"signin": "Sign In",
+				"sms": "SMS",
 				"sub_status": {
 					"expired": "The subscription for this shop has expired.  Please contact technical support to reactivate the subscription. "
 				},
@@ -1034,6 +1060,9 @@
 				"intake": "Intake",
 				"manualnew": "Create New Job Manually",
 				"mark": "Mark",
+				"markasexported": "Mark as Exported",
+				"markpstexempt": "Mark Job PST Exempt",
+				"markpstexemptconfirm": "Are you sure you want to do this? To undo this,  you must manually update all PST rates.",
 				"postbills": "Post Bills",
 				"printCenter": "Print Center",
 				"recalculate": "Recalculate",
@@ -1042,6 +1071,7 @@
 				"schedule": "Schedule",
 				"sendcsi": "Send CSI",
 				"sync": "Sync",
+				"uninvoice": "Uninvoice",
 				"unvoid": "Unvoid Job",
 				"viewchecklist": "View Checklists",
 				"viewdetail": "View Details"
@@ -1223,6 +1253,7 @@
 				"servicecar": "Service Car",
 				"servicing_dealer": "Servicing Dealer",
 				"servicing_dealer_contact": "Servicing Dealer Contact",
+				"special_coverage_policy": "Special Coverage Policy",
 				"specialcoveragepolicy": "Special Coverage Policy",
 				"state_tax_rate": "Provincial/State Tax Rate",
 				"status": "Job Status",
@@ -1260,6 +1291,7 @@
 				"additionaltotal": "Additional Total",
 				"adjustmentrate": "Adjustment Rate",
 				"adjustments": "Adjustments",
+				"adminwarning": "Use the functionality on this page at your own risk.  You are responsible for any and all changes to your data.",
 				"allocations": "Allocations",
 				"alreadyclosed": "This job has already been closed.",
 				"appointmentconfirmation": "Send confirmation to customer?",
@@ -1312,7 +1344,8 @@
 					"waived": "Waived"
 				},
 				"deleteconfirm": "Are you sure you want to delete this job? This cannot be undone. ",
-				"deleteintake": "Delete Intake",
+				"deletedelivery": "Delete Delivery Checklist",
+				"deleteintake": "Delete Intake Checklist",
 				"deliverchecklist": "Deliver Checklist",
 				"difference": "Difference",
 				"diskscan": "Scan Disk for Estimates",
@@ -1441,11 +1474,11 @@
 					"name": "ImEX Online",
 					"status": "System Status"
 				},
-				"slogan": "The future of shop management systems. "
+				"slogan": "A whole new kind of shop management system."
 			},
 			"hero": {
-				"button": "Learn More",
+				"button": "Coming Soon",
-				"title": "Bringing the future to the collision repair process."
+				"title": "A whole new kind of shop management system."
 			},
 			"labels": {
 				"features": "Features",
@@ -1805,6 +1838,7 @@
 					"depreciation": "Depreciation",
 					"other": "Other",
 					"ponumber": "PO Number",
+					"refnumber": "Reference Number",
 					"sendtype": "Send by",
 					"state": "Province/State",
 					"zip": "Postal Code/Zip"
@@ -1830,6 +1864,8 @@
 				"invoice_total_payable": "Invoice (Total Payable)",
 				"job_costing_ro": "Job Costing",
 				"job_notes": "Job Notes",
+				"key_tag": "Key Tag",
+				"paint_grid": "Paint Grid",
 				"parts_label_single": "Parts Label - Single",
 				"parts_list": "Parts List",
 				"parts_order": "Parts Order Confirmation",
@@ -1844,6 +1880,7 @@
 				"qc_sheet": "Quality Control Sheet",
 				"ro_totals": "RO Totals",
 				"ro_with_description": "RO Summary with Descriptions",
+				"stolen_recovery_checklist": "Stolen Recovery Checklist",
 				"supplement_request": "Supplement Request",
 				"thank_you_ro": "Thank You Letter",
 				"thirdpartypayer": "Third Party Payer",
@@ -1945,12 +1982,15 @@
 					"bills": "Bills",
 					"exportlogs": "Export Logs",
 					"jobs": "Jobs",
+					"parts_orders": "Parts Orders",
 					"payments": "Payments",
+					"scoreboard": "Scoreboard",
 					"timetickets": "Timetickets"
 				},
 				"vendor": "Vendor"
 			},
 			"templates": {
+				"anticipated_revenue": "Anticipated Revenue",
 				"attendance_detail": "Attendance (All Employees)",
 				"attendance_employee": "Employee Attendance",
 				"attendance_summary": "Attendance Summary (All Employees)",
@@ -1960,30 +2000,39 @@
 				"export_payables": "Export Log - Payables",
 				"export_payments": "Export Log - Payments",
 				"export_receivables": "Export Log - Receivables",
+				"gsr_by_csr": "Gross Sales by CSR",
 				"gsr_by_delivery_date": "Gross Sales by Delivery Date",
 				"gsr_by_estimator": "Gross Sales by Estimator",
 				"gsr_by_exported_date": "Gross Sales by Export Date",
-				"gsr_by_ins_co": "Gross Sales by Insurance Company'",
+				"gsr_by_ins_co": "Gross Sales by Insurance Company",
 				"gsr_by_make": "Gross Sales by Vehicle Make",
 				"gsr_by_referral": "Gross Sales by Referral Source",
 				"gsr_by_ro": "Gross Sales by RO",
 				"gsr_labor_only": "Gross Sales - Labor Only",
 				"hours_sold_detail_closed": "Hours Sold Detail - Closed",
+				"hours_sold_detail_closed_csr": "Hours Sold Detail - Closed by CSR",
 				"hours_sold_detail_closed_ins_co": "Hours Sold Detail - Closed by Source",
 				"hours_sold_detail_open": "Hours Sold Detail - Open",
+				"hours_sold_detail_open_csr": "Hours Sold Detail - Open by CSR",
 				"hours_sold_detail_open_ins_co": "Hours Sold Detail - Open by Source",
 				"hours_sold_summary_closed": "Hours Sold Summary - Closed",
+				"hours_sold_summary_closed_csr": "Hours Sold Summary - Closed by CSR",
 				"hours_sold_summary_closed_ins_co": "Hours Sold Summary - Closed by Source",
 				"hours_sold_summary_open": "Hours Sold Summary - Open",
+				"hours_sold_summary_open_csr": "Hours Sold Summary - Open CSR",
 				"hours_sold_summary_open_ins_co": "Hours Sold Summary - Open by Source",
+				"job_costing_ro_csr": "Job Costing by CSR",
 				"job_costing_ro_date_detail": "Job Costing by RO - Detail",
 				"job_costing_ro_date_summary": "Job Costing by RO - Summary",
 				"job_costing_ro_estimator": "Job Costing by Estimator",
 				"job_costing_ro_ins_co": "Job Costing by RO Source",
+				"lag_time": "Lag Time",
 				"open_orders": "Open Orders by Date",
+				"open_orders_csr": "Open Orders by CSR",
 				"open_orders_estimator": "Open Orders by Estimator",
 				"open_orders_ins_co": "Open Orders by Insurance Company",
 				"parts_backorder": "Backordered Parts",
+				"parts_not_recieved": "Parts Not Received",
 				"payments_by_date": "Payments by Date",
 				"payments_by_date_type": "Payments by Date and Type",
 				"production_by_csr": "Production by CSR",
@@ -2000,6 +2049,8 @@
 				"purchases_grouped_by_vendor_detailed": "Purchases Grouped by Vendor - Detailed",
 				"purchases_grouped_by_vendor_summary": "Purchases Grouped by Vendor - Summary",
 				"schedule": "Appointment Schedule",
+				"scoreboard_detail": "Scoreboard Detail",
+				"scoreboard_summary": "Scoreboard Summary",
 				"supplement_ratio_ins_co": "Supplement Ratio by Source",
 				"thank_you_date": "Thank You Letters",
 				"timetickets": "Time Tickets",
@@ -2206,6 +2257,7 @@
 		},
 		"user": {
 			"actions": {
+				"changepassword": "Change Password",
 				"signout": "Sign Out",
 				"updateprofile": "Update Profile"
 			},
@@ -2220,6 +2272,9 @@
 			},
 			"labels": {
 				"actions": "Actions"
+			},
+			"successess": {
+				"passwordchanged": "Password changed successfully. "
 			}
 		},
 		"vehicles": {
@@ -2282,7 +2337,7 @@
 				"city": "City",
 				"cost_center": "Cost Center",
 				"country": "Country",
-				"discount": "Discount %",
+				"discount": "Discount % (as decimal)",
 				"display_name": "Display Name",
 				"due_date": "Payment Due Date",
 				"email": "Contact Email",

client/src/translations/es/common.json

@@ -37,6 +37,7 @@
 			"fields": {
 				"alt_transport": "",
 				"color": "",
+				"note": "",
 				"time": "",
 				"title": "Título"
 			},
@@ -52,6 +53,7 @@
 				"nocompletingjobs": "",
 				"nodateselected": "No se ha seleccionado ninguna fecha.",
 				"priorappointments": "Nombramientos previos",
+				"reminder": "",
 				"scheduledfor": "Cita programada para:",
 				"smartscheduling": "",
 				"suggesteddates": ""
@@ -82,6 +84,24 @@
 				"values": ""
 			}
 		},
+		"audit_trail": {
+			"messages": {
+				"billposted": "",
+				"billupdated": "",
+				"jobassignmentchange": "",
+				"jobassignmentremoved": "",
+				"jobchecklist": "",
+				"jobconverted": "",
+				"jobfieldchanged": "",
+				"jobimported": "",
+				"jobinproductionchange": "",
+				"jobmodifylbradj": "",
+				"jobspartsorder": "",
+				"jobspartsreturn": "",
+				"jobstatuschange": "",
+				"jobsupplement": ""
+			}
+		},
 		"billlines": {
 			"actions": {
 				"newline": ""
@@ -199,6 +219,7 @@
 					"label": ""
 				},
 				"appt_length": "",
+				"attach_pdf_to_email": "",
 				"bill_federal_tax_rate": "",
 				"bill_local_tax_rate": "",
 				"bill_state_tax_rate": "",
@@ -425,6 +446,7 @@
 					"production_statuses": ""
 				},
 				"target_touchtime": "",
+				"tt_allow_post_to_invoiced": "",
 				"use_fippa": "",
 				"website": "",
 				"zip_post": ""
@@ -490,6 +512,7 @@
 			},
 			"labels": {
 				"addtoproduction": "",
+				"allow_text_message": "",
 				"checklist": "",
 				"printpack": "",
 				"removefromproduction": ""
@@ -742,6 +765,7 @@
 				"attachments": "",
 				"documents": "",
 				"generatingemail": "",
+				"pdfcopywillbeattached": "",
 				"preview": ""
 			},
 			"successes": {
@@ -855,6 +879,7 @@
 				"message": "",
 				"monday": "",
 				"na": "N / A",
+				"newpassword": "",
 				"no": "",
 				"nointernet": "",
 				"nointernet_sub": "",
@@ -875,6 +900,7 @@
 				"sendagain": "",
 				"sendby": "",
 				"signin": "",
+				"sms": "",
 				"sub_status": {
 					"expired": ""
 				},
@@ -1034,6 +1060,9 @@
 				"intake": "",
 				"manualnew": "",
 				"mark": "",
+				"markasexported": "",
+				"markpstexempt": "",
+				"markpstexemptconfirm": "",
 				"postbills": "Contabilizar facturas",
 				"printCenter": "Centro de impresión",
 				"recalculate": "",
@@ -1042,6 +1071,7 @@
 				"schedule": "Programar",
 				"sendcsi": "",
 				"sync": "",
+				"uninvoice": "",
 				"unvoid": "",
 				"viewchecklist": "",
 				"viewdetail": ""
@@ -1223,6 +1253,7 @@
 				"servicecar": "Auto de servicio",
 				"servicing_dealer": "Distribuidor de servicio",
 				"servicing_dealer_contact": "Servicio Contacto con el concesionario",
+				"special_coverage_policy": "Política de cobertura especial",
 				"specialcoveragepolicy": "Política de cobertura especial",
 				"state_tax_rate": "",
 				"status": "Estado del trabajo",
@@ -1260,6 +1291,7 @@
 				"additionaltotal": "",
 				"adjustmentrate": "",
 				"adjustments": "",
+				"adminwarning": "",
 				"allocations": "",
 				"alreadyclosed": "",
 				"appointmentconfirmation": "¿Enviar confirmación al cliente?",
@@ -1312,6 +1344,7 @@
 					"waived": ""
 				},
 				"deleteconfirm": "",
+				"deletedelivery": "",
 				"deleteintake": "",
 				"deliverchecklist": "",
 				"difference": "",
@@ -1805,6 +1838,7 @@
 					"depreciation": "",
 					"other": "",
 					"ponumber": "",
+					"refnumber": "",
 					"sendtype": "",
 					"state": "",
 					"zip": ""
@@ -1830,6 +1864,8 @@
 				"invoice_total_payable": "",
 				"job_costing_ro": "",
 				"job_notes": "",
+				"key_tag": "",
+				"paint_grid": "",
 				"parts_label_single": "",
 				"parts_list": "",
 				"parts_order": "",
@@ -1844,6 +1880,7 @@
 				"qc_sheet": "",
 				"ro_totals": "",
 				"ro_with_description": "",
+				"stolen_recovery_checklist": "",
 				"supplement_request": "",
 				"thank_you_ro": "",
 				"thirdpartypayer": "",
@@ -1945,12 +1982,15 @@
 					"bills": "",
 					"exportlogs": "",
 					"jobs": "",
+					"parts_orders": "",
 					"payments": "",
+					"scoreboard": "",
 					"timetickets": ""
 				},
 				"vendor": ""
 			},
 			"templates": {
+				"anticipated_revenue": "",
 				"attendance_detail": "",
 				"attendance_employee": "",
 				"attendance_summary": "",
@@ -1960,6 +2000,7 @@
 				"export_payables": "",
 				"export_payments": "",
 				"export_receivables": "",
+				"gsr_by_csr": "",
 				"gsr_by_delivery_date": "",
 				"gsr_by_estimator": "",
 				"gsr_by_exported_date": "",
@@ -1969,21 +2010,29 @@
 				"gsr_by_ro": "",
 				"gsr_labor_only": "",
 				"hours_sold_detail_closed": "",
+				"hours_sold_detail_closed_csr": "",
 				"hours_sold_detail_closed_ins_co": "",
 				"hours_sold_detail_open": "",
+				"hours_sold_detail_open_csr": "",
 				"hours_sold_detail_open_ins_co": "",
 				"hours_sold_summary_closed": "",
+				"hours_sold_summary_closed_csr": "",
 				"hours_sold_summary_closed_ins_co": "",
 				"hours_sold_summary_open": "",
+				"hours_sold_summary_open_csr": "",
 				"hours_sold_summary_open_ins_co": "",
+				"job_costing_ro_csr": "",
 				"job_costing_ro_date_detail": "",
 				"job_costing_ro_date_summary": "",
 				"job_costing_ro_estimator": "",
 				"job_costing_ro_ins_co": "",
+				"lag_time": "",
 				"open_orders": "",
+				"open_orders_csr": "",
 				"open_orders_estimator": "",
 				"open_orders_ins_co": "",
 				"parts_backorder": "",
+				"parts_not_recieved": "",
 				"payments_by_date": "",
 				"payments_by_date_type": "",
 				"production_by_csr": "",
@@ -2000,6 +2049,8 @@
 				"purchases_grouped_by_vendor_detailed": "",
 				"purchases_grouped_by_vendor_summary": "",
 				"schedule": "",
+				"scoreboard_detail": "",
+				"scoreboard_summary": "",
 				"supplement_ratio_ins_co": "",
 				"thank_you_date": "",
 				"timetickets": "",
@@ -2206,6 +2257,7 @@
 		},
 		"user": {
 			"actions": {
+				"changepassword": "",
 				"signout": "desconectar",
 				"updateprofile": "Actualización del perfil"
 			},
@@ -2220,6 +2272,9 @@
 			},
 			"labels": {
 				"actions": ""
+			},
+			"successess": {
+				"passwordchanged": ""
 			}
 		},
 		"vehicles": {

client/src/translations/fr/common.json

@@ -37,6 +37,7 @@
 			"fields": {
 				"alt_transport": "",
 				"color": "",
+				"note": "",
 				"time": "",
 				"title": "Titre"
 			},
@@ -52,6 +53,7 @@
 				"nocompletingjobs": "",
 				"nodateselected": "Aucune date n'a été sélectionnée.",
 				"priorappointments": "Rendez-vous précédents",
+				"reminder": "",
 				"scheduledfor": "Rendez-vous prévu pour:",
 				"smartscheduling": "",
 				"suggesteddates": ""
@@ -82,6 +84,24 @@
 				"values": ""
 			}
 		},
+		"audit_trail": {
+			"messages": {
+				"billposted": "",
+				"billupdated": "",
+				"jobassignmentchange": "",
+				"jobassignmentremoved": "",
+				"jobchecklist": "",
+				"jobconverted": "",
+				"jobfieldchanged": "",
+				"jobimported": "",
+				"jobinproductionchange": "",
+				"jobmodifylbradj": "",
+				"jobspartsorder": "",
+				"jobspartsreturn": "",
+				"jobstatuschange": "",
+				"jobsupplement": ""
+			}
+		},
 		"billlines": {
 			"actions": {
 				"newline": ""
@@ -199,6 +219,7 @@
 					"label": ""
 				},
 				"appt_length": "",
+				"attach_pdf_to_email": "",
 				"bill_federal_tax_rate": "",
 				"bill_local_tax_rate": "",
 				"bill_state_tax_rate": "",
@@ -425,6 +446,7 @@
 					"production_statuses": ""
 				},
 				"target_touchtime": "",
+				"tt_allow_post_to_invoiced": "",
 				"use_fippa": "",
 				"website": "",
 				"zip_post": ""
@@ -490,6 +512,7 @@
 			},
 			"labels": {
 				"addtoproduction": "",
+				"allow_text_message": "",
 				"checklist": "",
 				"printpack": "",
 				"removefromproduction": ""
@@ -742,6 +765,7 @@
 				"attachments": "",
 				"documents": "",
 				"generatingemail": "",
+				"pdfcopywillbeattached": "",
 				"preview": ""
 			},
 			"successes": {
@@ -855,6 +879,7 @@
 				"message": "",
 				"monday": "",
 				"na": "N / A",
+				"newpassword": "",
 				"no": "",
 				"nointernet": "",
 				"nointernet_sub": "",
@@ -875,6 +900,7 @@
 				"sendagain": "",
 				"sendby": "",
 				"signin": "",
+				"sms": "",
 				"sub_status": {
 					"expired": ""
 				},
@@ -1034,6 +1060,9 @@
 				"intake": "",
 				"manualnew": "",
 				"mark": "",
+				"markasexported": "",
+				"markpstexempt": "",
+				"markpstexemptconfirm": "",
 				"postbills": "Poster des factures",
 				"printCenter": "Centre d'impression",
 				"recalculate": "",
@@ -1042,6 +1071,7 @@
 				"schedule": "Programme",
 				"sendcsi": "",
 				"sync": "",
+				"uninvoice": "",
 				"unvoid": "",
 				"viewchecklist": "",
 				"viewdetail": ""
@@ -1223,6 +1253,7 @@
 				"servicecar": "Voiture de service",
 				"servicing_dealer": "Concessionnaire",
 				"servicing_dealer_contact": "Contacter le concessionnaire",
+				"special_coverage_policy": "Politique de couverture spéciale",
 				"specialcoveragepolicy": "Politique de couverture spéciale",
 				"state_tax_rate": "",
 				"status": "Statut de l'emploi",
@@ -1260,6 +1291,7 @@
 				"additionaltotal": "",
 				"adjustmentrate": "",
 				"adjustments": "",
+				"adminwarning": "",
 				"allocations": "",
 				"alreadyclosed": "",
 				"appointmentconfirmation": "Envoyer une confirmation au client?",
@@ -1312,6 +1344,7 @@
 					"waived": ""
 				},
 				"deleteconfirm": "",
+				"deletedelivery": "",
 				"deleteintake": "",
 				"deliverchecklist": "",
 				"difference": "",
@@ -1805,6 +1838,7 @@
 					"depreciation": "",
 					"other": "",
 					"ponumber": "",
+					"refnumber": "",
 					"sendtype": "",
 					"state": "",
 					"zip": ""
@@ -1830,6 +1864,8 @@
 				"invoice_total_payable": "",
 				"job_costing_ro": "",
 				"job_notes": "",
+				"key_tag": "",
+				"paint_grid": "",
 				"parts_label_single": "",
 				"parts_list": "",
 				"parts_order": "",
@@ -1844,6 +1880,7 @@
 				"qc_sheet": "",
 				"ro_totals": "",
 				"ro_with_description": "",
+				"stolen_recovery_checklist": "",
 				"supplement_request": "",
 				"thank_you_ro": "",
 				"thirdpartypayer": "",
@@ -1945,12 +1982,15 @@
 					"bills": "",
 					"exportlogs": "",
 					"jobs": "",
+					"parts_orders": "",
 					"payments": "",
+					"scoreboard": "",
 					"timetickets": ""
 				},
 				"vendor": ""
 			},
 			"templates": {
+				"anticipated_revenue": "",
 				"attendance_detail": "",
 				"attendance_employee": "",
 				"attendance_summary": "",
@@ -1960,6 +2000,7 @@
 				"export_payables": "",
 				"export_payments": "",
 				"export_receivables": "",
+				"gsr_by_csr": "",
 				"gsr_by_delivery_date": "",
 				"gsr_by_estimator": "",
 				"gsr_by_exported_date": "",
@@ -1969,21 +2010,29 @@
 				"gsr_by_ro": "",
 				"gsr_labor_only": "",
 				"hours_sold_detail_closed": "",
+				"hours_sold_detail_closed_csr": "",
 				"hours_sold_detail_closed_ins_co": "",
 				"hours_sold_detail_open": "",
+				"hours_sold_detail_open_csr": "",
 				"hours_sold_detail_open_ins_co": "",
 				"hours_sold_summary_closed": "",
+				"hours_sold_summary_closed_csr": "",
 				"hours_sold_summary_closed_ins_co": "",
 				"hours_sold_summary_open": "",
+				"hours_sold_summary_open_csr": "",
 				"hours_sold_summary_open_ins_co": "",
+				"job_costing_ro_csr": "",
 				"job_costing_ro_date_detail": "",
 				"job_costing_ro_date_summary": "",
 				"job_costing_ro_estimator": "",
 				"job_costing_ro_ins_co": "",
+				"lag_time": "",
 				"open_orders": "",
+				"open_orders_csr": "",
 				"open_orders_estimator": "",
 				"open_orders_ins_co": "",
 				"parts_backorder": "",
+				"parts_not_recieved": "",
 				"payments_by_date": "",
 				"payments_by_date_type": "",
 				"production_by_csr": "",
@@ -2000,6 +2049,8 @@
 				"purchases_grouped_by_vendor_detailed": "",
 				"purchases_grouped_by_vendor_summary": "",
 				"schedule": "",
+				"scoreboard_detail": "",
+				"scoreboard_summary": "",
 				"supplement_ratio_ins_co": "",
 				"thank_you_date": "",
 				"timetickets": "",
@@ -2206,6 +2257,7 @@
 		},
 		"user": {
 			"actions": {
+				"changepassword": "",
 				"signout": "Déconnexion",
 				"updateprofile": "Mettre à jour le profil"
 			},
@@ -2220,6 +2272,9 @@
 			},
 			"labels": {
 				"actions": ""
+			},
+			"successess": {
+				"passwordchanged": ""
 			}
 		},
 		"vehicles": {

client/src/utils/AuditTrailMappings.js

@@ -0,0 +1,31 @@
+import i18n from "i18next";
+
+const AuditTrailMapping = {
+  jobstatuschange: (status) =>
+    i18n.t("audit_trail.messages.jobstatuschange", { status }),
+  jobsupplement: () => i18n.t("audit_trail.messages.jobsupplement"),
+  jobimported: () => i18n.t("audit_trail.messages.jobimported"),
+  jobconverted: (ro_number) =>
+    i18n.t("audit_trail.messages.jobconverted", { ro_number }),
+  jobfieldchange: (field, value) =>
+    i18n.t("audit_trail.messages.jobfieldchanged", { field, value }),
+  jobspartsorder: (order_number) =>
+    i18n.t("audit_trail.messages.jobspartsorder", { order_number }),
+  jobspartsreturn: (order_number) =>
+    i18n.t("audit_trail.messages.jobspartsreturn", { order_number }),
+  jobmodifylbradj: () => i18n.t("audit_trail.messages.jobmodifylbradj", {}),
+  billposted: (invoice_number) =>
+    i18n.t("audit_trail.messages.billposted", { invoice_number }),
+  billupdated: (invoice_number) =>
+    i18n.t("audit_trail.messages.billupdated", { invoice_number }),
+  jobassignmentchange: (operation, name) =>
+    i18n.t("audit_trail.messages.jobassignmentchange", { operation, name }),
+  jobassignmentremoved: (operation) =>
+    i18n.t("audit_trail.messages.jobassignmentremoved", { operation }),
+  jobinproductionchange: (inproduction) =>
+    i18n.t("audit_trail.messages.jobinproductionchange", { inproduction }),
+  jobchecklist: (type, inproduction, status) =>
+    i18n.t("audit_trail.messages.jobchecklist", { type, inproduction, status }),
+};
+
+export default AuditTrailMapping;

client/src/utils/GraphQLClient.js

@@ -6,7 +6,6 @@ import { WebSocketLink } from "@apollo/client/link/ws";
 import { getMainDefinition } from "@apollo/client/utilities";
 //import { split } from "apollo-link";
 import apolloLogger from "apollo-link-logger";
-import axios from "axios";
 import { auth } from "../firebase/firebase.utils";
 import errorLink from "../graphql/apollo-error-handling";
 
@@ -48,7 +47,7 @@ const roundTripLink = new ApolloLink((operation, forward) => {
 });
 
 const TrackExecutionTime = async (operationName, time) => {
-  await axios.post("/ioevent", { operationName, time, dbevent: true });
+  //await axios.post("/ioevent", { operationName, time, dbevent: true });
 };
 
 const subscriptionMiddleware = {

client/src/utils/RenderTemplate.js

@@ -8,6 +8,7 @@ import { setEmailOptions } from "../redux/email/email.actions";
 import { store } from "../redux/store";
 import client from "../utils/GraphQLClient";
 import { TemplateList } from "./TemplateConstants";
+import _ from "lodash";
 const server = process.env.REACT_APP_REPORTS_SERVER_URL;
 jsreport.serverUrl = server;
 
@@ -39,8 +40,10 @@ export default async function RenderTemplate(
       offset: moment().utcOffset(),
     },
   };
+
   try {
     const render = await jsreport.renderAsync(reportRequest);
+
     if (!renderAsHtml) {
       render.download(
         (Templates[templateObject.name] &&
@@ -48,8 +51,21 @@ export default async function RenderTemplate(
           ""
       );
     } else {
+      let pdf;
+      if (bodyshop.attach_pdf_to_email) {
+        const pdfRequest = _.cloneDeep(reportRequest);
+        pdfRequest.template.recipe = "chrome-pdf";
+        const pdfRender = await jsreport.renderAsync(pdfRequest);
+        pdf = pdfRender.toDataURI();
+      }
       return new Promise((resolve, reject) => {
-        resolve(render.toString());
+        resolve({
+          pdf,
+          filename:
+            Templates[templateObject.name] &&
+            Templates[templateObject.name].title,
+          html: render.toString(),
+        });
       });
     }
   } catch (error) {

client/src/utils/TemplateConstants.js

@@ -69,6 +69,14 @@ export const TemplateList = (type, context) => {
             disabled: false,
             group: "pre",
           },
+          stolen_recovery_checklist: {
+            title: i18n.t("printcenter.jobs.stolen_recovery_checklist"),
+            description: "All Jobs Notes",
+            subject: i18n.t("printcenter.jobs.stolen_recovery_checklist"),
+            key: "stolen_recovery_checklist",
+            disabled: false,
+            group: "pre",
+          },
           vehicle_check_in: {
             title: i18n.t("printcenter.jobs.vehicle_check_in"),
             description: "All Jobs Notes",
@@ -150,6 +158,22 @@ export const TemplateList = (type, context) => {
             disabled: false,
             group: "ro",
           },
+          key_tag: {
+            title: i18n.t("printcenter.jobs.key_tag"),
+            description: "All Jobs Notes",
+            subject: i18n.t("printcenter.jobs.key_tag"),
+            key: "key_tag",
+            disabled: false,
+            group: "ro",
+          },
+          paint_grid: {
+            title: i18n.t("printcenter.jobs.paint_grid"),
+            description: "All Jobs Notes",
+            subject: i18n.t("printcenter.jobs.paint_grid"),
+            key: "paint_grid",
+            disabled: false,
+            group: "ro",
+          },
           worksheet_by_line_number: {
             title: i18n.t("printcenter.jobs.worksheet_by_line_number"),
             description: "All Jobs Notes",
@@ -728,6 +752,67 @@ export const TemplateList = (type, context) => {
               field: i18n.t("jobs.fields.date_open"),
             },
           },
+
+          hours_sold_detail_closed_csr: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_detail_closed_csr"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_detail_closed_csr"
+            ),
+            key: "hours_sold_detail_closed_csr",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+          },
+          hours_sold_detail_open_csr: {
+            title: i18n.t("reportcenter.templates.hours_sold_detail_open_csr"),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_detail_open_csr"
+            ),
+            key: "hours_sold_detail_open_csr",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+          },
+          hours_sold_summary_closed_csr: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_summary_closed_csr"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_summary_closed_csr"
+            ),
+            key: "hours_sold_summary_closed_csr",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+          },
+          hours_sold_summary_open_csr: {
+            title: i18n.t("reportcenter.templates.hours_sold_summary_open_csr"),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_summary_open_csr"
+            ),
+            key: "hours_sold_summary_open_csr",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+          },
           estimator_detail: {
             title: i18n.t("reportcenter.templates.estimator_detail"),
             description: "",
@@ -790,6 +875,18 @@ export const TemplateList = (type, context) => {
               field: i18n.t("jobs.fields.date_invoiced"),
             },
           },
+          job_costing_ro_csr: {
+            title: i18n.t("reportcenter.templates.job_costing_ro_csr"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.job_costing_ro_csr"),
+            key: "job_costing_ro_csr",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+          },
           job_costing_ro_ins_co: {
             title: i18n.t("reportcenter.templates.job_costing_ro_ins_co"),
             description: "",
@@ -840,6 +937,18 @@ export const TemplateList = (type, context) => {
               field: i18n.t("jobs.fields.date_open"),
             },
           },
+          gsr_by_csr: {
+            title: i18n.t("reportcenter.templates.gsr_by_csr"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.gsr_by_csr"),
+            key: "gsr_by_csr",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+          },
           gsr_by_make: {
             title: i18n.t("reportcenter.templates.gsr_by_make"),
             description: "",
@@ -949,6 +1058,18 @@ export const TemplateList = (type, context) => {
               field: i18n.t("jobs.fields.date_open"),
             },
           },
+          open_orders_csr: {
+            title: i18n.t("reportcenter.templates.open_orders_csr"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.open_orders_csr"),
+            key: "open_orders_csr",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+          },
           open_orders_estimator: {
             title: i18n.t("reportcenter.templates.open_orders_estimator"),
             description: "",
@@ -1069,6 +1190,66 @@ export const TemplateList = (type, context) => {
               field: i18n.t("jobs.fields.date_open"),
             },
           },
+          lag_time: {
+            title: i18n.t("reportcenter.templates.lag_time"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.lag_time"),
+            key: "lag_time",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+          },
+          parts_not_recieved: {
+            title: i18n.t("reportcenter.templates.parts_not_recieved"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.parts_not_recieved"),
+            key: "parts_not_recieved",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.parts_orders"),
+              field: i18n.t("parts_orders.fields.order_date"),
+            },
+          },
+          scoreboard_detail: {
+            title: i18n.t("reportcenter.templates.scoreboard_detail"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.scoreboard_detail"),
+            key: "scoreboard_detail",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.scoreboard"),
+              field: i18n.t("scoreboard.fields.date"),
+            },
+          },
+          scoreboard_summary: {
+            title: i18n.t("reportcenter.templates.scoreboard_summary"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.scoreboard_summary"),
+            key: "scoreboard_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.scoreboard"),
+              field: i18n.t("scoreboard.fields.date"),
+            },
+          },
+          anticipated_revenue: {
+            title: i18n.t("reportcenter.templates.anticipated_revenue"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.anticipated_revenue"),
+            key: "anticipated_revenue",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.scheduled_completion"), // Also date invoice.
+            },
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

hasura/migrations/1625768789569_run_sql_migration/down.yaml

@@ -0,0 +1 @@
+[]

hasura/migrations/1625768789569_run_sql_migration/up.yaml

@@ -0,0 +1,11 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: "CREATE OR REPLACE FUNCTION public.search_payments(search text)\n RETURNS
+      SETOF payments\n LANGUAGE plpgsql\n STABLE\nAS $function$\n\nBEGIN\n  if search
+      = '' then\n    return query select * from payments ;\n  else \n    return query
+      SELECT\n  p.*\nFROM\n  payments p, jobs j\nWHERE\np.jobid = j.id AND\n(\nsearch
+      <% p.paymentnum OR\nsearch <% j.ownr_fn OR\nsearch <% j.ownr_ln OR\nsearch <%
+      j.ownr_co_nm OR\nsearch <% j.ro_number OR\n  search <% (p.payer) OR\n  search
+      <% (p.transactionid) OR\n  search <% (p.memo));\n  end if;\n\n\tEND\n$function$;"
+  type: run_sql

hasura/migrations/1626374103197_alter_table_public_vehicles_drop_constraint_vehicles_v_vin_shopid_key/down.yaml

@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: alter table "public"."vehicles" add constraint "vehicles_v_vin_shopid_key"
+      unique ("v_vin", "shopid");
+  type: run_sql

hasura/migrations/1626374103197_alter_table_public_vehicles_drop_constraint_vehicles_v_vin_shopid_key/up.yaml

@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: alter table "public"."vehicles" drop constraint "vehicles_v_vin_shopid_key";
+  type: run_sql

hasura/migrations/1626795754549_alter_table_public_bodyshops_add_column_attach_pdf_to_email/down.yaml

@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "attach_pdf_to_email";
+  type: run_sql

hasura/migrations/1626795754549_alter_table_public_bodyshops_add_column_attach_pdf_to_email/up.yaml

@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "attach_pdf_to_email" boolean
+      NOT NULL DEFAULT False;
+  type: run_sql

hasura/migrations/1626795768315_update_permission_user_public_table_bodyshops/down.yaml

@@ -0,0 +1,87 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - accountingconfig
+      - address1
+      - address2
+      - appt_alt_transport
+      - appt_colors
+      - appt_length
+      - bill_tax_rates
+      - cdk_dealerid
+      - city
+      - country
+      - created_at
+      - default_adjustment_rate
+      - deliverchecklist
+      - email
+      - enforce_class
+      - enforce_referral
+      - features
+      - federal_tax_id
+      - id
+      - imexshopid
+      - inhousevendorid
+      - insurance_vendor_id
+      - intakechecklist
+      - jc_hourly_rates
+      - jobsizelimit
+      - logo_img_path
+      - md_categories
+      - md_ccc_rates
+      - md_classes
+      - md_hour_split
+      - md_ins_cos
+      - md_jobline_presets
+      - md_labor_rates
+      - md_messaging_presets
+      - md_notes_presets
+      - md_order_statuses
+      - md_parts_locations
+      - md_payment_types
+      - md_rbac
+      - md_referral_sources
+      - md_responsibility_centers
+      - md_ro_statuses
+      - messagingservicesid
+      - phone
+      - prodtargethrs
+      - production_config
+      - region_config
+      - schedule_end_time
+      - schedule_start_time
+      - scoreboard_target
+      - shopname
+      - shoprates
+      - speedprint
+      - ssbuckets
+      - state
+      - state_tax_id
+      - stripe_acct_id
+      - sub_status
+      - target_touchtime
+      - template_header
+      - textid
+      - updated_at
+      - use_fippa
+      - website
+      - workingdays
+      - zip_post
+      computed_fields: []
+      filter:
+        associations:
+          user:
+            authid:
+              _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_select_permission