Merged in release/2023-11-24 (pull request #1076)

IO-2438 Remove unneeded imports

.circleci/config.yml

@@ -8,13 +8,13 @@ orbs:
 jobs:
   api-deploy:
     docker:
-      - image: "cimg/base:stable"
+      - image: cimg/node:18.18.2
     steps:
       - checkout
       - eb/setup
       - run:
           command: |
-            eb init imex-online-production-api -r ca-central-1 -p "Node.js 16 running on 64bit Amazon Linux 2"
+            eb init imex-online-production-api -r ca-central-1 -p "Node.js 18 running on 64bit Amazon Linux 2"
             eb status --verbose
             eb deploy
             eb status

.gitignore

@@ -117,4 +117,6 @@ logs/oAuthClient-log.log
 
 .node-persist/**
 
-/*.env.*
+/*.env.*
+.idea/*
+.idea

.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -364,6 +364,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>unblock</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>viewjob</name>
                                         <definition_loaded>false</definition_loaded>
@@ -17755,6 +17776,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>reports</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>required</name>
                                         <definition_loaded>false</definition_loaded>
@@ -19472,6 +19514,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>paymentnum</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>paymenttype</name>
                                         <definition_loaded>false</definition_loaded>
@@ -24075,6 +24138,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>dms_model_override</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>dms_unsold</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -37301,6 +37385,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>inserting</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                 </children>
                             </folder_node>
                             <folder_node>
@@ -43239,6 +43344,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>hours_sold_detail_closed_estimator</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>hours_sold_detail_closed_ins_co</name>
                                         <definition_loaded>false</definition_loaded>
@@ -43323,6 +43449,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>hours_sold_detail_open_estimator</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>hours_sold_detail_open_ins_co</name>
                                         <definition_loaded>false</definition_loaded>
@@ -43407,6 +43554,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>hours_sold_summary_closed_estimator</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>hours_sold_summary_closed_ins_co</name>
                                         <definition_loaded>false</definition_loaded>
@@ -43491,6 +43659,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>hours_sold_summary_open_estimator</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>hours_sold_summary_open_ins_co</name>
                                         <definition_loaded>false</definition_loaded>
@@ -43827,6 +44016,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>open_orders_referral</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>open_orders_specific_csr</name>
                                         <definition_loaded>false</definition_loaded>
@@ -46206,6 +46416,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>created_by</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>date</name>
                                         <definition_loaded>false</definition_loaded>

client/package.json

@@ -7,7 +7,7 @@
     "@apollo/client": "^3.7.9",
     "@asseinfo/react-kanban": "^2.2.0",
     "@craco/craco": "^7.0.0",
-    "@fingerprintjs/fingerprintjs": "^3.3.3",
+    "@fingerprintjs/fingerprintjs": "^3.4.2",
     "@jsreport/browser-client": "^3.1.0",
     "@sentry/react": "^7.40.0",
     "@sentry/tracing": "^7.40.0",
@@ -89,8 +89,8 @@
     "analyze": "source-map-explorer 'build/static/js/*.js'",
     "start": "craco start",
     "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
-    "build:test": "env-cmd -f .env.test yarn run build",
-    "build-deploy:test": "yarn run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
+    "build:test": "env-cmd -f .env.test npm run build",
+    "build-deploy:test": "npm run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
     "buildcra": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
     "test": "cypress open",
     "eject": "react-scripts eject",

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

@@ -37,8 +37,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, billid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, billid, operation })),
 });
 
 const Templates = TemplateList("job_special");
@@ -143,7 +143,7 @@ function BillEnterModalContainer({
           },
         ],
       },
-      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
+      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID", "GET_JOB_BY_PK"],
     });
 
     const adjKeys = Object.keys(adjustmentsToInsert);
@@ -316,7 +316,9 @@ function BillEnterModalContainer({
     insertAuditTrail({
       jobid: values.jobid,
       billid: billId,
-      operation: AuditTrailMapping.billposted(remainingValues.invoice_number),
+      operation: AuditTrailMapping.billposted(
+        r1.data.insert_bills.returning[0].invoice_number
+      ),
     });
 
     if (enterAgain) {

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

@@ -50,6 +50,7 @@ export function BillFormComponent({
   job,
   loadOutstandingReturns,
   loadInventory,
+  preferredMake,
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
@@ -185,6 +186,7 @@ export function BillFormComponent({
           <VendorSearchSelect
             disabled={disabled}
             options={vendorAutoCompleteOptions}
+            preferredMake={preferredMake}
             onSelect={handleVendorSelect}
           />
         </Form.Item>

client/src/components/bill-form/bill-form.container.jsx

@@ -1,16 +1,16 @@
 import { useLazyQuery, useQuery } from "@apollo/client";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { QUERY_OUTSTANDING_INVENTORY } from "../../graphql/inventory.queries";
 import { GET_JOB_LINES_TO_ENTER_BILL } from "../../graphql/jobs-lines.queries";
+import { QUERY_UNRECEIVED_LINES } from "../../graphql/parts-orders.queries";
 import { SEARCH_VENDOR_AUTOCOMPLETE } from "../../graphql/vendors.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import BillFormComponent from "./bill-form.component";
 import BillCmdReturnsTableComponent from "../bill-cm-returns-table/bill-cm-returns-table.component";
-import { QUERY_UNRECEIVED_LINES } from "../../graphql/parts-orders.queries";
 import BillInventoryTable from "../bill-inventory-table/bill-inventory-table.component";
-import { QUERY_OUTSTANDING_INVENTORY } from "../../graphql/inventory.queries";
-import { useTreatments } from "@splitsoftware/splitio-react";
+import BillFormComponent from "./bill-form.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -59,6 +59,7 @@ export function BillFormContainer({
         disableInvNumber={disableInvNumber}
         loadOutstandingReturns={loadOutstandingReturns}
         loadInventory={loadInventory}
+        preferredMake={lineData ? lineData.jobs_by_pk.v_make_desc : null}
       />
       {!billEdit && (
         <BillCmdReturnsTableComponent

client/src/components/card-payment-modal/card-payment-modal.component..jsx

@@ -1,12 +1,15 @@
-import { useMutation, useQuery } from "@apollo/client";
+import { DeleteFilled } from "@ant-design/icons";
+import { useLazyQuery, useMutation } from "@apollo/client";
 import {
   Button,
   Card,
+  Col,
   Form,
   Input,
-  InputNumber,
   Row,
+  Space,
   Spin,
+  Statistic,
   notification,
 } from "antd";
 import axios from "axios";
@@ -17,7 +20,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import {
   INSERT_PAYMENT_RESPONSE,
-  QUERY_RO_AND_OWNER_BY_JOB_PK,
+  QUERY_RO_AND_OWNER_BY_JOB_PKS,
 } from "../../graphql/payment_response.queries";
 import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
@@ -25,9 +28,8 @@ import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectCardPayment } from "../../redux/modals/modals.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import DataLabel from "../data-label/data-label.component";
+import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
 import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
-import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 const mapStateToProps = createStructuredSelector({
   cardPaymentModal: selectCardPayment,
@@ -49,18 +51,21 @@ const CardPaymentModalComponent = ({
   const { context } = cardPaymentModal;
 
   const [form] = Form.useForm();
-  const amount = Form.useWatch("amount", form);
-  const jobid = Form.useWatch("jobid", form);
+
   const [loading, setLoading] = useState(false);
   const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
   const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
   const { t } = useTranslation();
 
-  const { data, refetch } = useQuery(QUERY_RO_AND_OWNER_BY_JOB_PK, {
-    variables: { jobid: context?.jobid ?? "" },
-    skip: !context?.jobid,
-  });
+  const [, { data, refetch, queryLoading }] = useLazyQuery(
+    QUERY_RO_AND_OWNER_BY_JOB_PKS,
+    {
+      variables: { jobids: [context.jobid] },
+      skip: true,
+    }
+  );
 
+  console.log("🚀 ~ file: card-payment-modal.component..jsx:61 ~ data:", data);
   //Initialize the intellipay window.
   const SetIntellipayCallbackFunctions = () => {
     console.log("*** Set IntelliPay callback functions.");
@@ -76,69 +81,68 @@ const CardPaymentModalComponent = ({
 
     window.intellipay.runOnNonApproval(async function (response) {
       // Mutate unsuccessful payment
+
+      const { payments } = form.getFieldsValue();
+
       await insertPaymentResponse({
         variables: {
-          paymentResponse: {
-            amount: response.amount,
+          paymentResponse: payments.map((payment) => ({
+            amount: payment.amount,
             bodyshopid: bodyshop.id,
-            jobid: jobid || context.jobid,
+            jobid: payment.jobid,
             declinereason: response.declinereason,
             ext_paymentid: response.paymentid.toString(),
             successful: false,
             response,
-          },
+          })),
         },
       });
-      insertAuditTrail({
-        jobid: jobid || context?.jobid,
-        operation: AuditTrailMapping.failedpayment(),
-      });
+
+      payments.forEach((payment) =>
+        insertAuditTrail({
+          jobid: payment.jobid,
+          operation: AuditTrailMapping.failedpayment(),
+        })
+      );
     });
   };
 
   const handleFinish = async (values) => {
     try {
-      const paymentResult = await insertPayment({
+      await insertPayment({
         variables: {
-          paymentInput: {
-            amount: values.amount,
+          paymentInput: values.payments.map((payment) => ({
+            amount: payment.amount,
             transactionid: (values.paymentResponse.paymentid || "").toString(),
             payer: t("payments.labels.customer"),
             type: values.paymentResponse.cardbrand,
-            jobid: values.jobid,
+            jobid: payment.jobid,
             date: moment(Date.now()),
-          },
+            payment_responses: {
+              data: [
+                {
+                  amount: payment.amount,
+                  bodyshopid: bodyshop.id,
+
+                  jobid: payment.jobid,
+                  declinereason: values.paymentResponse.declinereason,
+                  ext_paymentid: values.paymentResponse.paymentid.toString(),
+                  successful: true,
+                  response: values.paymentResponse,
+                },
+              ],
+            },
+          })),
         },
         refetchQueries: ["GET_JOB_BY_PK"],
-        update(cache, { data }) {
-          cache.modify({
-            id: cache.identify({ id: values.jobid, __typename: "jobs" }),
-            fields: {
-              payments(cachedPayments) {
-                return [...data.insert_payments.returning, ...cachedPayments];
-              },
-            },
-          });
-        },
-      });
-
-      await insertPaymentResponse({
-        variables: {
-          paymentResponse: {
-            amount: values.amount,
-            bodyshopid: bodyshop.id,
-            paymentid: paymentResult.data.insert_payments.returning[0].id,
-            jobid: values.jobid,
-            declinereason: values.paymentResponse.declinereason,
-            ext_paymentid: values.paymentResponse.paymentid.toString(),
-            successful: true,
-            response: values.paymentResponse,
-          },
-        },
       });
       toggleModalVisible();
     } catch (error) {
       console.error(error);
+      notification.open({
+        type: "error",
+        message: t("payments.errors.inserting", { error: error.message }),
+      });
     } finally {
       setLoading(false);
     }
@@ -146,9 +150,16 @@ const CardPaymentModalComponent = ({
 
   const handleIntelliPayCharge = async () => {
     setLoading(true);
-    try {
-      console.warn("*** Window.Intellipay", !!window.intellipay);
 
+    //Validate
+    try {
+      await form.validateFields();
+    } catch (error) {
+      setLoading(false);
+      return;
+    }
+
+    try {
       const response = await axios.post("/intellipay/lightbox_credentials", {
         bodyshop,
         refresh: !!window.intellipay,
@@ -182,93 +193,175 @@ const CardPaymentModalComponent = ({
         <Form
           onFinish={handleFinish}
           form={form}
-          initialValues={{ jobid: context?.jobid }}
+          layout="vertical"
+          initialValues={{
+            payments: context.jobid ? [{ jobid: context.jobid }] : [],
+          }}
         >
-          <LayoutFormRow grow noDivider>
-            <Form.Item
-              name="jobid"
-              label={t("bills.fields.ro_number")}
-              rules={[
-                {
-                  required: true,
-                  // message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <JobSearchSelectComponent
-                disabled={context?.jobid}
-                notExported={false}
-                clm_no
-                onChange={(e) => {
-                  refetch({ jobid: e });
-                }}
-              />
-            </Form.Item>
-          </LayoutFormRow>
+          <Form.List name={["payments"]}>
+            {(fields, { add, remove, move }) => {
+              return (
+                <div>
+                  {fields.map((field, index) => (
+                    <Form.Item key={field.key}>
+                      <Row gutter={[16, 16]}>
+                        <Col span={16}>
+                          <Form.Item
+                            key={`${index}jobid`}
+                            label={t("jobs.fields.ro_number")}
+                            name={[field.name, "jobid"]}
+                            rules={[
+                              {
+                                required: true,
+                                //message: t("general.validation.required"),
+                              },
+                            ]}
+                          >
+                            <JobSearchSelectComponent
+                              notExported={false}
+                              clm_no
+                            />
+                          </Form.Item>
+                        </Col>
+                        <Col span={6}>
+                          <Form.Item
+                            key={`${index}amount`}
+                            label={t("payments.fields.amount")}
+                            name={[field.name, "amount"]}
+                            rules={[
+                              {
+                                required: true,
+                                //message: t("general.validation.required"),
+                              },
+                            ]}
+                          >
+                            <CurrencyFormItemComponent />
+                          </Form.Item>
+                        </Col>
+                        <Col span={2}>
+                          <DeleteFilled
+                            style={{ margin: "1rem" }}
+                            onClick={() => {
+                              remove(field.name);
+                            }}
+                          />
+                        </Col>
+                      </Row>
+                    </Form.Item>
+                  ))}
+                  <Form.Item>
+                    <Button
+                      type="dashed"
+                      onClick={() => {
+                        add();
+                      }}
+                      style={{ width: "100%" }}
+                    >
+                      {t("general.actions.add")}
+                    </Button>
+                  </Form.Item>
+                </div>
+              );
+            }}
+          </Form.List>
 
-          {/* Lighbox Input amount needs to be hidden */}
-          <Input
-            className="ipayfield"
-            data-ipayname="amount"
-            type="hidden"
-            value={amount}
-            hidden
-          />
-          <Input
-            className="ipayfield"
-            data-ipayname="account"
-            type="hidden"
-            value={data?.jobs_by_pk.ro_number}
-            hidden
-          />
-          <Input
-            className="ipayfield"
-            data-ipayname="email"
-            type="hidden"
-            value={data?.jobs_by_pk.owner.ownr_ea}
-            hidden
-          />
-          {/* Lightbox payment response when it is completed */}
-          <Form.Item name="paymentResponse" hidden>
-            <Input type="hidden" value={amount} />
+          <Form.Item
+            shouldUpdate={(prevValues, curValues) =>
+              prevValues.payments?.map((p) => p?.jobid).join() !==
+              curValues.payments?.map((p) => p?.jobid).join()
+            }
+          >
+            {() => {
+              console.log("Updating the owner info section.");
+              //If all of the job ids have been fileld in, then query and update the IP field.
+              const { payments } = form.getFieldsValue();
+              if (
+                payments?.length > 0 &&
+                payments?.filter((p) => p?.jobid).length === payments?.length
+              ) {
+                console.log("**Calling refetch.");
+                refetch({ jobids: payments.map((p) => p.jobid) });
+              }
+              console.log(
+                "Acc info",
+                data,
+                payments && data && data.jobs.length > 0
+                  ? data.jobs.map((j) => j.ro_number).join(", ")
+                  : null
+              );
+              return (
+                <>
+                  <Input
+                    className="ipayfield"
+                    data-ipayname="account"
+                    //type="hidden"
+                    value={
+                      payments && data && data.jobs.length > 0
+                        ? data.jobs.map((j) => j.ro_number).join(", ")
+                        : null
+                    }
+                    hidden
+                  />
+                  <Input
+                    className="ipayfield"
+                    data-ipayname="email"
+                    // type="hidden"
+                    value={
+                      payments && data && data.jobs.length > 0
+                        ? data.jobs.filter((j) => j.ownr_ea)[0]?.ownr_ea
+                        : null
+                    }
+                    hidden
+                  />
+                </>
+              );
+            }}
+          </Form.Item>
+          <Form.Item
+            shouldUpdate={(prevValues, curValues) =>
+              prevValues.payments?.map((p) => p?.amount).join() !==
+              curValues.payments?.map((p) => p?.amount).join()
+            }
+          >
+            {() => {
+              const { payments } = form.getFieldsValue();
+              const totalAmountToCharge = payments?.reduce((acc, val) => {
+                return acc + (val?.amount || 0);
+              }, 0);
+
+              return (
+                <Space style={{ float: "right" }}>
+                  <Statistic
+                    title="Amount To Charge"
+                    value={totalAmountToCharge}
+                    precision={2}
+                  />
+                  <Input
+                    className="ipayfield"
+                    data-ipayname="amount"
+                    //type="hidden"
+                    value={totalAmountToCharge?.toFixed(2)}
+                    hidden
+                  />
+                  <Button
+                    type="primary"
+                    //  data-ipayname="submit"
+                    className="ipayfield"
+                    loading={queryLoading || loading}
+                    disabled={!(totalAmountToCharge > 0)}
+                    onClick={handleIntelliPayCharge}
+                  >
+                    {t("job_payments.buttons.proceedtopayment")}
+                  </Button>
+                </Space>
+              );
+            }}
           </Form.Item>
 
-          <LayoutFormRow grow>
-            <Form.Item
-              label="Amount"
-              name="amount"
-              rules={[
-                {
-                  required: true,
-                  // message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <InputNumber />
-            </Form.Item>
-
-            <Row justify="space-around">
-              <Button
-                type="primary"
-                //  data-ipayname="submit"
-                className="ipayfield"
-                disabled={!amount || !jobid}
-                onClick={handleIntelliPayCharge}
-              >
-                {t("job_payments.buttons.proceedtopayment")}
-              </Button>
-              {context?.balance && (
-                <DataLabel
-                  valueStyle={{
-                    color: context?.balance.getAmount() !== 0 ? "red" : "green",
-                  }}
-                  label={t("payments.labels.balance")}
-                >
-                  {context?.balance.toFormat()}
-                </DataLabel>
-              )}
-            </Row>
-          </LayoutFormRow>
+          {/* Lightbox payment response when it is completed */}
+          <Form.Item name="paymentResponse" hidden>
+            <Input type="hidden" />
+          </Form.Item>
         </Form>
       </Spin>
     </Card>

client/src/components/card-payment-modal/card-payment-modal.container..jsx

@@ -43,7 +43,7 @@ function CardPaymentModalContainer({
           {t("job_payments.buttons.goback")}
         </Button>,
       ]}
-      width="60%"
+      width="80%"
       destroyOnClose
     >
       <CardPaymentModalComponent />

client/src/components/chat-open-button/chat-open-button.component.jsx

@@ -8,15 +8,23 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { searchingForConversation } from "../../redux/messaging/messaging.selectors";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
+  searchingForConversation: searchingForConversation,
 });
 
 const mapDispatchToProps = (dispatch) => ({
   openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
 });
 
-export function ChatOpenButton({ bodyshop, phone, jobid, openChatByPhone }) {
+export function ChatOpenButton({
+  bodyshop,
+  searchingForConversation,
+  phone,
+  jobid,
+  openChatByPhone,
+}) {
   const { t } = useTranslation();
   if (!phone) return <></>;
 
@@ -29,7 +37,7 @@ export function ChatOpenButton({ bodyshop, phone, jobid, openChatByPhone }) {
       onClick={(e) => {
         e.stopPropagation();
         const p = parsePhoneNumber(phone, "CA");
-
+        if (searchingForConversation) return; //This is to prevent finding the same thing twice.
         if (p && p.isValid()) {
           openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid });
         } else {

client/src/components/contract-jobs/contract-jobs.container.jsx

@@ -2,10 +2,10 @@ import { useQuery } from "@apollo/client";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import ContractJobsComponent from "./contract-jobs.component";
-import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -15,6 +15,7 @@ export function ContractJobsContainer({ selectedJobState, bodyshop }) {
   const { loading, error, data } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
     variables: {
       statuses: bodyshop.md_ro_statuses.active_statuses || ["Open"],
+      isConverted: true,
     },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",

client/src/components/contracts-list/contracts-list.component.jsx

@@ -4,14 +4,14 @@ import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
+import { setModalContext } from "../../redux/modals/modals.actions";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import ContractsFindModalContainer from "../contracts-find-modal/contracts-find-modal.container";
-import { setModalContext } from "../../redux/modals/modals.actions";
 
+import moment from "moment";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import moment from "moment";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({

client/src/components/courtesy-car-form/courtesy-car-form.component.jsx

@@ -34,6 +34,18 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
 
       {/* <FormFieldsChanged form={form} /> */}
       <LayoutFormRow header={t("courtesycars.labels.vehicle")}>
+        <Form.Item
+          label={t("courtesycars.fields.year")}
+          name="year"
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Input />
+        </Form.Item>
         <Form.Item
           label={t("courtesycars.fields.make")}
           name="make"
@@ -58,18 +70,6 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         >
           <Input />
         </Form.Item>
-        <Form.Item
-          label={t("courtesycars.fields.year")}
-          name="year"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
         <Form.Item
           label={t("courtesycars.fields.plate")}
           name="plate"
@@ -118,7 +118,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
             },
           ]}
         >
-          <InputNumber precision={0} />
+          <InputNumber min={0} precision={0} />
         </Form.Item>
         <Form.Item
           label={t("courtesycars.fields.fleetnumber")}
@@ -213,49 +213,24 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         >
           <CourtesyCarStatus />
         </Form.Item>
-        <Form.Item
-          label={t("courtesycars.fields.nextservicekm")}
-          name="nextservicekm"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <InputNumber />
-        </Form.Item>
         <div>
           <Form.Item
-            label={t("courtesycars.fields.nextservicedate")}
-            name="nextservicedate"
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-              },
-            ]}
+            label={t("courtesycars.fields.nextservicekm")}
+            name="nextservicekm"
           >
-            <FormDatePicker />
+            <InputNumber min={0} precision={0} />
           </Form.Item>
           <Form.Item
             shouldUpdate={(p, c) =>
-              p.mileage !== c.mileage ||
-              p.nextservicedate !== c.nextservicedate ||
-              p.nextservicekm !== c.nextservicekm
+              p.mileage !== c.mileage || p.nextservicekm !== c.nextservicekm
             }
           >
             {() => {
-              const nextservicedate = form.getFieldValue("nextservicedate");
               const nextservicekm = form.getFieldValue("nextservicekm");
-
               const mileageOver =
                 nextservicekm <= form.getFieldValue("mileage");
 
-              const dueForService =
-                nextservicedate && moment(nextservicedate).isBefore(moment());
-
-              if (mileageOver || dueForService)
+              if (mileageOver)
                 return (
                   <Space direction="vertical" style={{ color: "tomato" }}>
                     <span>
@@ -263,6 +238,36 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
                       {t("contracts.labels.cardueforservice")}
                     </span>
                     <span>{`${nextservicekm} km`}</span>
+                  </Space>
+                );
+
+              return <></>;
+            }}
+          </Form.Item>
+        </div>
+        <div>
+          <Form.Item
+            label={t("courtesycars.fields.nextservicedate")}
+            name="nextservicedate"
+          >
+            <FormDatePicker />
+          </Form.Item>
+          <Form.Item
+            shouldUpdate={(p, c) => p.nextservicedate !== c.nextservicedate}
+          >
+            {() => {
+              const nextservicedate = form.getFieldValue("nextservicedate");
+              const dueForService =
+                nextservicedate &&
+                moment(nextservicedate).endOf("day").isSameOrBefore(moment());
+
+              if (dueForService)
+                return (
+                  <Space direction="vertical" style={{ color: "tomato" }}>
+                    <span>
+                      <WarningFilled style={{ marginRight: ".3rem" }} />
+                      {t("contracts.labels.cardueforservice")}
+                    </span>
                     <span>
                       <DateFormatter>{nextservicedate}</DateFormatter>
                     </span>
@@ -283,12 +288,6 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           <Form.Item
             label={t("courtesycars.fields.registrationexpires")}
             name="registrationexpires"
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-              },
-            ]}
           >
             <FormDatePicker />
           </Form.Item>
@@ -300,7 +299,8 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
             {() => {
               const expires = form.getFieldValue("registrationexpires");
 
-              const dateover = expires && moment(expires).isBefore(moment());
+              const dateover =
+                expires && moment(expires).endOf("day").isBefore(moment());
 
               if (dateover)
                 return (
@@ -330,14 +330,13 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
             <FormDatePicker />
           </Form.Item>
           <Form.Item
-            shouldUpdate={(p, c) =>
-              p.insuranceexpires !== c.insuranceexpires
-            }
+            shouldUpdate={(p, c) => p.insuranceexpires !== c.insuranceexpires}
           >
             {() => {
               const expires = form.getFieldValue("insuranceexpires");
 
-              const dateover = expires && moment(expires).isBefore(moment());
+              const dateover =
+                expires && moment(expires).endOf("day").isBefore(moment());
 
               if (dateover)
                 return (

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -9,15 +9,15 @@ import {
   Table,
   Tooltip,
 } from "antd";
+import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
-import { alphaSort } from "../../utils/sorters";
-import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
-import moment from "moment";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { alphaSort } from "../../utils/sorters";
+import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
   const [state, setState] = useState({
     sortedInfo: {},
@@ -115,6 +115,14 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       sortOrder:
         state.sortedInfo.columnKey === "model" && state.sortedInfo.order,
     },
+    {
+      title: t("courtesycars.fields.color"),
+      dataIndex: "color",
+      key: "color",
+      sorter: (a, b) => alphaSort(a.color, b.color),
+      sortOrder:
+        state.sortedInfo.columnKey === "color" && state.sortedInfo.order,
+    },
     {
       title: t("courtesycars.fields.plate"),
       dataIndex: "plate",
@@ -166,6 +174,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           (c.year || "").toLowerCase().includes(searchText.toLowerCase()) ||
           (c.make || "").toLowerCase().includes(searchText.toLowerCase()) ||
           (c.model || "").toLowerCase().includes(searchText.toLowerCase()) ||
+          (c.plate || "").toLowerCase().includes(searchText.toLowerCase()) ||
           (t(c.status) || "").toLowerCase().includes(searchText.toLowerCase())
       )
     : courtesycars;

client/src/components/dms-post-form/dms-post-form.component.jsx

@@ -191,6 +191,13 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
               >
                 <Switch />
               </Form.Item>
+              <Form.Item
+                name="dms_model_override"
+                label={t("jobs.fields.dms.dms_model_override")}
+                initialValue={false}
+              >
+                <Switch />
+              </Form.Item>
             </Space>
           </div>
         )}

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

@@ -109,7 +109,7 @@ export function EmailOverlayContainer({
               ]
             : []),
         ],
-        media: selectedMedia.filter((m) => m.isSelected).map((m) => m.src),
+        media: selectedMedia.filter((m) => m.isSelected).map((m) => m.fullsize),
         //attachments,
       });
       notification["success"]({ message: t("emails.successes.sent") });

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

@@ -54,6 +54,7 @@ export default function GlobalSearchOs() {
                         job.v_make_desc || ""
                       } ${job.v_model_desc || ""}`}</span>
                       <span>{`${job.clm_no || ""}`}</span>
+                      <span>{`${job.plate_no || ""}`}</span>
                     </Space>
                   </Link>
                 ),

client/src/components/header/header.component.jsx

@@ -254,7 +254,7 @@ function Header({
               onClick={() => {
                 setCardPaymentContext({
                   actions: {},
-                  context: null,
+                  context: {},
                 });
               }}
               icon={<Icon component={FaCreditCard} />}

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

@@ -4,6 +4,7 @@ import {
   Divider,
   Dropdown,
   Form,
+  Input,
   Menu,
   notification,
   Popover,
@@ -34,6 +35,8 @@ import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
+import { useMutation } from "@apollo/client";
+import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -58,16 +61,44 @@ export function ScheduleEventComponent({
   const [visible, setVisible] = useState(false);
   const history = useHistory();
   const searchParams = queryString.parse(useLocation().search);
-
+  const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
+  const [title, setTitle] = useState(event.title);
   const blockContent = (
-    <div>
+    <Space direction="vertical" wrap>
+      <Input
+        value={title}
+        onChange={(e) => setTitle(e.currentTarget.value)}
+        onBlur={async () => {
+          await updateAppointment({
+            variables: {
+              appid: event.id,
+              app: {
+                title: title,
+              },
+            },
+            optimisticResponse: {
+              update_appointments: {
+                __typename: "appointments_mutation_response",
+                returning: [
+                  {
+                    ...event,
+                    title: title,
+                    __typename: "appointments",
+                  },
+                ],
+              },
+            },
+          });
+        }}
+      />
+
       <Button
         onClick={() => handleCancel({ id: event.id })}
         disabled={event.arrived}
       >
-        {t("appointments.actions.cancel")}
+        {t("appointments.actions.unblock")}
       </Button>
-    </div>
+    </Space>
   );
 
   const popoverContent = (

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

@@ -2,12 +2,16 @@ import { useMutation } from "@apollo/client";
 import { notification } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { useDispatch } from "react-redux";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENT_BY_ID } from "../../graphql/appointments.queries";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import ScheduleEventComponent from "./schedule-event.component";
 
 export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
+  const dispatch = useDispatch();
   const { t } = useTranslation();
   const [cancelAppointment] = useMutation(CANCEL_APPOINTMENT_BY_ID);
   const [updateJob] = useMutation(UPDATE_JOB);
@@ -34,16 +38,24 @@ export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
       const jobUpdate = await updateJob({
         variables: {
           jobId: event.job.id,
-
           job: {
             date_scheduled: null,
             scheduled_in: null,
             scheduled_completion: null,
             lost_sale_reason,
+            date_lost_sale: new Date(),
             status: bodyshop.md_ro_statuses.default_imported,
           },
         },
       });
+      if (!jobUpdate.errors) {
+        dispatch(
+          insertAuditTrail({
+            jobid: event.job.id,
+            operation: AuditTrailMapping.appointmentcancel(lost_sale_reason),
+          })
+        );
+      }
       if (!!jobUpdate.errors) {
         notification["error"]({
           message: t("jobs.errors.updating", {

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

@@ -1,5 +1,6 @@
 import { useMutation } from "@apollo/client";
 import { Button, Card, Form, Input, notification, Switch } from "antd";
+import moment from "moment-business-days";
 import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -12,16 +13,15 @@ import {
   MARK_LATEST_APPOINTMENT_ARRIVED,
 } from "../../../../graphql/appointments.queries";
 import { UPDATE_JOB } from "../../../../graphql/jobs.queries";
+import { UPDATE_OWNER } from "../../../../graphql/owners.queries";
+import { insertAuditTrail } from "../../../../redux/application/application.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../../../redux/user/user.selectors";
+import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
 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,
@@ -230,6 +230,7 @@ export function JobChecklistForm({
                 )),
             scheduled_delivery:
               job.scheduled_delivery && moment(job.scheduled_delivery),
+            production_vars: job.production_vars,
           }),
           ...(type === "deliver" && {
             removeFromProduction: true,

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

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

client/src/components/job-line-location-popup/job-line-location-popup.component.jsx

@@ -1,6 +1,6 @@
+import { useMutation } from "@apollo/client";
 import { notification, Select } from "antd";
 import React, { useEffect, useState } from "react";
-import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -56,8 +56,10 @@ export function JobLineLocationPopup({ bodyshop, jobline, disabled }) {
         <LoadingSpinner loading={loading}>
           <Select
             autoFocus
+            allowClear
             dropdownMatchSelectWidth={100}
             value={location}
+            onClear={() => setLocation(null)}
             onSelect={handleChange}
             onBlur={handleSave}
           >

client/src/components/job-lines-bill-reference/job-lines-bill-reference.component.jsx

@@ -8,7 +8,7 @@ export default function JobLinesBillRefernece({ jobline }) {
   return (
     <div style={{ color: subletRequired && "tomato" }}>
       {subletRequired && <WarningFilled />}
-      {`${(billLine.actual_price * billLine.quantity).toFixed(2)} (${
+      {`${billLine.actual_price.toFixed(2)} x ${billLine.quantity} (${
         billLine.bill.vendor.name
       } #${billLine.bill.invoice_number})`}
     </div>

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

@@ -33,7 +33,9 @@ const JobSearchSelect = (
     useLazyQuery(SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE);
 
   const executeSearch = (v) => {
-    if (v && v !== "") callSearch(v);
+    console.log(v);
+    if (v && v.variables?.search !== "" && v.variables.search.length >= 2)
+      callSearch(v);
   };
   const debouncedExecuteSearch = _.debounce(executeSearch, 500);
 

client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx

@@ -13,6 +13,7 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { insertAuditTrail } from "../../redux/application/application.actions";
+import { DateTimeFormat } from "./../../utils/DateFormatter";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -53,7 +54,7 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
         operation: AuditTrailMapping.admin_jobfieldchange(
           key,
           changedAuditFields[key] instanceof moment
-            ? moment(changedAuditFields[key]).format("MM/DD/YYYY hh:mm a")
+            ? DateTimeFormat(changedAuditFields[key])
             : changedAuditFields[key]
         ),
       });
@@ -179,6 +180,12 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
           <Form.Item label={t("jobs.fields.date_void")} name="date_void">
             <DateTimePicker />
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.date_lost_sale")}
+            name="date_lost_sale"
+          >
+            <DateTimePicker />
+          </Form.Item>
         </LayoutFormRow>
       </Form>
 

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

@@ -3,7 +3,7 @@ import {
   useApolloClient,
   useLazyQuery,
   useMutation,
-  useQuery
+  useQuery,
 } from "@apollo/client";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import { Col, notification, Row } from "antd";
@@ -20,7 +20,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   DELETE_AVAILABLE_JOB,
   QUERY_AVAILABLE_JOBS,
-  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK
+  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK,
 } from "../../graphql/available-jobs.queries";
 import { INSERT_NEW_JOB, UPDATE_JOB } from "../../graphql/jobs.queries";
 import { INSERT_NEW_NOTE } from "../../graphql/notes.queries";
@@ -28,7 +28,7 @@ import { SEARCH_VEHICLE_BY_VIN } from "../../graphql/vehicles.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
-  selectCurrentUser
+  selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import confirmDialog from "../../utils/asyncConfirm";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
@@ -73,6 +73,8 @@ export function JobsAvailableContainer({
 
   const [selectedJob, setSelectedJob] = useState(null);
   const [selectedOwner, setSelectedOwner] = useState(null);
+  const [partsQueueToggle, setPartsQueueToggle] = useState(bodyshop.md_functionality_toggles.parts_queue_toggle);
+
   const [insertLoading, setInsertLoading] = useState(false);
 
   const [insertNote] = useMutation(INSERT_NEW_NOTE);
@@ -94,6 +96,7 @@ export function JobsAvailableContainer({
     logImEXEvent("job_import_new");
 
     setOwnerModalVisible(false);
+
     setInsertLoading(true);
 
     const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
@@ -120,7 +123,7 @@ export function JobsAvailableContainer({
 
     let existingVehicles;
     if (estData.est_data.v_vin) {
-      //There's vehicle data, need to double check the VIN.
+      //There's vehicle data, need to double-check the VIN.
       existingVehicles = await client.query({
         query: SEARCH_VEHICLE_BY_VIN,
         variables: {
@@ -135,6 +138,7 @@ export function JobsAvailableContainer({
       owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
       job_totals: newTotals,
       date_open: moment(),
+      status: bodyshop.md_ro_statuses.default_imported,
       notes: {
         data: {
           created_by: currentUser.email,
@@ -142,7 +146,7 @@ export function JobsAvailableContainer({
           text: t("jobs.labels.importnote"),
         },
       },
-      queued_for_parts: true,
+      queued_for_parts: partsQueueToggle,
       ...(existingVehicles && existingVehicles.data.vehicles.length > 0
         ? { vehicleid: existingVehicles.data.vehicles[0].id, vehicle: null }
         : {}),
@@ -156,46 +160,51 @@ export function JobsAvailableContainer({
       delete newJob.vehicle;
     }
 
-    insertNewJob({
-      variables: {
-        job: newJob,
-      },
-    })
-      .then((r) => {
-        if (CriticalPartsScanning.treatment === "on") {
-          CriticalPartsScan(r.data.insert_jobs.returning[0].id);
-        }
-        notification["success"]({
-          message: t("jobs.successes.created"),
-          onClick: () => {
-            history.push(`/manage/jobs/${r.data.insert_jobs.returning[0].id}`);
-          },
-        });
-        //Job has been inserted. Clean up the available jobs record.
+    try {
+      const r = await insertNewJob({
+        variables: {
+          job: newJob,
+        },
+      });
 
-        insertAuditTrail({
-          jobid: r.data.insert_jobs.returning[0].id,
-          operation: AuditTrailMapping.jobimported(),
-        });
+      if (CriticalPartsScanning.treatment === "on") {
+        CriticalPartsScan(r.data.insert_jobs.returning[0].id);
+      }
 
-        deleteJob({
-          variables: { id: estData.id },
-        }).then((r) => {
-          refetch();
-          setInsertLoading(false);
-        });
-      })
-      .catch((r) => {
-        //error while inserting
-        notification["error"]({
-          message: t("jobs.errors.creating", { error: r.message }),
-        });
+      notification["success"]({
+        message: t("jobs.successes.created"),
+        onClick: () => {
+          history.push(`/manage/jobs/${r.data.insert_jobs.returning[0].id}`);
+        },
+      });
+      //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.id },
+      }).then((r) => {
         refetch();
         setInsertLoading(false);
       });
+
+      setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
+    } catch (err) {
+      //error while inserting
+      notification["error"]({
+        message: t("jobs.errors.creating", { error: err.message }),
+      });
+      refetch().catch(e => {console.error(`Something went wrong in jobs available table container - ${err.message || ''}`)});
+      setInsertLoading(false);
+      setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
+    }
+
   };
 
-  //Suplement scenario
+  //Supplement scenario
   const onJobFindModalOk = async () => {
     logImEXEvent("job_import_supplement");
 
@@ -247,11 +256,14 @@ export function JobsAvailableContainer({
             //   "0.00"
             // ),
             // job_totals: newTotals,
-            // queued_for_parts: true,
+            queued_for_parts: partsQueueToggle,
           },
         },
       });
-      if (CriticalPartsScanning.treatment === "on") {
+
+        setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
+
+        if (CriticalPartsScanning.treatment === "on") {
         CriticalPartsScan(updateResult.data.update_jobs.returning[0].id);
       }
       if (updateResult.errors) {
@@ -326,12 +338,14 @@ export function JobsAvailableContainer({
   const onOwnerModalCancel = () => {
     setOwnerModalVisible(false);
     setSelectedOwner(null);
+    setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
   };
 
   const onJobModalCancel = () => {
     setJobModalVisible(false);
     modalSearchState[1]("");
     setSelectedJob(null);
+    setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
   };
 
   const addJobAsNew = (record) => {
@@ -352,6 +366,8 @@ export function JobsAvailableContainer({
   }, [addJobAsSupp, availableJobId, clm_no]);
 
   if (error) return <AlertComponent type="error" message={error.message} />;
+
+
   return (
     <LoadingSpinner
       loading={insertLoading}
@@ -361,11 +377,14 @@ export function JobsAvailableContainer({
         loading={estDataRaw.loading}
         error={estDataRaw.error}
         owner={owner}
+        partsQueueToggle={partsQueueToggle}
+        setPartsQueueToggle={setPartsQueueToggle}
         selectedOwner={selectedOwner}
         setSelectedOwner={setSelectedOwner}
         visible={ownerModalVisible}
         onOk={onOwnerFindModalOk}
         onCancel={onOwnerModalCancel}
+
       />
       <JobsFindModalContainer
         loading={estDataRaw.loading}
@@ -377,6 +396,8 @@ export function JobsAvailableContainer({
         onOk={onJobFindModalOk}
         onCancel={onJobModalCancel}
         modalSearchState={modalSearchState}
+        partsQueueToggle={partsQueueToggle}
+        setPartsQueueToggle={setPartsQueueToggle}
       />
       <Row gutter={[16, 16]}>
         <Col span={24}>

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

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

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

@@ -108,7 +108,7 @@ export function JobsConvertButton({
             },
           ]}
         >
-          <Select>
+          <Select showSearch>
             {bodyshop.md_ins_cos.map((s, i) => (
               <Select.Option key={i} value={s.name}>
                 {s.name}

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

@@ -145,6 +145,13 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
         <Form.Item label={t("jobs.fields.date_void")} name="date_void">
           <DateTimePicker disabled={true || jobRO} />
         </Form.Item>
+
+        <Form.Item
+          label={t("jobs.fields.date_lost_sale")}
+          name="date_lost_sale"
+        >
+          <DateTimePicker disabled={true || jobRO} />
+        </Form.Item>
       </FormRow>
     </div>
   );

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

@@ -18,12 +18,14 @@ import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENTS_BY_JOB_ID } from "../../graphql/appointments.queries";
 import { DELETE_JOB, UPDATE_JOB, VOID_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import JobsDetailHeaderActionsAddevent from "./jobs-detail-header-actions.addevent";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
@@ -50,6 +52,8 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setModalContext({ context: context, modal: "timeTicket" })),
   setCardPaymentContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "cardPayment" })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function JobsDetailHeaderActions({
@@ -64,6 +68,7 @@ export function JobsDetailHeaderActions({
   jobRO,
   setTimeTicketContext,
   setCardPaymentContext,
+  insertAuditTrail,
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
@@ -158,6 +163,7 @@ export function JobsDetailHeaderActions({
                         scheduled_in: null,
                         scheduled_completion: null,
                         lost_sale_reason,
+                        date_lost_sale: new Date(),
                         status: bodyshop.md_ro_statuses.default_imported,
                       },
                     },
@@ -166,6 +172,11 @@ export function JobsDetailHeaderActions({
                     notification["success"]({
                       message: t("appointments.successes.canceled"),
                     });
+                    insertAuditTrail({
+                      jobid: job.id,
+                      operation:
+                        AuditTrailMapping.appointmentcancel(lost_sale_reason),
+                    });
                     return;
                   }
                 }}

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js

@@ -27,6 +27,8 @@ export default async function DuplicateJob(
   delete existingJob.id;
   delete existingJob.createdat;
   delete existingJob.updatedat;
+  delete existingJob.cieca_stl;
+  delete existingJob.cieca_ttl;
 
   const newJob = {
     ...existingJob,
@@ -81,6 +83,8 @@ export async function CreateIouForJob(
   delete existingJob.id;
   delete existingJob.createdat;
   delete existingJob.updatedat;
+  delete existingJob.cieca_stl;
+  delete existingJob.cieca_ttl;
 
   const newJob = {
     ...existingJob,

client/src/components/jobs-documents-gallery/jobs-documents-gallery.external.component.jsx

@@ -1,7 +1,7 @@
 import React, { useEffect } from "react";
 import { Gallery } from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
-import { GenerateThumbUrl } from "./job-documents.utility";
+import { GenerateSrcUrl, GenerateThumbUrl } from "./job-documents.utility";
 
 function JobsDocumentGalleryExternal({
   data,
@@ -15,7 +15,7 @@ function JobsDocumentGalleryExternal({
     let documents = data.reduce((acc, value) => {
       if (value.type.startsWith("image")) {
         acc.push({
-          //src: GenerateSrcUrl(value),
+          fullsize: GenerateSrcUrl(value),
           src: GenerateThumbUrl(value),
           thumbnailHeight: 225,
           thumbnailWidth: 225,

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.external.component.jsx

@@ -52,7 +52,7 @@ function JobDocumentsLocalGalleryExternal({
               val.type.mime &&
               val.type.mime.startsWith("image")
             ) {
-              acc.push({ ...val, src: val.thumbnail });
+              acc.push({ ...val, src: val.thumbnail, fullsize: val.src });
             }
             return acc;
           }, [])

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

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

client/src/components/jobs-find-modal/jobs-find-modal.component.jsx

@@ -14,6 +14,8 @@ export default function JobsFindModalComponent({
   importOptionsState,
   modalSearchState,
   jobsListRefetch,
+  partsQueueToggle,
+  setPartsQueueToggle,
 }) {
   const { t } = useTranslation();
   const [modalSearch, setModalSearch] = modalSearchState;
@@ -199,6 +201,12 @@ export default function JobsFindModalComponent({
       >
         {t("jobs.labels.override_header")}
       </Checkbox>
+      <Checkbox
+          checked={partsQueueToggle}
+          onChange={(e) => setPartsQueueToggle(e.target.checked)}
+      >
+        {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
+      </Checkbox>
     </div>
   );
 }

client/src/components/jobs-find-modal/jobs-find-modal.container.jsx

@@ -24,6 +24,8 @@ export default connect(
   setSelectedJob,
   importOptionsState,
   modalSearchState,
+  partsQueueToggle,
+  setPartsQueueToggle,
   ...modalProps
 }) {
   const { t } = useTranslation();
@@ -91,6 +93,8 @@ export default connect(
           jobsListRefetch={jobsList.refetch}
           jobsList={jobsData}
           modalSearchState={modalSearchState}
+          partsQueueToggle={partsQueueToggle}
+          setPartsQueueToggle={setPartsQueueToggle}
         />
       ) : null}
     </Modal>

client/src/components/jobs-ready-list/jobs-ready-list.component.jsx

@@ -1,8 +1,8 @@
 import {
+  BranchesOutlined,
   ExclamationCircleFilled,
   PauseCircleOutlined,
   SyncOutlined,
-  BranchesOutlined,
 } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
 import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
@@ -14,8 +14,8 @@ import { Link, useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { onlyUnique } from "../../utils/arrayHelper";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { onlyUnique } from "../../utils/arrayHelper";
 import { alphaSort } from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
@@ -46,6 +46,7 @@ export function JobsReadyList({ bodyshop }) {
   const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
     variables: {
       statuses: readyStatuses,
+      isConverted: true,
     },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",

client/src/components/labor-allocations-table/labor-allocations-table.component.jsx

@@ -231,7 +231,14 @@ export function LaborAllocationsTable({
                   {summary.adjustments.toFixed(1)}
                 </Table.Summary.Cell>
                 <Table.Summary.Cell>
-                  {summary.difference.toFixed(1)}
+                  <Typography.Text
+                    style={{
+                      fontWeight: "bold",
+                      color: summary.difference >= 0 ? "green" : "red",
+                    }}
+                  >
+                    {summary.difference.toFixed(1)}
+                  </Typography.Text>
                 </Table.Summary.Cell>
               </Table.Summary.Row>
             )}

client/src/components/owner-find-modal/owner-find-modal.component.jsx

@@ -8,10 +8,11 @@ export default function OwnerFindModalComponent({
   setSelectedOwner,
   ownersListLoading,
   ownersList,
+  partsQueueToggle,
+  setPartsQueueToggle,
 }) {
   //setSelectedOwner is used to set the record id of the owner to use for adding the job.
   const { t } = useTranslation();
-
   const columns = [
     {
       title: t("owners.fields.ownr_ln"),
@@ -109,6 +110,12 @@ export default function OwnerFindModalComponent({
       >
         {t("owners.labels.create_new")}
       </Checkbox>
+      <Checkbox
+          checked={partsQueueToggle}
+          onChange={(e) => setPartsQueueToggle(e.target.checked)}
+      >
+        {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
+      </Checkbox>
     </div>
   );
 }

client/src/components/owner-find-modal/owner-find-modal.container.jsx

@@ -14,6 +14,8 @@ export default function OwnerFindModalContainer({
   owner,
   selectedOwner,
   setSelectedOwner,
+  partsQueueToggle,
+  setPartsQueueToggle,
   ...modalProps
 }) {
   //use owner object to run query and find what possible owners there are.
@@ -59,6 +61,8 @@ export default function OwnerFindModalContainer({
             selectedOwner={selectedOwner}
             setSelectedOwner={setSelectedOwner}
             ownersListLoading={ownersList.loading}
+            partsQueueToggle={partsQueueToggle}
+            setPartsQueueToggle={setPartsQueueToggle}
             ownersList={
               ownersList.data && ownersList.data.search_owners
                 ? ownersList.data.search_owners

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

@@ -21,7 +21,8 @@ const OwnerSearchSelect = ({ value, onChange, onBlur, disabled }, ref) => {
     useLazyQuery(SEARCH_OWNERS_BY_ID_FOR_AUTOCOMPLETE);
 
   const executeSearch = (v) => {
-    callSearch(v);
+    if (v && v.variables?.search !== "" && v.variables.search.length >= 2)
+      callSearch(v);
   };
   const debouncedExecuteSearch = _.debounce(executeSearch, 500);
 

client/src/components/owners-list/owners-list.component.jsx

@@ -106,7 +106,11 @@ export default function OwnersListComponent({
           <Input.Search
             placeholder={search.search || t("general.labels.search")}
             onSearch={(value) => {
-              search.search = value;
+              if (value?.length >= 3) {
+                search.search = value;
+              } else {
+                delete search.search;
+              }
               history.push({ search: queryString.stringify(search) });
             }}
             enterButton

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

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

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

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

client/src/components/payment-expanded-row/payment-expanded-row.component.jsx

@@ -1,15 +1,24 @@
-import React, { useState } from "react";
 import { useMutation, useQuery } from "@apollo/client";
+import {
+  Button,
+  Descriptions,
+  InputNumber,
+  Modal,
+  Space,
+  notification,
+} from "antd";
+import axios from "axios";
+import moment from "moment";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import {
   GET_REFUNDABLE_AMOUNT_BY_JOBID,
   INSERT_PAYMENT_RESPONSE,
   QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID,
 } from "../../graphql/payment_response.queries";
-import { Button, Descriptions, InputNumber, Modal, notification } from "antd";
-import moment from "moment";
-import axios from "axios";
 import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
-import { useTranslation } from "react-i18next";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
 
 const { confirm } = Modal;
 
@@ -137,10 +146,10 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
           {payment_response?.response?.nameOnCard ?? ""}
         </Descriptions.Item>
         <Descriptions.Item label={t("job_payments.titles.amount")}>
-          {record.amount}
+          <CurrencyFormatter>{record.amount}</CurrencyFormatter>
         </Descriptions.Item>
         <Descriptions.Item label={t("job_payments.titles.dateOfPayment")}>
-          {moment(record.created_at).format("YYYY-MM-DD HH:mm:ss")}
+          {<DateTimeFormatter>{record.created_at}</DateTimeFormatter>}
         </Descriptions.Item>
         <Descriptions.Item label={t("job_payments.titles.transactionid")}>
           {record.transactionid}
@@ -151,17 +160,22 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
         <Descriptions.Item label={t("job_payments.titles.paymenttype")}>
           {record.type}
         </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.paymentnum")}>
+          {record.paymentnum}
+        </Descriptions.Item>
         {payment_response && (
           <Descriptions.Item label={t("job_payments.titles.refundamount")}>
-            <InputNumber
-              onChange={setRefundAmount}
-              max={max_refundable_amount}
-              min={0}
-            />
+            <Space>
+              <InputNumber
+                onChange={setRefundAmount}
+                max={max_refundable_amount}
+                min={0}
+              />
 
-            <Button onClick={() => showConfirm(payment_response)}>
-              {t("job_payments.buttons.refundpayment")}
-            </Button>
+              <Button onClick={() => showConfirm(payment_response)}>
+                {t("job_payments.buttons.refundpayment")}
+              </Button>
+            </Space>
           </Descriptions.Item>
         )}
       </Descriptions>

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

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

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

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

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

@@ -20,9 +20,9 @@ import ProductionBoardCard from "../production-board-kanban-card/production-boar
 import ProductionListDetailComponent from "../production-list-detail/production-list-detail.component";
 import ProductionBoardKanbanCardSettings from "./production-board-kanban.card-settings.component";
 //import "@asseinfo/react-kanban/dist/styles.css";
+import CardColorLegend from "../production-board-kanban-card/production-board-kanban-card-color-legend.component";
 import "./production-board-kanban.styles.scss";
 import { createBoardData } from "./production-board-kanban.utils.js";
-import CardColorLegend from "../production-board-kanban-card/production-board-kanban-card-color-legend.component";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   technician: selectTechnician,
@@ -153,6 +153,18 @@ export function ProductionBoardKanbanComponent({
       0
     )
     .toFixed(1);
+    const totalLAB = data
+    .reduce(
+      (acc, val) => acc + (val.labhrs?.aggregate?.sum?.mod_lb_hrs || 0),
+      0
+    )
+    .toFixed(1);
+  const totalLAR = data
+    .reduce(
+      (acc, val) => acc + (val.larhrs?.aggregate?.sum?.mod_lb_hrs || 0),
+      0
+    )
+    .toFixed(1);
   const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
     .filter((screen) => !!screen[1])
     .slice(-1)[0];
@@ -236,6 +248,14 @@ export function ProductionBoardKanbanComponent({
               title={t("dashboard.titles.productionhours")}
               value={totalHrs}
             />
+            <Statistic
+              title={t("dashboard.titles.labhours")}
+              value={totalLAB}
+            />
+            <Statistic
+              title={t("dashboard.titles.larhours")}
+              value={totalLAR}
+            />
             <Statistic
               title={t("appointments.labels.inproduction")}
               value={data && data.length}

client/src/components/production-list-columns/production-list-columns.data.js

@@ -455,8 +455,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
-          bodyshop.employees.find((e) => e.id === a.employee_body)?.first_name,
-          bodyshop.employees.find((e) => e.id === b.employee_body)?.first_name
+          bodyshop.employees?.find((e) => e.id === a.employee_body)?.first_name,
+          bodyshop.employees?.find((e) => e.id === b.employee_body)?.first_name
         ),
       render: (text, record) => (
         <ProductionListEmployeeAssignment
@@ -474,8 +474,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
-          bodyshop.employees.find((e) => e.id === a.employee_prep)?.first_name,
-          bodyshop.employees.find((e) => e.id === b.employee_prep)?.first_name
+          bodyshop.employees?.find((e) => e.id === a.employee_prep)?.first_name,
+          bodyshop.employees?.find((e) => e.id === b.employee_prep)?.first_name
         ),
       render: (text, record) => (
         <ProductionListEmployeeAssignment
@@ -492,8 +492,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         state.sortedInfo.columnKey === "employee_csr" && state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
-          bodyshop.employees.find((e) => e.id === a.employee_csr)?.first_name,
-          bodyshop.employees.find((e) => e.id === b.employee_csr)?.first_name
+          bodyshop.employees?.find((e) => e.id === a.employee_csr)?.first_name,
+          bodyshop.employees?.find((e) => e.id === b.employee_csr)?.first_name
         ),
       render: (text, record) => (
         <ProductionListEmployeeAssignment record={record} type="employee_csr" />
@@ -508,9 +508,9 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
-          bodyshop.employees.find((e) => e.id === a.employee_refinish)
+          bodyshop.employees?.find((e) => e.id === a.employee_refinish)
             ?.first_name,
-          bodyshop.employees.find((e) => e.id === b.employee_refinish)
+          bodyshop.employees?.find((e) => e.id === b.employee_refinish)
             ?.first_name
         ),
       render: (text, record) => (

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

@@ -55,25 +55,27 @@ export function ProductionListPrint({ bodyshop }) {
           <Menu.SubMenu
             title={t("reportcenter.templates.production_by_technician_one")}
           >
-            {bodyshop.employees.map((e) => (
-              <Menu.Item
-                key={e.id}
-                onClick={async () => {
-                  setLoading(true);
-                  await GenerateDocument(
-                    {
-                      name: production_by_technician_one.key,
-                      variables: { id: e.id },
-                    },
-                    {},
-                    "p"
-                  );
-                  setLoading(false);
-                }}
-              >
-                {e.first_name} {e.last_name}
-              </Menu.Item>
-            ))}
+            {bodyshop.employees
+              .filter((e) => e.active)
+              .map((e) => (
+                <Menu.Item
+                  key={e.id}
+                  onClick={async () => {
+                    setLoading(true);
+                    await GenerateDocument(
+                      {
+                        name: production_by_technician_one.key,
+                        variables: { id: e.id },
+                      },
+                      {},
+                      "p"
+                    );
+                    setLoading(false);
+                  }}
+                >
+                  {e.first_name} {e.last_name}
+                </Menu.Item>
+              ))}
           </Menu.SubMenu>
           <Menu.SubMenu
             title={t("reportcenter.templates.production_by_category_one")}

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

@@ -184,6 +184,18 @@ export function ProductionListTable({
       0
     )
     .toFixed(1);
+  const totalLAB = data
+    .reduce(
+      (acc, val) => acc + (val.labhrs?.aggregate?.sum?.mod_lb_hrs || 0),
+      0
+    )
+    .toFixed(1);
+  const totalLAR = data
+    .reduce(
+      (acc, val) => acc + (val.larhrs?.aggregate?.sum?.mod_lb_hrs || 0),
+      0
+    )
+    .toFixed(1);
   return (
     <div>
       <PageHeader
@@ -193,6 +205,14 @@ export function ProductionListTable({
               title={t("dashboard.titles.productionhours")}
               value={totalHrs}
             />
+            <Statistic
+              title={t("dashboard.titles.labhours")}
+              value={totalLAB}
+            />
+            <Statistic
+              title={t("dashboard.titles.larhours")}
+              value={totalLAR}
+            />
             <Statistic
               title={t("appointments.labels.inproduction")}
               value={dataSource && dataSource.length}

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

@@ -13,20 +13,29 @@ import {
   QUERY_APPOINTMENTS_BY_JOBID,
 } from "../../graphql/appointments.queries";
 import { QUERY_LBR_HRS_BY_PK, UPDATE_JOBS } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { setEmailOptions } from "../../redux/email/email.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectSchedule } from "../../redux/modals/modals.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import { DateTimeFormat } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ScheduleJobModalComponent from "./schedule-job-modal.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   scheduleModal: selectSchedule,
+  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("schedule")),
   setEmailOptions: (e) => dispatch(setEmailOptions(e)),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function ScheduleJobModalContainer({
@@ -34,6 +43,8 @@ export function ScheduleJobModalContainer({
   bodyshop,
   toggleModalVisible,
   setEmailOptions,
+  currentUser,
+  insertAuditTrail,
 }) {
   const { visible, context, actions } = scheduleModal;
   const { jobId, job, previousEvent } = context;
@@ -122,12 +133,22 @@ export function ScheduleJobModalContainer({
           end: moment(values.start).add(bodyshop.appt_length || 60, "minutes"),
           color: values.color,
           note: values.note,
+          created_by: currentUser.email,
         },
         jobId: jobId,
         altTransport: values.alt_transport,
       },
     });
 
+    if (!appt.errors) {
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.appointmentinsert(
+          DateTimeFormat(values.start)
+        ),
+      });
+    }
+
     if (!!appt.errors) {
       notification["error"]({
         message: t("appointments.errors.saving", {
@@ -149,6 +170,7 @@ export function ScheduleJobModalContainer({
             scheduled_in: values.start,
             scheduled_completion: values.scheduled_completion,
             lost_sale_reason: null,
+            date_lost_sale: null,
           },
         },
       });

client/src/components/scoreboard-targets-table/scoreboard-targets-table.util.js

@@ -8,18 +8,45 @@ export const CalculateWorkingDaysThisMonth = () => {
   return moment().endOf("month").businessDaysIntoMonth();
 };
 
+export const CalculateWorkingDaysInPeriod = (start, end) => {
+  return moment(start).businessDiff(moment(end));
+};
+
 export const CalculateWorkingDaysAsOfToday = () => {
   return moment().businessDaysIntoMonth();
 };
 
+export const CalculateWorkingDaysLastMonth = () => {
+  return moment().subtract(1, "month").endOf("month").businessDaysIntoMonth();
+};
+
 export const WeeklyTargetHrs = (dailyTargetHrs, bodyshop) => {
-  return dailyTargetHrs * 5;
+  return (
+    dailyTargetHrs *
+    CalculateWorkingDaysInPeriod(
+      moment().startOf("week"),
+      moment().endOf("week")
+    )
+  );
+};
+
+export const WeeklyTargetHrsInPeriod = (
+  dailyTargetHrs,
+  start,
+  end,
+  bodyshop
+) => {
+  return dailyTargetHrs * CalculateWorkingDaysInPeriod(start, end);
 };
 
 export const MonthlyTargetHrs = (dailyTargetHrs, bodyshop) => {
   return dailyTargetHrs * CalculateWorkingDaysThisMonth();
 };
 
+export const LastMonthTargetHrs = (dailyTargetHrs, bodyshop) => {
+  return dailyTargetHrs * CalculateWorkingDaysLastMonth();
+};
+
 export const AsOfTodayTargetHrs = (dailyTargetHrs, bodyshop) => {
   return dailyTargetHrs * CalculateWorkingDaysAsOfToday();
 };

client/src/components/scoreboard-timetickets-stats/chart-custom-tooltip.jsx

@@ -0,0 +1,26 @@
+const CustomTooltip = ({ active, payload, label }) => {
+  if (active && payload && payload.length) {
+    return (
+      <div
+        style={{
+          backgroundColor: "white",
+          border: "1px solid gray",
+          padding: "0.5rem",
+        }}
+      >
+        <p style={{ margin: "0" }}>{label}</p>
+        {payload.map((data, index) => {
+          return (
+            <p style={{ margin: "10px 0", color: data.color }} key={index}>{`${
+              data.name
+            } : ${data.value.toFixed(1)}`}</p>
+          );
+        })}
+      </div>
+    );
+  }
+
+  return null;
+};
+
+export default CustomTooltip;

client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.chart.component.jsx

@@ -0,0 +1,54 @@
+import { Card } from "antd";
+import React from "react";
+import {
+  Area,
+  CartesianGrid,
+  ComposedChart,
+  Legend,
+  Line,
+  ResponsiveContainer,
+  Tooltip,
+  XAxis,
+  YAxis,
+} from "recharts";
+import CustomTooltip from "./chart-custom-tooltip";
+
+const graphProps = {
+  strokeWidth: 3,
+};
+
+export default function ScoreboardTimeTicketsChart({ data, chartTitle }) {
+  return (
+    <Card title={chartTitle}>
+      <ResponsiveContainer width="100%" height={275}>
+        <ComposedChart
+          data={data}
+          margin={{ top: 20, right: 20, bottom: 20, left: 20 }}
+        >
+          <CartesianGrid stroke="#f5f5f5" />
+          <XAxis dataKey="date" strokeWidth={graphProps.strokeWidth} />
+          <YAxis yAxisId="left" strokeWidth={graphProps.strokeWidth} />
+          <Tooltip content={<CustomTooltip />} />
+          <Legend />
+          <Line
+            name="Target Hours"
+            type="monotone"
+            dataKey="accTargetHrs"
+            stroke="#ff7300"
+            yAxisId="left"
+            strokeWidth={graphProps.strokeWidth}
+          />
+
+          <Area
+            type="monotone"
+            name="MTD Hours"
+            dataKey="accHrs"
+            fill="lightblue"
+            stroke="blue"
+            yAxisId="left"
+          />
+        </ComposedChart>
+      </ResponsiveContainer>
+    </Card>
+  );
+}

client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.component.jsx

@@ -0,0 +1,393 @@
+import { useQuery } from "@apollo/client";
+import { Col, Row } from "antd";
+import _ from "lodash";
+import moment from "moment";
+import React, { useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { QUERY_TIME_TICKETS_IN_RANGE_SB } from "../../graphql/timetickets.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import AlertComponent from "../alert/alert.component";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import * as Utils from "../scoreboard-targets-table/scoreboard-targets-table.util";
+import ScoreboardTimeTicketsChart from "./scoreboard-timetickets.chart.component";
+import ScoreboardTicketsStats from "./scoreboard-timetickets.stats.component";
+import ScoreboardTimeticketsTargetsTable from "./scoreboard-timetickets.targets-table.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ScoreboardTimeTicketsStats);
+
+export function ScoreboardTimeTicketsStats({ bodyshop }) {
+  const { t } = useTranslation();
+  const startDate = moment().startOf("month")
+  const endDate = moment().endOf("month");
+
+  const fixedPeriods = useMemo(() => {
+    const endOfThisMonth = moment().endOf("month");
+    const startofthisMonth = moment().startOf("month");
+
+    const endOfLastmonth = moment().subtract(1, "month").endOf("month");
+    const startOfLastmonth = moment().subtract(1, "month").startOf("month");
+
+    const endOfThisWeek = moment().endOf("week");
+    const startOfThisWeek = moment().startOf("week");
+
+    const endOfLastWeek = moment().subtract(1, "week").endOf("week");
+    const startOfLastWeek = moment().subtract(1, "week").startOf("week");
+
+    const endOfPriorWeek = moment().subtract(2, "week").endOf("week");
+    const startOfPriorWeek = moment().subtract(2, "week").startOf("week");
+
+    const allDates = [
+      endOfThisMonth,
+      startofthisMonth,
+      endOfLastmonth,
+      startOfLastmonth,
+      endOfThisWeek,
+      startOfThisWeek,
+      endOfLastWeek,
+      startOfLastWeek,
+      endOfPriorWeek,
+      startOfPriorWeek,
+    ];
+    const start = moment.min(allDates);
+    const end = moment.max(allDates);
+    return {
+      start,
+      end,
+      endOfThisMonth,
+      startofthisMonth,
+      endOfLastmonth,
+      startOfLastmonth,
+      endOfThisWeek,
+      startOfThisWeek,
+      endOfLastWeek,
+      startOfLastWeek,
+      endOfPriorWeek,
+      startOfPriorWeek,
+    };
+  }, []);
+
+  const { loading, error, data } = useQuery(QUERY_TIME_TICKETS_IN_RANGE_SB, {
+    variables: {
+      start: startDate.format("YYYY-MM-DD"),
+      end: endDate.format("YYYY-MM-DD"),
+      fixedStart: fixedPeriods.start.format("YYYY-MM-DD"),
+      fixedEnd: fixedPeriods.end.format("YYYY-MM-DD"),
+    },
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+    pollInterval: 60000,
+    skip: !fixedPeriods,
+  });
+
+  const calculatedData = useMemo(() => {
+    if (!data) return [];
+    const ret = {
+      totalThisWeek: 0,
+      totalThisWeekLAB: 0,
+      totalThisWeekLAR: 0,
+      totalLastWeek: 0,
+      totalLastWeekLAB: 0,
+      totalLastWeekLAR: 0,
+      totalPriorWeek: 0,
+      totalPriorWeekLAB: 0,
+      totalPriorWeekLAR: 0,
+      totalThisMonth: 0,
+      totalThisMonthLAB: 0,
+      totalThisMonthLAR: 0,
+      totalLastMonth: 0,
+      totalLastMonthLAB: 0,
+      totalLastMonthLAR: 0,
+      actualTotalOverPeriod: 0,
+      actualTotalOverPeriodLAB: 0,
+      actualTotalOverPeriodLAR: 0,
+      totalEffieciencyOverPeriod: 0,
+      totalEffieciencyOverPeriodLAB: 0,
+      totalEffieciencyOverPeriodLAR: 0,
+      seperatedThisWeek: {
+        sunday: {
+          total: 0,
+          lab: 0,
+          lar: 0,
+        },
+        monday: {
+          total: 0,
+          lab: 0,
+          lar: 0,
+        },
+        tuesday: {
+          total: 0,
+          lab: 0,
+          lar: 0,
+        },
+        wednesday: {
+          total: 0,
+          lab: 0,
+          lar: 0,
+        },
+        thursday: {
+          total: 0,
+          lab: 0,
+          lar: 0,
+        },
+        friday: {
+          total: 0,
+          lab: 0,
+          lar: 0,
+        },
+        saturday: {
+          total: 0,
+          lab: 0,
+          lar: 0,
+        },
+      },
+    };
+
+    data.fixedperiod.forEach((ticket) => {
+      const ticketDate = moment(ticket.date);
+      if (
+        ticketDate.isBetween(
+          fixedPeriods.startOfThisWeek,
+          fixedPeriods.endOfThisWeek,
+          undefined,
+          "[]"
+        )
+      ) {
+        ret.totalThisWeek = ret.totalThisWeek + ticket.productivehrs;
+        if (ticket.ciecacode !== "LAR")
+          ret.totalThisWeekLAB = ret.totalThisWeekLAB + ticket.productivehrs;
+        if (ticket.ciecacode === "LAR")
+          ret.totalThisWeekLAR = ret.totalThisWeekLAR + ticket.productivehrs;
+
+        //Seperate out to Day of Week
+        ret.seperatedThisWeek[
+          moment(ticket.date).format("dddd").toLowerCase()
+        ].total =
+          ret.seperatedThisWeek[
+            moment(ticket.date).format("dddd").toLowerCase()
+          ].total + ticket.productivehrs;
+        if (ticket.ciecacode !== "LAR")
+          ret.seperatedThisWeek[
+            moment(ticket.date).format("dddd").toLowerCase()
+          ].lab =
+            ret.seperatedThisWeek[
+              moment(ticket.date).format("dddd").toLowerCase()
+            ].lab + ticket.productivehrs;
+        if (ticket.ciecacode === "LAR")
+          ret.seperatedThisWeek[
+            moment(ticket.date).format("dddd").toLowerCase()
+          ].lar =
+            ret.seperatedThisWeek[
+              moment(ticket.date).format("dddd").toLowerCase()
+            ].lar + ticket.productivehrs;
+      } else if (
+        ticketDate.isBetween(
+          fixedPeriods.startOfLastWeek,
+          fixedPeriods.endOfLastWeek,
+          undefined,
+          "[]"
+        )
+      ) {
+        ret.totalLastWeek = ret.totalLastWeek + ticket.productivehrs;
+        if (ticket.ciecacode !== "LAR")
+          ret.totalLastWeekLAB = ret.totalLastWeekLAB + ticket.productivehrs;
+        if (ticket.ciecacode === "LAR")
+          ret.totalLastWeekLAR = ret.totalLastWeekLAR + ticket.productivehrs;
+      } else if (
+        ticketDate.isBetween(
+          fixedPeriods.startOfPriorWeek,
+          fixedPeriods.endOfPriorWeek,
+          undefined,
+          "[]"
+        )
+      ) {
+        ret.totalPriorWeek = ret.totalPriorWeek + ticket.productivehrs;
+        if (ticket.ciecacode !== "LAR")
+          ret.totalPriorWeekLAB = ret.totalPriorWeekLAB + ticket.productivehrs;
+        if (ticket.ciecacode === "LAR")
+          ret.totalPriorWeekLAR = ret.totalPriorWeekLAR + ticket.productivehrs;
+      }
+      if (
+        ticketDate.isBetween(
+          fixedPeriods.startofthisMonth,
+          fixedPeriods.endOfThisMonth,
+          undefined,
+          "[]"
+        )
+      ) {
+        ret.totalThisMonth = ret.totalThisMonth + ticket.productivehrs;
+        ret.actualTotalOverPeriod =
+          ret.actualTotalOverPeriod + (ticket.actualhrs || 0);
+        if (ticket.ciecacode !== "LAR") {
+          ret.totalThisMonthLAB = ret.totalThisMonthLAB + ticket.productivehrs;
+          ret.actualTotalOverPeriodLAB =
+            ret.actualTotalOverPeriodLAB + (ticket.actualhrs || 0);
+        }
+        if (ticket.ciecacode === "LAR") {
+          ret.totalThisMonthLAR = ret.totalThisMonthLAR + ticket.productivehrs;
+          ret.actualTotalOverPeriodLAR =
+            ret.actualTotalOverPeriodLAR + (ticket.actualhrs || 0);
+        }
+      } else if (
+        ticketDate.isBetween(
+          fixedPeriods.startOfLastmonth,
+          fixedPeriods.endOfLastmonth,
+          undefined,
+          "[]"
+        )
+      ) {
+        ret.totalLastMonth = ret.totalLastMonth + ticket.productivehrs;
+        if (ticket.ciecacode !== "LAR")
+          ret.totalLastMonthLAB = ret.totalLastMonthLAB + ticket.productivehrs;
+        if (ticket.ciecacode === "LAR")
+          ret.totalLastMonthLAR = ret.totalLastMonthLAR + ticket.productivehrs;
+      }
+    });
+
+    ret.totalEffieciencyOverPeriod = ret.actualTotalOverPeriod
+      ? (ret.totalThisMonth / ret.actualTotalOverPeriod) * 100
+      : 0;
+    ret.totalEffieciencyOverPeriodLAB = ret.actualTotalOverPeriodLAB
+      ? (ret.totalThisMonthLAB / ret.actualTotalOverPeriodLAB) * 100
+      : 0;
+    ret.totalEffieciencyOverPeriodLAR = ret.actualTotalOverPeriodLAR
+      ? (ret.totalThisMonthLAR / ret.actualTotalOverPeriodLAR) * 100
+      : 0;
+
+    roundObject(ret);
+
+    const ticketsGroupedByDate = _.groupBy(data.timetickets, "date");
+
+    const listOfDays = Utils.ListOfDaysInCurrentMonth();
+
+    const combinedData = [],
+      labData = [],
+      larData = [];
+    var acc_comb = 0;
+    var acc_lab = 0;
+    var acc_lar = 0;
+
+    listOfDays.forEach((day) => {
+      const r = {
+        date: moment(day).format("MM/DD"),
+        actualhrs: 0,
+        productivehrs: 0,
+      };
+
+      const combined = {
+        accTargetHrs: _.round(
+          Utils.AsOfDateTargetHours(
+            bodyshop.scoreboard_target.dailyBodyTarget +
+              bodyshop.scoreboard_target.dailyPaintTarget,
+            day
+          ) +
+            (bodyshop.scoreboard_target.dailyBodyTarget +
+              bodyshop.scoreboard_target.dailyPaintTarget),
+          1
+        ),
+        accHrs: 0,
+      };
+      const lab = {
+        accTargetHrs: _.round(
+          Utils.AsOfDateTargetHours(
+            bodyshop.scoreboard_target.dailyBodyTarget,
+            day
+          ) + bodyshop.scoreboard_target.dailyBodyTarget,
+          1
+        ),
+        accHrs: 0,
+      };
+      const lar = {
+        accTargetHrs: _.round(
+          Utils.AsOfDateTargetHours(
+            bodyshop.scoreboard_target.dailyPaintTarget,
+            day
+          ) + bodyshop.scoreboard_target.dailyPaintTarget,
+          1
+        ),
+        accHrs: 0,
+      };
+
+      if (ticketsGroupedByDate[day]) {
+        ticketsGroupedByDate[day].forEach((ticket) => {
+          r.actualhrs = r.actualhrs + ticket.actualhrs;
+          r.productivehrs = r.productivehrs + ticket.productivehrs;
+          acc_comb = acc_comb + ticket.productivehrs;
+
+          if (ticket.ciecacode !== "LAR")
+            acc_lab = acc_lab + ticket.productivehrs;
+          if (ticket.ciecacode === "LAR")
+            acc_lar = acc_lar + ticket.productivehrs;
+        });
+      }
+      combined.accHrs = acc_comb;
+      lab.accHrs = acc_lab;
+      lar.accHrs = acc_lar;
+
+      combinedData.push({ ...r, ...combined });
+      labData.push({ ...r, ...lab });
+      larData.push({ ...r, ...lar });
+    });
+
+    return {
+      fixed: ret,
+      combinedData: combinedData,
+      labData: labData,
+      larData: larData,
+    };
+  }, [fixedPeriods, data, bodyshop]);
+
+  if (error) return <AlertComponent message={error.message} type="error" />;
+  if (loading) return <LoadingSpinner />;
+  return (
+    <Row gutter={[16, 16]}>
+      <Col span={24}>
+        <ScoreboardTimeticketsTargetsTable />
+      </Col>
+      <Col span={24}>
+        <ScoreboardTicketsStats data={calculatedData.fixed} />
+      </Col>
+      <Col span={24}>
+        <ScoreboardTimeTicketsChart
+          data={calculatedData.combinedData}
+          chartTitle={t("scoreboard.labels.combinedcharttitle")}
+        />
+      </Col>
+      <Col span={12}>
+        <ScoreboardTimeTicketsChart
+          data={calculatedData.labData}
+          chartTitle={t("scoreboard.labels.bodycharttitle")}
+        />
+      </Col>
+      <Col span={12}>
+        <ScoreboardTimeTicketsChart
+          data={calculatedData.larData}
+          chartTitle={t("scoreboard.labels.refinishcharttitle")}
+        />
+      </Col>
+    </Row>
+  );
+}
+
+function roundObject(inputObj) {
+  for (var key of Object.keys(inputObj)) {
+    if (typeof inputObj[key] === "number") {
+      inputObj[key] = inputObj[key].toFixed(1);
+    } else if (Array.isArray(inputObj[key])) {
+      inputObj[key].forEach((item) => roundObject(item));
+    } else if (typeof inputObj[key] === "object") {
+      roundObject(inputObj[key]);
+    }
+  }
+}

client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.stats.component.jsx

@@ -0,0 +1,617 @@
+import {
+  Card,
+  Col,
+  Form,
+  Row,
+  Space,
+  Statistic,
+  Switch,
+  Typography,
+} from "antd";
+import moment from "moment";
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import * as Util from "../scoreboard-targets-table/scoreboard-targets-table.util";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ScoreboardTicketsStats);
+
+function useLocalStorage(key, initialValue) {
+  const [storedValue, setStoredValue] = useState(() => {
+    const item = localStorage.getItem(key);
+    return item ? JSON.parse(item) : initialValue;
+  });
+
+  useEffect(() => {
+    localStorage.setItem(key, JSON.stringify(storedValue));
+  }, [key, storedValue]);
+
+  return [storedValue, setStoredValue];
+}
+
+export function ScoreboardTicketsStats({ data, bodyshop }) {
+  const { t } = useTranslation();
+  const [isLarge, setIsLarge] = useLocalStorage("isLargeStatistic", false);
+
+  const statisticSize = isLarge ? 36 : 24;
+  const statisticWeight = isLarge ? 550 : "normal";
+  const daySpan =
+    Util.CalculateWorkingDaysInPeriod(
+      moment().startOf("week"),
+      moment().endOf("week")
+    ) > 5
+      ? 3
+      : 4;
+
+  return (
+    <Card
+      title={t("scoreboard.labels.productivestatistics")}
+      extra={
+        <Form.Item
+          label={t("general.labels.tvmode")}
+          valuePropName="checked"
+          name={["tvmode"]}
+        >
+          <Switch
+            onClick={() => setIsLarge(!isLarge)}
+            defaultChecked={isLarge}
+          />
+        </Form.Item>
+      }
+    >
+      <Row gutter={[16, 16]}>
+        <Col md={24}>
+          {/* Daily Stats */}
+          <Space direction="vertical" size="middle" style={{ display: "flex" }}>
+            <Row gutter={[16, 16]} align="center">
+              {[
+                "sunday",
+                "monday",
+                "tuesday",
+                "wednesday",
+                "thursday",
+                "friday",
+                "saturday",
+              ].map((day) => {
+                if (bodyshop.workingdays[day] === true) {
+                  return (
+                    <Col key={day} span={daySpan} align="center">
+                      <Card size="small" title={t("general.labels." + day)}>
+                        <Row gutter={[8, 8]}>
+                          <Col span={24}>
+                            <Statistic
+                              value={data.seperatedThisWeek[day].total}
+                              valueStyle={{
+                                color:
+                                  parseFloat(
+                                    data.seperatedThisWeek[day].total
+                                  ) >=
+                                  bodyshop.scoreboard_target.dailyBodyTarget +
+                                    bodyshop.scoreboard_target.dailyPaintTarget
+                                    ? "green"
+                                    : "red",
+                                fontSize: statisticSize,
+                                fontWeight: statisticWeight,
+                              }}
+                            />
+                          </Col>
+                        </Row>
+                        <Row gutter={[16, 16]}>
+                          <Col span={12}>
+                            <Statistic
+                              title={
+                                <Typography.Text strong>
+                                  {t("scoreboard.labels.body")}
+                                </Typography.Text>
+                              }
+                              value={data.seperatedThisWeek[day].lab}
+                              valueStyle={{
+                                color:
+                                  parseFloat(data.seperatedThisWeek[day].lab) >=
+                                  bodyshop.scoreboard_target.dailyBodyTarget
+                                    ? "green"
+                                    : "red",
+                                fontSize: statisticSize,
+                                fontWeight: statisticWeight,
+                              }}
+                            />
+                          </Col>
+                          <Col span={12}>
+                            <Statistic
+                              title={
+                                <Typography.Text strong>
+                                  {t("scoreboard.labels.refinish")}
+                                </Typography.Text>
+                              }
+                              value={data.seperatedThisWeek[day].lar}
+                              valueStyle={{
+                                color:
+                                  parseFloat(data.seperatedThisWeek[day].lar) >=
+                                  bodyshop.scoreboard_target.dailyPaintTarget
+                                    ? "green"
+                                    : "red",
+                                fontSize: statisticSize,
+                                fontWeight: statisticWeight,
+                              }}
+                            />
+                          </Col>
+                        </Row>
+                      </Card>
+                    </Col>
+                  );
+                } else {
+                  return null;
+                }
+              })}
+            </Row>
+            {/* Weekly Stats */}
+            <Row gutter={[16, 16]}>
+              {/* This Week */}
+              <Col span={8} align="center">
+                <Card size="small" title={t("scoreboard.labels.thisweek")}>
+                  <Row gutter={[16, 16]}>
+                    <Col span={24}>
+                      <Statistic
+                        value={data.totalThisWeek}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalThisWeek) >=
+                            Util.WeeklyTargetHrsInPeriod(
+                              bodyshop.scoreboard_target.dailyBodyTarget,
+                              moment().startOf("week"),
+                              moment().endOf("week"),
+                              bodyshop
+                            ) +
+                              Util.WeeklyTargetHrsInPeriod(
+                                bodyshop.scoreboard_target.dailyPaintTarget,
+                                moment().startOf("week"),
+                                moment().endOf("week"),
+                                bodyshop
+                              )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                  <Row gutter={[16, 16]}>
+                    <Col span={12}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.body")}
+                          </Typography.Text>
+                        }
+                        value={data.totalThisWeekLAB}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalThisWeekLAB) >=
+                            Util.WeeklyTargetHrsInPeriod(
+                              bodyshop.scoreboard_target.dailyBodyTarget,
+                              moment().startOf("week"),
+                              moment().endOf("week"),
+                              bodyshop
+                            )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                    <Col span={12}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.refinish")}
+                          </Typography.Text>
+                        }
+                        value={data.totalThisWeekLAR}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalThisWeekLAR) >=
+                            Util.WeeklyTargetHrsInPeriod(
+                              bodyshop.scoreboard_target.dailyPaintTarget,
+                              moment().startOf("week"),
+                              moment().endOf("week"),
+                              bodyshop
+                            )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                </Card>
+              </Col>
+              {/* Last Week */}
+              <Col span={8} align="center">
+                <Card size="small" title={t("scoreboard.labels.lastweek")}>
+                  <Row gutter={[16, 16]}>
+                    <Col span={24}>
+                      <Statistic
+                        value={data.totalLastWeek}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalLastWeek) >=
+                            Util.WeeklyTargetHrsInPeriod(
+                              bodyshop.scoreboard_target.dailyBodyTarget,
+                              moment().subtract(1, "week").startOf("week"),
+                              moment().subtract(1, "week").endOf("week"),
+                              bodyshop
+                            ) +
+                              Util.WeeklyTargetHrsInPeriod(
+                                bodyshop.scoreboard_target.dailyPaintTarget,
+                                moment().subtract(1, "week").startOf("week"),
+                                moment().subtract(1, "week").endOf("week"),
+                                bodyshop
+                              )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                  <Row gutter={[16, 16]}>
+                    <Col span={12}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.body")}
+                          </Typography.Text>
+                        }
+                        value={data.totalLastWeekLAB}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalLastWeekLAB) >=
+                            Util.WeeklyTargetHrsInPeriod(
+                              bodyshop.scoreboard_target.dailyBodyTarget,
+                              moment().subtract(1, "week").startOf("week"),
+                              moment().subtract(1, "week").endOf("week"),
+                              bodyshop
+                            )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                    <Col span={12}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.refinish")}
+                          </Typography.Text>
+                        }
+                        value={data.totalLastWeekLAR}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalLastWeekLAR) >=
+                            Util.WeeklyTargetHrsInPeriod(
+                              bodyshop.scoreboard_target.dailyPaintTarget,
+                              moment().subtract(1, "week").startOf("week"),
+                              moment().subtract(1, "week").endOf("week"),
+                              bodyshop
+                            )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                </Card>
+              </Col>
+              {/* Prior Week */}
+              <Col span={8} align="center">
+                <Card size="small" title={t("scoreboard.labels.priorweek")}>
+                  <Row gutter={[16, 16]}>
+                    <Col span={24}>
+                      <Statistic
+                        value={data.totalPriorWeek}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalPriorWeek) >=
+                            Util.WeeklyTargetHrsInPeriod(
+                              bodyshop.scoreboard_target.dailyBodyTarget,
+                              moment().subtract(2, "week").startOf("week"),
+                              moment().subtract(2, "week").endOf("week"),
+                              bodyshop
+                            ) +
+                              Util.WeeklyTargetHrsInPeriod(
+                                bodyshop.scoreboard_target.dailyPaintTarget,
+                                moment().subtract(2, "week").startOf("week"),
+                                moment().subtract(2, "week").endOf("week"),
+                                bodyshop
+                              )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                  <Row gutter={[16, 16]}>
+                    <Col span={12}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.body")}
+                          </Typography.Text>
+                        }
+                        value={data.totalPriorWeekLAB}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalPriorWeekLAB) >=
+                            Util.WeeklyTargetHrsInPeriod(
+                              bodyshop.scoreboard_target.dailyBodyTarget,
+                              moment().subtract(2, "week").startOf("week"),
+                              moment().subtract(2, "week").endOf("week"),
+                              bodyshop
+                            )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                    <Col span={12}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.refinish")}
+                          </Typography.Text>
+                        }
+                        value={data.totalPriorWeekLAR}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalPriorWeekLAR) >=
+                            Util.WeeklyTargetHrsInPeriod(
+                              bodyshop.scoreboard_target.dailyPaintTarget,
+                              moment().subtract(2, "week").startOf("week"),
+                              moment().subtract(2, "week").endOf("week"),
+                              bodyshop
+                            )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                </Card>
+              </Col>
+            </Row>
+            {/* Monthly Stats */}
+            <Row gutter={[16, 16]}>
+              {/* This Month */}
+              <Col span={8} align="center">
+                <Card size="small" title={t("scoreboard.labels.thismonth")}>
+                  <Row gutter={[16, 16]}>
+                    <Col span={24}>
+                      <Statistic
+                        value={data.totalThisMonth}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalThisMonth) >=
+                            Util.MonthlyTargetHrs(
+                              bodyshop.scoreboard_target.dailyBodyTarget,
+                              bodyshop
+                            ) +
+                              Util.MonthlyTargetHrs(
+                                bodyshop.scoreboard_target.dailyPaintTarget,
+                                bodyshop
+                              )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                  <Row gutter={[16, 16]}>
+                    <Col span={12}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.body")}
+                          </Typography.Text>
+                        }
+                        value={data.totalThisMonthLAB}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalThisMonthLAB) >=
+                            Util.MonthlyTargetHrs(
+                              bodyshop.scoreboard_target.dailyBodyTarget,
+                              bodyshop
+                            )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                    <Col span={12}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.refinish")}
+                          </Typography.Text>
+                        }
+                        value={data.totalThisMonthLAR}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalThisMonthLAR) >=
+                            Util.MonthlyTargetHrs(
+                              bodyshop.scoreboard_target.dailyPaintTarget,
+                              bodyshop
+                            )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                </Card>
+              </Col>
+              {/* Last Month */}
+              <Col span={8} align="center">
+                <Card size="small" title={t("scoreboard.labels.lastmonth")}>
+                  <Row gutter={[16, 16]}>
+                    <Col span={24}>
+                      <Statistic
+                        value={data.totalLastMonth}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalLastMonth) >=
+                            Util.LastMonthTargetHrs(
+                              bodyshop.scoreboard_target.dailyBodyTarget,
+                              bodyshop
+                            ) +
+                              Util.LastMonthTargetHrs(
+                                bodyshop.scoreboard_target.dailyPaintTarget,
+                                bodyshop
+                              )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                  <Row gutter={[16, 16]}>
+                    <Col span={12}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.body")}
+                          </Typography.Text>
+                        }
+                        value={data.totalLastMonthLAB}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalLastMonthLAB) >=
+                            Util.LastMonthTargetHrs(
+                              bodyshop.scoreboard_target.dailyBodyTarget,
+                              bodyshop
+                            )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                    <Col span={12}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.refinish")}
+                          </Typography.Text>
+                        }
+                        value={data.totalLastMonthLAR}
+                        valueStyle={{
+                          color:
+                            parseFloat(data.totalLastMonthLAR) >=
+                            Util.LastMonthTargetHrs(
+                              bodyshop.scoreboard_target.dailyPaintTarget,
+                              bodyshop
+                            )
+                              ? "green"
+                              : "red",
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                </Card>
+              </Col>
+              {/* Efficiency Over Period */}
+              <Col span={8} align="center">
+                <Card
+                  size="small"
+                  title={t("scoreboard.labels.efficiencyoverperiod")}
+                >
+                  <Row gutter={[16, 16]}>
+                    <Col span={24}>
+                      <Statistic
+                        value={`${data.totalEffieciencyOverPeriod || 0}%`}
+                        valueStyle={{
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                  <Row gutter={[16, 16]}>
+                    <Col span={12}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.body")}
+                          </Typography.Text>
+                        }
+                        value={`${data.totalEffieciencyOverPeriodLAB || 0}%`}
+                        valueStyle={{
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                    <Col span={12}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.refinish")}
+                          </Typography.Text>
+                        }
+                        value={`${data.totalEffieciencyOverPeriodLAR || 0}%`}
+                        valueStyle={{
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                </Card>
+              </Col>
+            </Row>
+          </Space>
+          {/* Disclaimer */}
+          <Typography.Text type="secondary">
+            *{t("scoreboard.labels.calendarperiod")}
+          </Typography.Text>
+        </Col>
+      </Row>
+    </Card>
+  );
+}

client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.targets-table.component.jsx

@@ -0,0 +1,285 @@
+import { CalendarOutlined } from "@ant-design/icons";
+import { Card, Col, Divider, Row, Statistic } from "antd";
+import moment from "moment";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import * as Util from "../scoreboard-targets-table/scoreboard-targets-table.util";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+const rowGutter = [16, 16];
+const statSpans = { xs: 24, sm: 3 };
+
+export function ScoreboardTimeticketsTargetsTable({ bodyshop }) {
+  const { t } = useTranslation();
+
+  return (
+    <Card title={t("scoreboard.labels.targets")}>
+      <Row gutter={rowGutter}>
+        <Col xs={24} sm={{ offset: 0, span: 3 }} lg={{ span: 3 }}>
+          <Statistic
+            title={t("scoreboard.labels.workingdays")}
+            value={Util.CalculateWorkingDaysThisMonth()}
+            prefix={<CalendarOutlined />}
+          />
+        </Col>
+        <Col xs={24} sm={{ offset: 0, span: 20 }} lg={{ offset: 0, span: 20 }}>
+          <Row>
+            <Col {...statSpans}>
+              <Statistic title="Type" value={t("scoreboard.labels.body")} />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                title={t("scoreboard.labels.dailytarget")}
+                value={bodyshop.scoreboard_target.dailyBodyTarget}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                title={t("scoreboard.labels.thisweek")}
+                value={Util.WeeklyTargetHrs(
+                  bodyshop.scoreboard_target.dailyBodyTarget,
+                  moment().startOf("week"),
+                  moment().endOf("week"),
+                  bodyshop
+                )}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                title={t("scoreboard.labels.lastweek")}
+                value={Util.WeeklyTargetHrs(
+                  bodyshop.scoreboard_target.dailyBodyTarget,
+                  moment().subtract(1, "week").startOf("week"),
+                  moment().subtract(1, "week").endOf("week"),
+                  bodyshop
+                )}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                title={t("scoreboard.labels.priorweek")}
+                value={Util.WeeklyTargetHrs(
+                  bodyshop.scoreboard_target.dailyBodyTarget,
+                  moment().subtract(2, "week").startOf("week"),
+                  moment().subtract(2, "week").endOf("week"),
+                  bodyshop
+                )}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                title={t("scoreboard.labels.thismonth")}
+                value={Util.MonthlyTargetHrs(
+                  bodyshop.scoreboard_target.dailyBodyTarget,
+                  bodyshop
+                )}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                title={t("scoreboard.labels.lastmonth")}
+                value={Util.LastMonthTargetHrs(
+                  bodyshop.scoreboard_target.dailyBodyTarget,
+                  bodyshop
+                )}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                title={t("scoreboard.labels.asoftodaytarget")}
+                value={Util.AsOfTodayTargetHrs(
+                  bodyshop.scoreboard_target.dailyBodyTarget,
+                  bodyshop
+                )}
+              />
+            </Col>
+          </Row>
+          <Row>
+            <Col {...statSpans}>
+              <Statistic value={t("scoreboard.labels.refinish")} />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic value={bodyshop.scoreboard_target.dailyPaintTarget} />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={Util.WeeklyTargetHrsInPeriod(
+                  bodyshop.scoreboard_target.dailyPaintTarget,
+                  moment().startOf("week"),
+                  moment().endOf("week"),
+                  bodyshop
+                )}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={Util.WeeklyTargetHrs(
+                  bodyshop.scoreboard_target.dailyPaintTarget,
+                  moment().subtract(1, "week").startOf("week"),
+                  moment().subtract(1, "week").endOf("week"),
+                  bodyshop
+                )}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={Util.WeeklyTargetHrs(
+                  bodyshop.scoreboard_target.dailyPaintTarget,
+                  moment().subtract(2, "week").startOf("week"),
+                  moment().subtract(2, "week").endOf("week"),
+                  bodyshop
+                )}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={Util.MonthlyTargetHrs(
+                  bodyshop.scoreboard_target.dailyPaintTarget,
+                  bodyshop
+                )}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={Util.LastMonthTargetHrs(
+                  bodyshop.scoreboard_target.dailyPaintTarget,
+                  bodyshop
+                )}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={Util.AsOfTodayTargetHrs(
+                  bodyshop.scoreboard_target.dailyPaintTarget,
+                  bodyshop
+                )}
+              />
+            </Col>
+          </Row>
+          <Row>
+            <Divider style={{ margin: 5 }} />
+          </Row>
+          <Row>
+            <Col {...statSpans}></Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={(
+                  bodyshop.scoreboard_target.dailyBodyTarget +
+                  bodyshop.scoreboard_target.dailyPaintTarget
+                ).toFixed(1)}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={(
+                  Util.WeeklyTargetHrs(
+                    bodyshop.scoreboard_target.dailyBodyTarget,
+                    moment().startOf("week"),
+                    moment().endOf("week"),
+                    bodyshop
+                  ) +
+                  Util.WeeklyTargetHrs(
+                    bodyshop.scoreboard_target.dailyPaintTarget,
+                    moment().startOf("week"),
+                    moment().endOf("week"),
+                    bodyshop
+                  )
+                ).toFixed(1)}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={(
+                  Util.WeeklyTargetHrs(
+                    bodyshop.scoreboard_target.dailyBodyTarget,
+                    moment().subtract(1, "week").startOf("week"),
+                    moment().subtract(1, "week").endOf("week"),
+                    bodyshop
+                  ) +
+                  Util.WeeklyTargetHrs(
+                    bodyshop.scoreboard_target.dailyPaintTarget,
+                    moment().subtract(1, "week").startOf("week"),
+                    moment().subtract(1, "week").endOf("week"),
+                    bodyshop
+                  )
+                ).toFixed(1)}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={(
+                  Util.WeeklyTargetHrs(
+                    bodyshop.scoreboard_target.dailyBodyTarget,
+                    moment().subtract(2, "week").startOf("week"),
+                    moment().subtract(2, "week").endOf("week"),
+                    bodyshop
+                  ) +
+                  Util.WeeklyTargetHrs(
+                    bodyshop.scoreboard_target.dailyPaintTarget,
+                    moment().subtract(2, "week").startOf("week"),
+                    moment().subtract(2, "week").endOf("week"),
+                    bodyshop
+                  )
+                ).toFixed(1)}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={(
+                  Util.MonthlyTargetHrs(
+                    bodyshop.scoreboard_target.dailyBodyTarget,
+                    bodyshop
+                  ) +
+                  Util.MonthlyTargetHrs(
+                    bodyshop.scoreboard_target.dailyPaintTarget,
+                    bodyshop
+                  )
+                ).toFixed(1)}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={(
+                  Util.LastMonthTargetHrs(
+                    bodyshop.scoreboard_target.dailyBodyTarget,
+                    bodyshop
+                  ) +
+                  Util.LastMonthTargetHrs(
+                    bodyshop.scoreboard_target.dailyPaintTarget,
+                    bodyshop
+                  )
+                ).toFixed(1)}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={(
+                  Util.AsOfTodayTargetHrs(
+                    bodyshop.scoreboard_target.dailyBodyTarget,
+                    bodyshop
+                  ) +
+                  Util.AsOfTodayTargetHrs(
+                    bodyshop.scoreboard_target.dailyPaintTarget,
+                    bodyshop
+                  )
+                ).toFixed(1)}
+              />
+            </Col>
+          </Row>
+        </Col>
+      </Row>
+    </Card>
+  );
+}
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ScoreboardTimeticketsTargetsTable);

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

@@ -42,12 +42,20 @@ export function ShopInfoGeneral({ form, bodyshop }) {
     bodyshop && bodyshop.imexshopid
   );
 
+
   return (
     <div>
       <LayoutFormRow
         header={t("bodyshop.labels.businessinformation")}
         id="businessinformation"
       >
+        <Form.Item
+        label={t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
+        name={["md_functionality_toggles","parts_queue_toggle"]}
+        valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.shopname")}
           name="shopname"

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

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

client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx

@@ -25,6 +25,7 @@ export function TechLookupJobsList({ bodyshop }) {
   const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
     variables: {
       statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
+      isConverted: true,
     },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",

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

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

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

@@ -16,13 +16,12 @@ const VehicleSearchSelect = ({ value, onChange, onBlur, disabled }, ref) => {
     SEARCH_VEHICLES_FOR_AUTOCOMPLETE
   );
 
-  const [
-    callIdSearch,
-    { loading: idLoading, error: idError, data: idData },
-  ] = useLazyQuery(SEARCH_VEHICLES_BY_ID_FOR_AUTOCOMPLETE);
+  const [callIdSearch, { loading: idLoading, error: idError, data: idData }] =
+    useLazyQuery(SEARCH_VEHICLES_BY_ID_FOR_AUTOCOMPLETE);
 
   const executeSearch = (v) => {
-    callSearch(v);
+    if (v && v.variables?.search !== "" && v.variables.search.length >= 2)
+      callSearch(v);
   };
   const debouncedExecuteSearch = _.debounce(executeSearch, 500);
 

client/src/components/vendors-form/vendors-form.component.jsx

@@ -154,7 +154,6 @@ export function VendorsFormComponent({
           label={t("vendors.fields.phone")}
           name="phone"
           rules={[
-            { required: true, message: t("general.validation.required") },
             ({ getFieldValue }) =>
               PhoneItemFormatterValidation(getFieldValue, "phone"),
           ]}

client/src/graphql/appointments.queries.js

@@ -271,6 +271,7 @@ export const CANCEL_APPOINTMENTS_BY_JOB_ID = gql`
       scheduled_completion
       status
       lost_sale_reason
+      date_lost_sale
     }
   }
 `;

client/src/graphql/bills.queries.js

@@ -5,6 +5,7 @@ export const INSERT_NEW_BILL = gql`
     insert_bills(objects: $bill) {
       returning {
         id
+        invoice_number
       }
     }
   }

client/src/graphql/bodyshop.queries.js

@@ -39,6 +39,7 @@ export const QUERY_BODYSHOP = gql`
       logo_img_path
       md_ro_statuses
       md_order_statuses
+      md_functionality_toggles
       shopname
       state
       state_tax_id
@@ -158,6 +159,7 @@ export const UPDATE_SHOP = gql`
         logo_img_path
         md_ro_statuses
         md_order_statuses
+        md_functionality_toggles
         shopname
         state
         state_tax_id

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

@@ -219,6 +219,7 @@ export const GET_JOB_LINES_TO_ENTER_BILL = gql`
         id
         ro_number
       }
+      v_make_desc
     }
   }
 `;

client/src/graphql/jobs.queries.js

@@ -1,9 +1,9 @@
 import { gql } from "@apollo/client";
 
 export const QUERY_ALL_ACTIVE_JOBS = gql`
-  query QUERY_ALL_ACTIVE_JOBS($statuses: [String!]!) {
+  query QUERY_ALL_ACTIVE_JOBS($statuses: [String!]!, $isConverted: Boolean) {
     jobs(
-      where: { status: { _in: $statuses } }
+      where: { status: { _in: $statuses }, converted: { _eq: $isConverted } }
       order_by: { created_at: desc }
     ) {
       iouparent
@@ -432,7 +432,6 @@ export const QUERY_JOB_COSTING_DETAILS = gql`
       status
       ca_bc_pvrt
       ca_customer_gst
-
       joblines(where: { removed: { _eq: false } }) {
         id
         unq_seq
@@ -574,7 +573,6 @@ export const GET_JOB_BY_PK = gql`
       est_co_nm
       est_ct_fn
       est_ct_ln
-
       est_ph1
       est_ea
       selling_dealer
@@ -677,6 +675,7 @@ export const GET_JOB_BY_PK = gql`
       date_scheduled
       date_invoiced
       date_last_contacted
+      date_lost_sale
       date_next_contact
       date_towin
       date_rentalresp
@@ -746,6 +745,7 @@ export const GET_JOB_BY_PK = gql`
         jobid
         amount
         payer
+        paymentnum
         created_at
         transactionid
         memo
@@ -1001,7 +1001,6 @@ export const QUERY_TECH_JOB_DETAILS = gql`
       actual_completion
       actual_delivery
       actual_in
-
       id
       ins_co_nm
       clm_no
@@ -1079,6 +1078,7 @@ export const UPDATE_JOB = gql`
         actual_in
         date_repairstarted
         date_void
+        date_lost_sale
       }
     }
   }
@@ -1242,7 +1242,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
   ) {
     search_jobs(
       args: { search: $search }
-      limit: 50
+      limit: 25
       where: {
         _and: {
           converted: { _eq: $isConverted }
@@ -1586,7 +1586,6 @@ export const QUERY_ALL_JOB_FIELDS = gql`
       clm_title
       clm_total
       clm_zip
-
       cust_pr
       ded_amt
       ded_status
@@ -1669,7 +1668,6 @@ export const QUERY_ALL_JOB_FIELDS = gql`
       parts_tax_rates
       pay_amt
       pay_chknm
-
       pay_type
       payee_nms
       plate_no
@@ -2077,6 +2075,7 @@ export const QUERY_JOB_EXPORT_DMS = gql`
     }
   }
 `;
+
 export const QUERY_RELATED_ROS = gql`
   query QUERY_RELATED_ROS($jobid: uuid!) {
     relatedjobs(
@@ -2098,6 +2097,7 @@ export const QUERY_RELATED_ROS = gql`
     }
   }
 `;
+
 export const INSERT_RELATED_ROS = gql`
   mutation INSERT_RELATED_ROS($relationship: relatedjobs_insert_input!) {
     insert_relatedjobs_one(object: $relationship) {
@@ -2115,6 +2115,7 @@ export const INSERT_RELATED_ROS = gql`
     }
   }
 `;
+
 export const DELETE_RELATED_RO = gql`
   mutation DELETE_RELATED_RO($relationshipid: uuid!) {
     delete_relatedjobs_by_pk(id: $relationshipid) {
@@ -2122,6 +2123,7 @@ export const DELETE_RELATED_RO = gql`
     }
   }
 `;
+
 export const GET_JOB_LINE_ORDERS = gql`
   query GET_JOB_LINE_ORDERS($joblineid: uuid!) {
     billlines(where: { joblineid: { _eq: $joblineid } }) {

client/src/graphql/owners.queries.js

@@ -36,7 +36,7 @@ export const SEARCH_OWNERS_FOR_AUTOCOMPLETE = gql`
   query SEARCH_OWNERS_FOR_AUTOCOMPLETE($search: String) {
     search_owners(
       args: { search: $search }
-      limit: 50
+      limit: 25
       order_by: { ownr_ln: desc_nulls_last }
     ) {
       id

client/src/graphql/payment_response.queries.js

@@ -28,16 +28,14 @@ export const QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID = gql`
   }
 `;
 
-export const QUERY_RO_AND_OWNER_BY_JOB_PK = gql`
-  query QUERY_RO_AND_OWNER_BY_JOB_PK($jobid: uuid!) {
-    jobs_by_pk(id: $jobid) {
+export const QUERY_RO_AND_OWNER_BY_JOB_PKS = gql`
+  query QUERY_RO_AND_OWNER_BY_JOB_PKS($jobids: [uuid!]!) {
+    jobs(where: { id: { _in: $jobids } }) {
       ro_number
-      owner {
-        ownr_fn
-        ownr_ln
-        ownr_ea
-        ownr_zip
-      }
+      ownr_fn
+      ownr_ln
+      ownr_ea
+      ownr_zip
     }
   }
 `;

client/src/graphql/timetickets.queries.js

@@ -145,7 +145,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
     $fixedEnd: date!
   ) {
     timetickets(
-      where: { date: { _gte: $start, _lte: $end } }
+      where: { date: { _gte: $start, _lte: $end }, cost_center: {_neq: "timetickets.labels.shift"} }
       order_by: { date: desc_nulls_first }
     ) {
       actualhrs
@@ -176,7 +176,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
       }
     }
     fixedperiod: timetickets(
-      where: { date: { _gte: $fixedStart, _lte: $fixedEnd } }
+      where: { date: { _gte: $fixedStart, _lte: $fixedEnd }, cost_center: {_neq: "timetickets.labels.shift"} }
       order_by: { date: desc_nulls_first }
     ) {
       actualhrs

client/src/graphql/vehicles.queries.js

@@ -184,7 +184,7 @@ export const SEARCH_VEHICLES_BY_ID_FOR_AUTOCOMPLETE = gql`
 `;
 export const SEARCH_VEHICLES_FOR_AUTOCOMPLETE = gql`
   query SEARCH_VEHICLES_FOR_AUTOCOMPLETE($search: String) {
-    search_vehicles(args: { search: $search }, limit: 50) {
+    search_vehicles(args: { search: $search }, limit: 25) {
       id
       v_vin
       v_model_yr

client/src/graphql/vendors.queries.js

@@ -104,6 +104,7 @@ export const SEARCH_VENDOR_AUTOCOMPLETE = gql`
       id
       cost_center
       active
+      favorite
     }
   }
 `;

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

@@ -3,19 +3,19 @@ import Icon, {
   CalendarFilled,
   DollarCircleOutlined,
   FileImageFilled,
-  PrinterFilled,
-  ToolFilled,
   HistoryOutlined,
+  PrinterFilled,
   SyncOutlined,
+  ToolFilled,
 } from "@ant-design/icons";
 import {
   Button,
   Divider,
   Form,
-  notification,
   PageHeader,
   Space,
   Tabs,
+  notification,
 } from "antd";
 import Axios from "axios";
 import moment from "moment";
@@ -27,6 +27,7 @@ import { connect } from "react-redux";
 import { useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import FormFieldsChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
+import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
 import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
 import JobLineUpsertModalContainer from "../../components/job-lines-upsert-modal/job-lines-upsert-modal.container";
 import JobReconciliationModal from "../../components/job-reconciliation-modal/job-reconciliation.modal.container";
@@ -42,17 +43,17 @@ import JobsDetailPliContainer from "../../components/jobs-detail-pli/jobs-detail
 import JobsDetailRates from "../../components/jobs-detail-rates/jobs-detail-rates.component";
 import JobsDetailTotals from "../../components/jobs-detail-totals/jobs-detail-totals.component";
 import JobsDocumentsGalleryContainer from "../../components/jobs-documents-gallery/jobs-documents-gallery.container";
+import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
 import JobNotesContainer from "../../components/jobs-notes/jobs-notes.container";
+import NoteUpsertModalComponent from "../../components/note-upsert-modal/note-upsert-modal.container";
 import ScheduleJobModalContainer from "../../components/schedule-job-modal/schedule-job-modal.container";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 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";
-import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
 import UndefinedToNull from "../../utils/undefinedtonull";
-import NoteUpsertModalComponent from "../../components/note-upsert-modal/note-upsert-modal.container";
+import { DateTimeFormat } from "./../../utils/DateFormatter";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -172,7 +173,7 @@ export function JobsDetailPage({
           operation: AuditTrailMapping.jobfieldchange(
             key,
             changedAuditFields[key] instanceof moment
-              ? moment(changedAuditFields[key]).format("MM/DD/YYYY hh:mm a")
+              ? DateTimeFormat(changedAuditFields[key])
               : changedAuditFields[key]
           ),
         });

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

@@ -1,21 +1,22 @@
 import Icon, { FieldTimeOutlined } from "@ant-design/icons";
 import { Tabs } from "antd";
+import queryString from "query-string";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { FaShieldAlt } from "react-icons/fa";
 import { connect } from "react-redux";
+import { useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import FeatureWrapper from "../../components/feature-wrapper/feature-wrapper.component";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import ScoreboardDisplay from "../../components/scoreboard-display/scoreboard-display.component";
+import ScoreboardTimeTicketsStats from "../../components/scoreboard-timetickets-stats/scoreboard-timetickets.component";
 import ScoreboardTimeTickets from "../../components/scoreboard-timetickets/scoreboard-timetickets.component";
 import {
   setBreadcrumbs,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import queryString from "query-string";
-import { useHistory, useLocation } from "react-router-dom";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -71,7 +72,7 @@ export function ScoreboardContainer({ setBreadcrumbs, setSelectedHeader }) {
             tab={
               <span>
                 <FieldTimeOutlined />
-                {t("scoreboard.labels.timetickets")}
+                {t("scoreboard.labels.timeticketsemployee")}
               </span>
             }
             destroyInactiveTabPane
@@ -79,6 +80,18 @@ export function ScoreboardContainer({ setBreadcrumbs, setSelectedHeader }) {
           >
             <ScoreboardTimeTickets />
           </Tabs.TabPane>
+          <Tabs.TabPane
+            tab={
+              <span>
+                <FieldTimeOutlined />
+                {t("scoreboard.labels.allemployeetimetickets")}
+              </span>
+            }
+            destroyInactiveTabPane
+            key="ticketsstats"
+          >
+            <ScoreboardTimeTicketsStats />
+          </Tabs.TabPane>
         </Tabs>
       </RbacWrapper>
     </FeatureWrapper>

client/src/redux/messaging/messaging.reducer.js

@@ -6,6 +6,7 @@ const INITIAL_STATE = {
   isSending: false,
   error: null,
   message: null,
+  searchingForConversation: false,
 };
 
 const messagingReducer = (state = INITIAL_STATE, action) => {
@@ -17,10 +18,16 @@ const messagingReducer = (state = INITIAL_STATE, action) => {
         ...state,
         visible: !state.visible,
       };
+    case MessagingActionTypes.OPEN_CHAT_BY_PHONE:
+      return {
+        ...state,
+        searchingForConversation: true,
+      };
     case MessagingActionTypes.SET_SELECTED_CONVERSATION:
       return {
         ...state,
         visible: true,
+        searchingForConversation: false,
         selectedConversationId: action.payload,
       };
     case MessagingActionTypes.SEND_MESSAGE:

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

@@ -4,7 +4,7 @@ import { all, call, put, select, takeLatest } from "redux-saga/effects";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   CONVERSATION_ID_BY_PHONE,
-  CREATE_CONVERSATION
+  CREATE_CONVERSATION,
 } from "../../graphql/conversations.queries";
 import { INSERT_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
 import client from "../../utils/GraphQLClient";
@@ -12,7 +12,7 @@ import { selectBodyshop } from "../user/user.selectors";
 import {
   sendMessageFailure,
   sendMessageSuccess,
-  setSelectedConversation
+  setSelectedConversation,
 } from "./messaging.actions";
 import MessagingActionTypes from "./messaging.types";
 
@@ -79,6 +79,7 @@ export function* openChatByPhone({ payload }) {
         });
     } else {
       console.log("ERROR: Multiple conversations found. ");
+      yield put(setSelectedConversation(null));
     }
   } catch (error) {
     console.log("Error in sendMessage saga.", error);

client/src/redux/messaging/messaging.selectors.js

@@ -26,3 +26,8 @@ export const selectMessage = createSelector(
   [selectMessaging],
   (messaging) => messaging.message
 );
+
+export const searchingForConversation = createSelector(
+  [selectMessaging],
+  (messaging) => messaging.searchingForConversation
+);

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

@@ -1,15 +1,17 @@
-import Fingerprint2 from "@fingerprintjs/fingerprintjs";
+import FingerprintJS from "@fingerprintjs/fingerprintjs";
 import * as Sentry from "@sentry/browser";
 import { notification } from "antd";
+import axios from "axios";
 import { setUserId, setUserProperties } from "firebase/analytics";
 import {
   checkActionCode,
   confirmPasswordReset,
+  sendPasswordResetEmail,
   signInWithEmailAndPassword,
   signOut,
-  sendPasswordResetEmail,
 } from "firebase/auth";
-import { doc } from "firebase/firestore";
+import { doc, getDoc, setDoc } from "firebase/firestore";
+import { getToken } from "firebase/messaging";
 import i18next from "i18next";
 import LogRocket from "logrocket";
 import { all, call, delay, put, select, takeLatest } from "redux-saga/effects";
@@ -20,6 +22,7 @@ import {
   firestore,
   getCurrentUser,
   logImEXEvent,
+  messaging,
   updateCurrentUser,
 } from "../../firebase/firebase.utils";
 import {
@@ -28,6 +31,7 @@ import {
   sendPasswordResetSuccess,
   setAuthlevel,
   setInstanceConflict,
+  setInstanceId,
   setLocalFingerprint,
   signInFailure,
   signInSuccess,
@@ -39,9 +43,8 @@ import {
   validatePasswordResetSuccess,
 } from "./user.actions";
 import UserActionTypes from "./user.types";
-import axios from "axios";
-import { messaging } from "../../firebase/firebase.utils";
-import { getToken } from "firebase/messaging";
+
+const fpPromise = FingerprintJS.load();
 
 export function* onEmailSignInStart() {
   yield takeLatest(UserActionTypes.EMAIL_SIGN_IN_START, signInWithEmail);
@@ -148,17 +151,15 @@ export function* setInstanceIdSaga({ payload: uid }) {
   try {
     const userInstanceRef = doc(firestore, `userInstance/${uid}`);
 
-    const fingerprint = Fingerprint2.x64hash128(
-      (yield Fingerprint2.getPromise({})).map((c) => c.value).join(""),
-      31
-    );
-
-    yield userInstanceRef.set({
+    // Get the visitor identifier when you need it.
+    const fp = yield fpPromise;
+    const result = yield fp.get();
+    yield setDoc(userInstanceRef, {
       timestamp: new Date(),
-      fingerprint,
+      fingerprint: result.visitorId,
     });
 
-    yield put(setLocalFingerprint(fingerprint));
+    yield put(setLocalFingerprint(result.visitorId));
     yield delay(5 * 60 * 1000);
     if (process.env.NODE_ENV === "production") yield put(checkInstanceId(uid));
   } catch (error) {
@@ -171,11 +172,9 @@ export function* onCheckInstanceId() {
 }
 export function* checkInstanceIdSaga({ payload: uid }) {
   try {
-    const userInstanceRef = doc(firestore, `userInstance/${uid}`);
-
-    const snapshot = yield userInstanceRef.get();
+    const snapshot = yield getDoc(doc(firestore, `userInstance/${uid}`));
     let fingerprint = yield select((state) => state.user.fingerprint);
-
+    yield put(setInstanceConflict());
     if (snapshot.data().fingerprint === fingerprint) {
       yield delay(5 * 60 * 1000);
       yield put(checkInstanceId(uid));
@@ -215,7 +214,6 @@ export function* signInSuccessSaga({ payload }) {
     console.log("Error updating Crisp settings.", error);
   }
 
-  // if (!payload.email.includes("@imex.")) yield put(setInstanceId(payload.uid));
   setUserId(analytics, payload.email);
   setUserProperties(analytics, payload);
   yield logImEXEvent("redux_sign_in_success");
@@ -289,6 +287,14 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
           : { validemail: false }
       )
     );
+
+    if (payload.features.singleDeviceOnly) {
+      const user = yield select((state) => state.user.currentUser);
+
+      if (!(user.email.includes("@imex.") || user.email.includes("@rome.")))
+        yield put(setInstanceId(user.uid));
+    }
+
     try {
       window.$crisp.push(["set", "user:company", [payload.shopname]]);
       if (authRecord[0] && authRecord[0].user.validemail) {

client/src/translations/en_us/common.json

@@ -27,6 +27,7 @@
 				"preview": "Preview",
 				"reschedule": "Reschedule",
 				"sendreminder": "Send Reminder",
+				"unblock": "Unblock",
 				"viewjob": "View Job"
 			},
 			"errors": {
@@ -102,6 +103,8 @@
 				"admin_jobmarkforreexport": "ADMIN: Job marked for re-export.",
 				"admin_jobuninvoice": "ADMIN: Job has been uninvoiced.",
 				"admin_jobunvoid": "ADMIN: Job has been unvoided.",
+				"appointmentcancel": "Appointment canceled. Lost Reason: {{lost_sale_reason}}.",
+				"appointmentinsert": "Appointment created. Appointment Date: {{start}}.",
 				"billposted": "Bill with invoice number {{invoice_number}} posted.",
 				"billupdated": "Bill with invoice number {{invoice_number}} updated.",
 				"failedpayment": "Failed payment",
@@ -346,6 +349,9 @@
 				},
 				"md_payment_types": "Payment Types",
 				"md_referral_sources": "Referral Sources",
+				"md_functionality_toggles":  {
+					"parts_queue_toggle": "Automatically Add Imported/Supplemented Jobs to Parts Queue"
+				},
 				"md_tasks_presets": {
 					"hourstype": "",
 					"memo": "",
@@ -490,7 +496,7 @@
 					"lam": "Mechanical",
 					"lar": "Refinish",
 					"las": "Structural",
-					"lau": "Detail",
+					"lau": "User Defined",
 					"local_tax": "Local Tax",
 					"mapa": "Paint Materials",
 					"mash": "Shop Materials",
@@ -854,14 +860,16 @@
 				"refhrs": "Refinish Hrs"
 			},
 			"titles": {
+				"labhours": "Total Body Hours",
+				"larhours": "Total Refinish Hours",
 				"monthlyemployeeefficiency": "Monthly Employee Efficiency",
 				"monthlyjobcosting": "Monthly Job Costing ",
 				"monthlylaborsales": "Monthly Labor Sales",
 				"monthlypartssales": "Monthly Parts Sales",
 				"monthlyrevenuegraph": "Monthly Revenue Graph",
 				"prodhrssummary": "Production Hours Summary",
-				"productiondollars": "Total dollars in Production",
-				"productionhours": "Total hours in Production",
+				"productiondollars": "Total Dollars in Production",
+				"productionhours": "Total Hours in Production",
 				"projectedmonthlysales": "Projected Monthly Sales",
 				"scheduledintoday": "Sheduled In Today: {{date}}",
 				"scheduledouttoday": "Sheduled Out Today: {{date}}"
@@ -1114,6 +1122,7 @@
 				"total": "Total",
 				"totals": "Totals",
 				"tuesday": "Tuesday",
+				"tvmode": "TV Mode",
 				"unknown": "Unknown",
 				"username": "Username",
 				"view": "View",
@@ -1211,6 +1220,7 @@
 				"payer": "Payer",
 				"payername": "Payer Name",
 				"paymentid": "Payment Reference ID",
+				"paymentnum": "Payment Number",
 				"paymenttype": "Payment Type",
 				"refundamount": "Refund Amount",
 				"transactionid": "Transaction ID"
@@ -1439,6 +1449,7 @@
 				"date_exported": "Exported",
 				"date_invoiced": "Invoiced",
 				"date_last_contacted": "Last Contacted Date",
+				"date_lost_sale": "Lost Sale",
 				"date_next_contact": "Next Contact Date",
 				"date_open": "Open",
 				"date_rentalresp": "Shop Rental Responsibility Start",
@@ -1461,6 +1472,7 @@
 					"cost_dms_acctnumber": "Cost DMS Acct #",
 					"dms_make": "DMS Make",
 					"dms_model": "DMS Model",
+					"dms_model_override": "Override DMS Make/Model",
 					"dms_unsold": "New, Unsold Vehicle",
 					"dms_wip_acctnumber": "Cost WIP DMS Acct #",
 					"id": "DMS ID",
@@ -2207,7 +2219,8 @@
 			},
 			"errors": {
 				"exporting": "Error exporting payment(s). {{error}}",
-				"exporting-partner": "Error exporting to partner. Please check the partner interaction log for more errors."
+				"exporting-partner": "Error exporting to partner. Please check the partner interaction log for more errors.",
+				"inserting": "Error inserting payment. {{error}}"
 			},
 			"fields": {
 				"amount": "Amount",
@@ -2563,18 +2576,22 @@
 				"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_estimator": "Hours Sold Detail - Closed by Estimator",
 				"hours_sold_detail_closed_ins_co": "Hours Sold Detail - Closed by Source",
 				"hours_sold_detail_closed_status": "Hours Sold Detail - Closed by Status",
 				"hours_sold_detail_open": "Hours Sold Detail - Open",
 				"hours_sold_detail_open_csr": "Hours Sold Detail - Open by CSR",
+				"hours_sold_detail_open_estimator": "Hours Sold Detail - Open by Estimator",
 				"hours_sold_detail_open_ins_co": "Hours Sold Detail - Open by Source",
 				"hours_sold_detail_open_status": "Hours Sold Detail - Open by Status",
 				"hours_sold_summary_closed": "Hours Sold Summary - Closed",
 				"hours_sold_summary_closed_csr": "Hours Sold Summary - Closed by CSR",
+				"hours_sold_summary_closed_estimator": "Hours Sold Summary - Closed by Estimator",
 				"hours_sold_summary_closed_ins_co": "Hours Sold Summary - Closed by Source",
 				"hours_sold_summary_closed_status": "Hours Sold Summary - Closed by Status",
 				"hours_sold_summary_open": "Hours Sold Summary - Open",
 				"hours_sold_summary_open_csr": "Hours Sold Summary - Open CSR",
+				"hours_sold_summary_open_estimator": "Hours Sold Summary - Open Estimator",
 				"hours_sold_summary_open_ins_co": "Hours Sold Summary - Open by Source",
 				"hours_sold_summary_open_status": "Hours Sold Summary - Open by Status",
 				"job_costing_ro_csr": "Job Costing by CSR",
@@ -2587,10 +2604,12 @@
 				"jobs_reconcile": "Parts/Sublet/Labor Reconciliation",
 				"jobs_scheduled_completion": "Jobs Scheduled Completion",
 				"lag_time": "Lag Time",
+				"lost_sales": "Lost Sales",
 				"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",
+				"open_orders_referral": "Open Orders by Referral Source",
 				"open_orders_specific_csr": "Open Orders filtered by CSR",
 				"open_orders_status": "Open Orders by Status",
 				"parts_backorder": "IOU Parts List",
@@ -2665,8 +2684,12 @@
 				"painthrs": "Paint Hours"
 			},
 			"labels": {
+				"allemployeetimetickets": "All Employee Time Tickets",
 				"asoftodaytarget": "As of Today",
+				"body": "Body",
+				"bodycharttitle": "Body Targets vs Actual",
 				"calendarperiod": "Periods based on calendar weeks/months.",
+				"combinedcharttitle": "Combined Targets vs Actual",
 				"dailyactual": "Actual (D)",
 				"dailytarget": "Daily",
 				"efficiencyoverperiod": "Efficiency over Selected Dates",
@@ -2675,12 +2698,16 @@
 				"lastmonth": "Last Month",
 				"lastweek": "Last Week",
 				"monthlytarget": "Monthly",
+				"priorweek": "Prior Week",
 				"productivestatistics": "Productive Hours Statistics",
 				"productivetimeticketsoverdate": "Productive Hours over Selected Dates",
+				"refinish": "Refinish",
+				"refinishcharttitle": "Refinish Targets vs Actual",
 				"targets": "Targets",
 				"thismonth": "This Month",
 				"thisweek": "This Week",
-				"timetickets": "Timetickets",
+				"timetickets": "Time Tickets",
+				"timeticketsemployee": "Time Tickets by Employee",
 				"todateactual": "Actual (MTD)",
 				"totaloverperiod": "Total over Selected Dates",
 				"weeklyactual": "Actual (W)",

client/src/translations/es/common.json

@@ -27,6 +27,7 @@
 				"preview": "",
 				"reschedule": "Reprogramar",
 				"sendreminder": "",
+				"unblock": "",
 				"viewjob": "Ver trabajo"
 			},
 			"errors": {
@@ -102,6 +103,8 @@
 				"admin_jobmarkforreexport": "",
 				"admin_jobuninvoice": "",
 				"admin_jobunvoid": "",
+				"appointmentcancel": "",
+				"appointmentinsert": "",
 				"billposted": "",
 				"billupdated": "",
 				"failedpayment": "",
@@ -251,6 +254,9 @@
 				"address1": "",
 				"address2": "",
 				"appt_alt_transport": "",
+				"md_functionality_toggles":  {
+					"parts_queue_toggle": "Parts Queue Toggle"
+				},
 				"appt_colors": {
 					"color": "",
 					"label": ""
@@ -854,6 +860,8 @@
 				"refhrs": ""
 			},
 			"titles": {
+				"labhours": "",
+				"larhours": "",
 				"monthlyemployeeefficiency": "",
 				"monthlyjobcosting": "",
 				"monthlylaborsales": "",
@@ -1114,6 +1122,7 @@
 				"total": "",
 				"totals": "",
 				"tuesday": "",
+				"tvmode": "",
 				"unknown": "Desconocido",
 				"username": "",
 				"view": "",
@@ -1211,6 +1220,7 @@
 				"payer": "",
 				"payername": "",
 				"paymentid": "",
+				"paymentnum": "",
 				"paymenttype": "",
 				"refundamount": "",
 				"transactionid": ""
@@ -1439,6 +1449,7 @@
 				"date_exported": "Exportado",
 				"date_invoiced": "Facturado",
 				"date_last_contacted": "",
+				"date_lost_sale": "",
 				"date_next_contact": "",
 				"date_open": "Abierto",
 				"date_rentalresp": "",
@@ -1461,6 +1472,7 @@
 					"cost_dms_acctnumber": "",
 					"dms_make": "",
 					"dms_model": "",
+					"dms_model_override": "",
 					"dms_unsold": "",
 					"dms_wip_acctnumber": "",
 					"id": "",
@@ -2207,7 +2219,8 @@
 			},
 			"errors": {
 				"exporting": "",
-				"exporting-partner": ""
+				"exporting-partner": "",
+				"inserting": ""
 			},
 			"fields": {
 				"amount": "",
@@ -2563,18 +2576,22 @@
 				"gsr_labor_only": "",
 				"hours_sold_detail_closed": "",
 				"hours_sold_detail_closed_csr": "",
+				"hours_sold_detail_closed_estimator": "",
 				"hours_sold_detail_closed_ins_co": "",
 				"hours_sold_detail_closed_status": "",
 				"hours_sold_detail_open": "",
 				"hours_sold_detail_open_csr": "",
+				"hours_sold_detail_open_estimator": "",
 				"hours_sold_detail_open_ins_co": "",
 				"hours_sold_detail_open_status": "",
 				"hours_sold_summary_closed": "",
 				"hours_sold_summary_closed_csr": "",
+				"hours_sold_summary_closed_estimator": "",
 				"hours_sold_summary_closed_ins_co": "",
 				"hours_sold_summary_closed_status": "",
 				"hours_sold_summary_open": "",
 				"hours_sold_summary_open_csr": "",
+				"hours_sold_summary_open_estimator": "",
 				"hours_sold_summary_open_ins_co": "",
 				"hours_sold_summary_open_status": "",
 				"job_costing_ro_csr": "",
@@ -2587,10 +2604,12 @@
 				"jobs_reconcile": "",
 				"jobs_scheduled_completion": "",
 				"lag_time": "",
+				"lost_sales": "",
 				"open_orders": "",
 				"open_orders_csr": "",
 				"open_orders_estimator": "",
 				"open_orders_ins_co": "",
+				"open_orders_referral": "",
 				"open_orders_specific_csr": "",
 				"open_orders_status": "",
 				"parts_backorder": "",
@@ -2665,8 +2684,12 @@
 				"painthrs": ""
 			},
 			"labels": {
+				"allemployeetimetickets": "",
 				"asoftodaytarget": "",
+				"body": "",
+				"bodycharttitle": "",
 				"calendarperiod": "",
+				"combinedcharttitle": "",
 				"dailyactual": "",
 				"dailytarget": "",
 				"efficiencyoverperiod": "",
@@ -2675,12 +2698,16 @@
 				"lastmonth": "",
 				"lastweek": "",
 				"monthlytarget": "",
+				"priorweek": "",
 				"productivestatistics": "",
 				"productivetimeticketsoverdate": "",
+				"refinish": "",
+				"refinishcharttitle": "",
 				"targets": "",
 				"thismonth": "",
 				"thisweek": "",
 				"timetickets": "",
+				"timeticketsemployee": "",
 				"todateactual": "",
 				"totaloverperiod": "",
 				"weeklyactual": "",

client/src/translations/fr/common.json

@@ -27,6 +27,7 @@
 				"preview": "",
 				"reschedule": "Replanifier",
 				"sendreminder": "",
+				"unblock": "",
 				"viewjob": "Voir le travail"
 			},
 			"errors": {
@@ -102,6 +103,8 @@
 				"admin_jobmarkforreexport": "",
 				"admin_jobuninvoice": "",
 				"admin_jobunvoid": "",
+				"appointmentcancel": "",
+				"appointmentinsert": "",
 				"billposted": "",
 				"billupdated": "",
 				"failedpayment": "",
@@ -328,6 +331,9 @@
 					"paint": "",
 					"prep": ""
 				},
+				"md_functionality_toggles":  {
+					"parts_queue_toggle": "Parts Queue Toggle"
+				},
 				"md_ins_co": {
 					"city": "",
 					"name": "",
@@ -854,6 +860,8 @@
 				"refhrs": ""
 			},
 			"titles": {
+				"labhours": "",
+				"larhours": "",
 				"monthlyemployeeefficiency": "",
 				"monthlyjobcosting": "",
 				"monthlylaborsales": "",
@@ -1114,6 +1122,7 @@
 				"total": "",
 				"totals": "",
 				"tuesday": "",
+				"tvmode": "",
 				"unknown": "Inconnu",
 				"username": "",
 				"view": "",
@@ -1211,6 +1220,7 @@
 				"payer": "",
 				"payername": "",
 				"paymentid": "",
+				"paymentnum": "",
 				"paymenttype": "",
 				"refundamount": "",
 				"transactionid": ""
@@ -1439,6 +1449,7 @@
 				"date_exported": "Exportés",
 				"date_invoiced": "Facturé",
 				"date_last_contacted": "",
+				"date_lost_sale": "",
 				"date_next_contact": "",
 				"date_open": "Ouvrir",
 				"date_rentalresp": "",
@@ -1461,6 +1472,7 @@
 					"cost_dms_acctnumber": "",
 					"dms_make": "",
 					"dms_model": "",
+					"dms_model_override": "",
 					"dms_unsold": "",
 					"dms_wip_acctnumber": "",
 					"id": "",
@@ -2207,7 +2219,8 @@
 			},
 			"errors": {
 				"exporting": "",
-				"exporting-partner": ""
+				"exporting-partner": "",
+				"inserting": ""
 			},
 			"fields": {
 				"amount": "",
@@ -2563,18 +2576,22 @@
 				"gsr_labor_only": "",
 				"hours_sold_detail_closed": "",
 				"hours_sold_detail_closed_csr": "",
+				"hours_sold_detail_closed_estimator": "",
 				"hours_sold_detail_closed_ins_co": "",
 				"hours_sold_detail_closed_status": "",
 				"hours_sold_detail_open": "",
 				"hours_sold_detail_open_csr": "",
+				"hours_sold_detail_open_estimator": "",
 				"hours_sold_detail_open_ins_co": "",
 				"hours_sold_detail_open_status": "",
 				"hours_sold_summary_closed": "",
 				"hours_sold_summary_closed_csr": "",
+				"hours_sold_summary_closed_estimator": "",
 				"hours_sold_summary_closed_ins_co": "",
 				"hours_sold_summary_closed_status": "",
 				"hours_sold_summary_open": "",
 				"hours_sold_summary_open_csr": "",
+				"hours_sold_summary_open_estimator": "",
 				"hours_sold_summary_open_ins_co": "",
 				"hours_sold_summary_open_status": "",
 				"job_costing_ro_csr": "",
@@ -2587,10 +2604,12 @@
 				"jobs_reconcile": "",
 				"jobs_scheduled_completion": "",
 				"lag_time": "",
+				"lost_sales": "",
 				"open_orders": "",
 				"open_orders_csr": "",
 				"open_orders_estimator": "",
 				"open_orders_ins_co": "",
+				"open_orders_referral": "",
 				"open_orders_specific_csr": "",
 				"open_orders_status": "",
 				"parts_backorder": "",
@@ -2665,8 +2684,12 @@
 				"painthrs": ""
 			},
 			"labels": {
+				"allemployeetimetickets": "",
 				"asoftodaytarget": "",
+				"body": "",
+				"bodycharttitle": "",
 				"calendarperiod": "",
+				"combinedcharttitle": "",
 				"dailyactual": "",
 				"dailytarget": "",
 				"efficiencyoverperiod": "",
@@ -2675,12 +2698,16 @@
 				"lastmonth": "",
 				"lastweek": "",
 				"monthlytarget": "",
+				"priorweek": "",
 				"productivestatistics": "",
 				"productivetimeticketsoverdate": "",
+				"refinish": "",
+				"refinishcharttitle": "",
 				"targets": "",
 				"thismonth": "",
 				"thisweek": "",
 				"timetickets": "",
+				"timeticketsemployee": "",
 				"todateactual": "",
 				"totaloverperiod": "",
 				"weeklyactual": "",

client/src/utils/AuditTrailMappings.js

@@ -1,6 +1,10 @@
 import i18n from "i18next";
 
 const AuditTrailMapping = {
+  appointmentcancel: (lost_sale_reason) =>
+    i18n.t("audit_trail.messages.appointmentcancel", { lost_sale_reason }),
+  appointmentinsert: (start) =>
+    i18n.t("audit_trail.messages.appointmentinsert", { start }),
   jobstatuschange: (status) =>
     i18n.t("audit_trail.messages.jobstatuschange", { status }),
   admin_jobstatuschange: (status) =>

client/src/utils/DateFormatter.jsx

@@ -31,3 +31,7 @@ export function TimeAgoFormatter(props) {
     </Tooltip>
   ) : null;
 }
+
+export function DateTimeFormat(value) {
+  return moment(value).format("MM/DD/YYYY hh:mm A");
+}

client/src/utils/RenderTemplate.js

@@ -1,15 +1,14 @@
 import { gql } from "@apollo/client";
-import { notification } from "antd";
 import jsreport from "@jsreport/browser-client";
+import { notification } from "antd";
+import axios from "axios";
 import _ from "lodash";
-import moment from "moment";
 import { auth } from "../firebase/firebase.utils";
 import { setEmailOptions } from "../redux/email/email.actions";
 import { store } from "../redux/store";
 import client from "../utils/GraphQLClient";
-import { TemplateList } from "./TemplateConstants";
 import cleanAxios from "./CleanAxios";
-import axios from "axios";
+import { TemplateList } from "./TemplateConstants";
 const server = process.env.REACT_APP_REPORTS_SERVER_URL;
 
 jsreport.serverUrl = server;
@@ -255,7 +254,7 @@ export async function RenderTemplates(
       headerpath: `/${bodyshop.imexshopid}/header.html`,
       footerpath: `/${bodyshop.imexshopid}/footer.html`,
       bodyshop: bodyshop,
-      offset: moment().utcOffset(),
+      offset: bodyshop.timezone,
     },
   };
 

client/src/utils/TemplateConstants.js

@@ -818,6 +818,74 @@ export const TemplateList = (type, context) => {
             },
             group: "sales",
           },
+          hours_sold_detail_closed_estimator: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_detail_closed_estimator"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_detail_closed_estimator"
+            ),
+            key: "hours_sold_detail_closed_estimator",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          hours_sold_detail_open_estimator: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_detail_open_estimator"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_detail_open_estimator"
+            ),
+            key: "hours_sold_detail_open_estimator",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+            group: "sales",
+          },
+          hours_sold_summary_closed_estimator: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_summary_closed_estimator"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_summary_closed_estimator"
+            ),
+            key: "hours_sold_summary_closed_estimator",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          hours_sold_summary_open_estimator: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_summary_open_estimator"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_summary_open_estimator"
+            ),
+            key: "hours_sold_summary_open_estimator",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
           hours_sold_summary_open_status: {
             title: i18n.t(
               "reportcenter.templates.hours_sold_summary_open_status"
@@ -1434,6 +1502,19 @@ export const TemplateList = (type, context) => {
             },
             group: "jobs",
           },
+          open_orders_specific_csr: {
+            title: i18n.t("reportcenter.templates.open_orders_specific_csr"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.open_orders_specific_csr"),
+            key: "open_orders_specific_csr",
+            idtype: "employee",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+            group: "jobs",
+          },
           open_orders_estimator: {
             title: i18n.t("reportcenter.templates.open_orders_estimator"),
             description: "",
@@ -1460,12 +1541,12 @@ export const TemplateList = (type, context) => {
             },
             group: "jobs",
           },
-          open_orders_specific_csr: {
-            title: i18n.t("reportcenter.templates.open_orders_specific_csr"),
+          open_orders_referral: {
+            title: i18n.t("reportcenter.templates.open_orders_referral"),
             description: "",
-            subject: i18n.t("reportcenter.templates.open_orders_specific_csr"),
-            key: "open_orders_specific_csr",
-            idtype: "employee",
+            subject: i18n.t("reportcenter.templates.open_orders_referral"),
+            key: "open_orders_referral",
+            //idtype: "vendor",
             disabled: false,
             rangeFilter: {
               object: i18n.t("reportcenter.labels.objects.jobs"),
@@ -1933,6 +2014,18 @@ export const TemplateList = (type, context) => {
             },
             group: "jobs",
           },
+          lost_sales: {
+            title: i18n.t("reportcenter.templates.lost_sales"),
+            subject: i18n.t("reportcenter.templates.lost_sales"),
+            key: "lost_sales",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_lost_sale"),
+            },
+            group: "customers",
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

client/src/utils/fcm-handler.js

@@ -12,6 +12,13 @@ export default async function FcmHandler({ client, payload }) {
           },
         },
       });
+      client.cache.modify({
+        fields: {
+          messages_aggregate(cached) {
+            return { aggregate: { count: cached.aggregate.count + 1 } };
+          },
+        },
+      });
       break;
     case "messaging-outbound":
       client.cache.modify({
@@ -30,6 +37,7 @@ export default async function FcmHandler({ client, payload }) {
       });
       break;
     case "messaging-mark-conversation-read":
+      let previousUnreadCount = 0;
       client.cache.modify({
         id: client.cache.identify({
           __typename: "conversations",
@@ -37,10 +45,22 @@ export default async function FcmHandler({ client, payload }) {
         }),
         fields: {
           messages_aggregate(cached) {
+            previousUnreadCount = cached.aggregate.count;
             return { aggregate: { count: 0 } };
           },
         },
       });
+      client.cache.modify({
+        fields: {
+          messages_aggregate(cached) {
+            return {
+              aggregate: {
+                count: cached.aggregate.count - previousUnreadCount,
+              },
+            };
+          },
+        },
+      });
       break;
     default:
       console.log("No payload type set.");

hasura/metadata/tables.yaml

@@ -110,6 +110,7 @@
           - canceled
           - color
           - created_at
+          - created_by
           - end
           - id
           - isintake
@@ -128,6 +129,7 @@
           - canceled
           - color
           - created_at
+          - created_by
           - end
           - id
           - isintake
@@ -156,6 +158,7 @@
           - canceled
           - color
           - created_at
+          - created_by
           - end
           - id
           - isintake
@@ -887,11 +890,13 @@
           - appt_colors
           - appt_length
           - attach_pdf_to_email
+          - autohouseid
           - bill_allow_post_to_closed
           - bill_tax_rates
           - cdk_configuration
           - cdk_dealerid
           - city
+          - claimscorpid
           - country
           - created_at
           - default_adjustment_rate
@@ -925,6 +930,7 @@
           - md_estimators
           - md_filehandlers
           - md_from_emails
+          - md_functionality_toggles
           - md_hour_split
           - md_ins_cos
           - md_jobline_presets
@@ -1023,6 +1029,7 @@
           - md_estimators
           - md_filehandlers
           - md_from_emails
+          - md_functionality_toggles
           - md_hour_split
           - md_ins_cos
           - md_jobline_presets
@@ -3274,6 +3281,8 @@
           - cat_no
           - category
           - cieca_pfl
+          - cieca_pfo
+          - cieca_pft
           - cieca_stl
           - cieca_ttl
           - ciecaid
@@ -3541,6 +3550,8 @@
           - cat_no
           - category
           - cieca_pfl
+          - cieca_pfo
+          - cieca_pft
           - cieca_stl
           - cieca_ttl
           - ciecaid
@@ -3576,6 +3587,7 @@
           - date_exported
           - date_invoiced
           - date_last_contacted
+          - date_lost_sale
           - date_next_contact
           - date_open
           - date_rentalresp
@@ -3819,6 +3831,8 @@
           - cat_no
           - category
           - cieca_pfl
+          - cieca_pfo
+          - cieca_pft
           - cieca_stl
           - cieca_ttl
           - ciecaid
@@ -3854,6 +3868,7 @@
           - date_exported
           - date_invoiced
           - date_last_contacted
+          - date_lost_sale
           - date_next_contact
           - date_open
           - date_rentalresp
@@ -4070,12 +4085,7 @@
   event_triggers:
     - name: job_status_transition
       definition:
-        enable_manual: false
-        insert:
-          columns: '*'
-        update:
-          columns:
-            - status
+        enable_manual: true
       retry_conf:
         interval_sec: 10
         num_retries: 0
@@ -4085,29 +4095,14 @@
         - name: event-secret
           value_from_env: EVENT_SECRET
       request_transform:
+        method: POST
         query_params: {}
         template_engine: Kriti
         url: '{{$base_url}}/job/statustransition'
         version: 2
     - name: jobs_arms
       definition:
-        enable_manual: false
-        update:
-          columns:
-            - actual_delivery
-            - scheduled_delivery
-            - scheduled_completion
-            - actual_completion
-            - date_scheduled
-            - inproduction
-            - clm_total
-            - suspended
-            - job_totals
-            - converted
-            - employee_body
-            - ro_number
-            - actual_in
-            - scheduled_in
+        enable_manual: true
       retry_conf:
         interval_sec: 10
         num_retries: 0

hasura/migrations/1693249238670_alter_table_public_jobs_add_column_cieca_pfl/down.sql

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

hasura/migrations/1693249238670_alter_table_public_jobs_add_column_cieca_pfl/up.sql

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

hasura/migrations/1694457793769_alter_table_public_jobs_add_column_cieca_pft/down.sql

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

hasura/migrations/1694457793769_alter_table_public_jobs_add_column_cieca_pft/up.sql

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

hasura/migrations/1695757361064_alter_table_public_jobs_add_column_cieca_pfo/down.sql

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

hasura/migrations/1695757361064_alter_table_public_jobs_add_column_cieca_pfo/up.sql

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

hasura/migrations/1698709322872_alter_table_public_appointments_add_column_created_by/down.sql

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