oopsies

Release/2023 11 17

.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"
@@ -216,12 +216,6 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         <Form.Item
           label={t("courtesycars.fields.nextservicekm")}
           name="nextservicekm"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
         >
           <InputNumber />
         </Form.Item>
@@ -229,12 +223,6 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           <Form.Item
             label={t("courtesycars.fields.nextservicedate")}
             name="nextservicedate"
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-              },
-            ]}
           >
             <FormDatePicker />
           </Form.Item>
@@ -283,12 +271,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>
@@ -330,9 +312,7 @@ 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");

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-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-available-table/jobs-available-table.container.jsx

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

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

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

@@ -16,13 +16,17 @@ import { QUERY_LBR_HRS_BY_PK, UPDATE_JOBS } from "../../graphql/jobs.queries";
 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 { 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")),
@@ -34,6 +38,7 @@ export function ScheduleJobModalContainer({
   bodyshop,
   toggleModalVisible,
   setEmailOptions,
+  currentUser,
 }) {
   const { visible, context, actions } = scheduleModal;
   const { jobId, job, previousEvent } = context;
@@ -122,6 +127,7 @@ 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,

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,399 @@
+import { useQuery } from "@apollo/client";
+import { Col, Row } from "antd";
+import _ from "lodash";
+import moment from "moment";
+import queryString from "query-string";
+import React, { useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { useLocation } from "react-router-dom";
+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 searchParams = queryString.parse(useLocation().search);
+  const { start, end } = searchParams;
+  const startDate = start
+    ? moment(start)
+    : moment().startOf("week").subtract(7, "days");
+  const endDate = end ? moment(end) : moment().endOf("week");
+
+  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/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/bills.queries.js

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

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
@@ -746,6 +744,7 @@ export const GET_JOB_BY_PK = gql`
         jobid
         amount
         payer
+        paymentnum
         created_at
         transactionid
         memo
@@ -1001,7 +1000,6 @@ export const QUERY_TECH_JOB_DETAILS = gql`
       actual_completion
       actual_delivery
       actual_in
-
       id
       ins_co_nm
       clm_no
@@ -1242,7 +1240,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
   ) {
     search_jobs(
       args: { search: $search }
-      limit: 50
+      limit: 25
       where: {
         _and: {
           converted: { _eq: $isConverted }
@@ -1586,7 +1584,6 @@ export const QUERY_ALL_JOB_FIELDS = gql`
       clm_title
       clm_total
       clm_zip
-
       cust_pr
       ded_amt
       ded_status
@@ -1669,7 +1666,6 @@ export const QUERY_ALL_JOB_FIELDS = gql`
       parts_tax_rates
       pay_amt
       pay_chknm
-
       pay_type
       payee_nms
       plate_no
@@ -2077,6 +2073,7 @@ export const QUERY_JOB_EXPORT_DMS = gql`
     }
   }
 `;
+
 export const QUERY_RELATED_ROS = gql`
   query QUERY_RELATED_ROS($jobid: uuid!) {
     relatedjobs(
@@ -2098,6 +2095,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 +2113,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 +2121,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/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": {
@@ -490,7 +491,7 @@
 					"lam": "Mechanical",
 					"lar": "Refinish",
 					"las": "Structural",
-					"lau": "Detail",
+					"lau": "User Defined",
 					"local_tax": "Local Tax",
 					"mapa": "Paint Materials",
 					"mash": "Shop Materials",
@@ -1114,6 +1115,7 @@
 				"total": "Total",
 				"totals": "Totals",
 				"tuesday": "Tuesday",
+				"tvmode": "TV Mode",
 				"unknown": "Unknown",
 				"username": "Username",
 				"view": "View",
@@ -1211,6 +1213,7 @@
 				"payer": "Payer",
 				"payername": "Payer Name",
 				"paymentid": "Payment Reference ID",
+				"paymentnum": "Payment Number",
 				"paymenttype": "Payment Type",
 				"refundamount": "Refund Amount",
 				"transactionid": "Transaction ID"
@@ -1461,6 +1464,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 +2211,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 +2568,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",
@@ -2591,6 +2600,7 @@
 				"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 +2675,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 +2689,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": {
@@ -1114,6 +1115,7 @@
 				"total": "",
 				"totals": "",
 				"tuesday": "",
+				"tvmode": "",
 				"unknown": "Desconocido",
 				"username": "",
 				"view": "",
@@ -1211,6 +1213,7 @@
 				"payer": "",
 				"payername": "",
 				"paymentid": "",
+				"paymentnum": "",
 				"paymenttype": "",
 				"refundamount": "",
 				"transactionid": ""
@@ -1461,6 +1464,7 @@
 					"cost_dms_acctnumber": "",
 					"dms_make": "",
 					"dms_model": "",
+					"dms_model_override": "",
 					"dms_unsold": "",
 					"dms_wip_acctnumber": "",
 					"id": "",
@@ -2207,7 +2211,8 @@
 			},
 			"errors": {
 				"exporting": "",
-				"exporting-partner": ""
+				"exporting-partner": "",
+				"inserting": ""
 			},
 			"fields": {
 				"amount": "",
@@ -2563,18 +2568,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": "",
@@ -2591,6 +2600,7 @@
 				"open_orders_csr": "",
 				"open_orders_estimator": "",
 				"open_orders_ins_co": "",
+				"open_orders_referral": "",
 				"open_orders_specific_csr": "",
 				"open_orders_status": "",
 				"parts_backorder": "",
@@ -2665,8 +2675,12 @@
 				"painthrs": ""
 			},
 			"labels": {
+				"allemployeetimetickets": "",
 				"asoftodaytarget": "",
+				"body": "",
+				"bodycharttitle": "",
 				"calendarperiod": "",
+				"combinedcharttitle": "",
 				"dailyactual": "",
 				"dailytarget": "",
 				"efficiencyoverperiod": "",
@@ -2675,12 +2689,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": {
@@ -1114,6 +1115,7 @@
 				"total": "",
 				"totals": "",
 				"tuesday": "",
+				"tvmode": "",
 				"unknown": "Inconnu",
 				"username": "",
 				"view": "",
@@ -1211,6 +1213,7 @@
 				"payer": "",
 				"payername": "",
 				"paymentid": "",
+				"paymentnum": "",
 				"paymenttype": "",
 				"refundamount": "",
 				"transactionid": ""
@@ -1461,6 +1464,7 @@
 					"cost_dms_acctnumber": "",
 					"dms_make": "",
 					"dms_model": "",
+					"dms_model_override": "",
 					"dms_unsold": "",
 					"dms_wip_acctnumber": "",
 					"id": "",
@@ -2207,7 +2211,8 @@
 			},
 			"errors": {
 				"exporting": "",
-				"exporting-partner": ""
+				"exporting-partner": "",
+				"inserting": ""
 			},
 			"fields": {
 				"amount": "",
@@ -2563,18 +2568,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": "",
@@ -2591,6 +2600,7 @@
 				"open_orders_csr": "",
 				"open_orders_estimator": "",
 				"open_orders_ins_co": "",
+				"open_orders_referral": "",
 				"open_orders_specific_csr": "",
 				"open_orders_status": "",
 				"parts_backorder": "",
@@ -2665,8 +2675,12 @@
 				"painthrs": ""
 			},
 			"labels": {
+				"allemployeetimetickets": "",
 				"asoftodaytarget": "",
+				"body": "",
+				"bodycharttitle": "",
 				"calendarperiod": "",
+				"combinedcharttitle": "",
 				"dailyactual": "",
 				"dailytarget": "",
 				"efficiencyoverperiod": "",
@@ -2675,12 +2689,16 @@
 				"lastmonth": "",
 				"lastweek": "",
 				"monthlytarget": "",
+				"priorweek": "",
 				"productivestatistics": "",
 				"productivetimeticketsoverdate": "",
+				"refinish": "",
+				"refinishcharttitle": "",
 				"targets": "",
 				"thismonth": "",
 				"thisweek": "",
 				"timetickets": "",
+				"timeticketsemployee": "",
 				"todateactual": "",
 				"totaloverperiod": "",
 				"weeklyactual": "",

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"),

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
@@ -3273,6 +3276,9 @@
           - ca_gst_registrant
           - cat_no
           - category
+          - cieca_pfl
+          - cieca_pfo
+          - cieca_pft
           - cieca_stl
           - cieca_ttl
           - ciecaid
@@ -3314,6 +3320,7 @@
           - date_repairstarted
           - date_scheduled
           - date_towin
+          - date_void
           - ded_amt
           - ded_note
           - ded_status
@@ -3495,7 +3502,6 @@
           - v_model_yr
           - v_vin
           - vehicleid
-          - date_void
           - voided
   select_permissions:
     - role: user
@@ -3539,6 +3545,9 @@
           - ca_gst_registrant
           - cat_no
           - category
+          - cieca_pfl
+          - cieca_pfo
+          - cieca_pft
           - cieca_stl
           - cieca_ttl
           - ciecaid
@@ -3580,6 +3589,7 @@
           - date_repairstarted
           - date_scheduled
           - date_towin
+          - date_void
           - ded_amt
           - ded_note
           - ded_status
@@ -3762,7 +3772,6 @@
           - v_model_yr
           - v_vin
           - vehicleid
-          - date_void
           - voided
         filter:
           bodyshop:
@@ -3816,6 +3825,9 @@
           - ca_gst_registrant
           - cat_no
           - category
+          - cieca_pfl
+          - cieca_pfo
+          - cieca_pft
           - cieca_stl
           - cieca_ttl
           - ciecaid
@@ -3857,6 +3869,7 @@
           - date_repairstarted
           - date_scheduled
           - date_towin
+          - date_void
           - ded_amt
           - ded_note
           - ded_status
@@ -4039,7 +4052,6 @@
           - v_model_yr
           - v_vin
           - vehicleid
-          - date_void
           - voided
         filter:
           bodyshop:
@@ -4067,12 +4079,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
@@ -4082,29 +4089,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/1693351091138_alter_table_public_bodyshops_add_column_claimscorpid/down.sql

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

hasura/migrations/1693351091138_alter_table_public_bodyshops_add_column_claimscorpid/up.sql

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

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;

hasura/migrations/1698709322872_alter_table_public_appointments_add_column_created_by/up.sql

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

hasura/migrations/1699662574943_run_sql_migration/down.sql

@@ -0,0 +1,38 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE OR REPLACE FUNCTION public.search_cccontracts(search text)
+--  RETURNS SETOF cccontracts
+--  LANGUAGE plpgsql
+--  STABLE
+-- AS $function$
+-- BEGIN
+-- 	IF search = '' THEN
+-- 		RETURN query
+-- 		SELECT
+-- 			*
+-- 		FROM
+-- 			cccontracts c;
+-- 	ELSE
+-- 		RETURN query
+-- 		SELECT
+-- 			contracts.*
+-- 		FROM
+-- 		courtesycars cars,
+-- 			jobs jobs,
+-- 			cccontracts contracts
+-- 		WHERE (jobs.ro_number ILIKE '%' || search || '%'
+-- 			OR jobs.ownr_fn ILIKE '%' || search || '%'
+-- 			OR jobs.ownr_ln ILIKE '%' || search || '%'
+-- 			OR jobs.ownr_co_nm ILIKE '%' || search || '%'
+-- 			OR (cast(contracts.agreementnumber as text)) ILIKE '%' || search || '%'
+-- 			OR contracts.driver_fn ILIKE '%' || search || '%'
+-- 			OR contracts.driver_ln ILIKE '%' || search || '%'
+-- 			OR cars.fleetnumber ILIKE '%' || search || '%'
+-- 			OR cars.make ILIKE '%' || search || '%'
+-- 			OR cars.model ILIKE '%' || search || '%'
+-- 			OR cars.plate ILIKE '%' || search || '%')
+-- 			AND contracts.jobid = jobs.id
+-- 			AND contracts.courtesycarid = cars.id;
+-- 	END IF;
+-- END
+-- $function$;

hasura/migrations/1699662574943_run_sql_migration/up.sql

@@ -0,0 +1,36 @@
+CREATE OR REPLACE FUNCTION public.search_cccontracts(search text)
+ RETURNS SETOF cccontracts
+ LANGUAGE plpgsql
+ STABLE
+AS $function$
+BEGIN
+	IF search = '' THEN
+		RETURN query
+		SELECT
+			*
+		FROM
+			cccontracts c;
+	ELSE
+		RETURN query
+		SELECT
+			contracts.*
+		FROM
+		courtesycars cars,
+			jobs jobs,
+			cccontracts contracts
+		WHERE (jobs.ro_number ILIKE '%' || search || '%'
+			OR jobs.ownr_fn ILIKE '%' || search || '%'
+			OR jobs.ownr_ln ILIKE '%' || search || '%'
+			OR jobs.ownr_co_nm ILIKE '%' || search || '%'
+			OR (cast(contracts.agreementnumber as text)) ILIKE '%' || search || '%'
+			OR contracts.driver_fn ILIKE '%' || search || '%'
+			OR contracts.driver_ln ILIKE '%' || search || '%'
+			OR cars.fleetnumber ILIKE '%' || search || '%'
+			OR cars.make ILIKE '%' || search || '%'
+			OR cars.model ILIKE '%' || search || '%'
+			OR cars.plate ILIKE '%' || search || '%')
+			AND contracts.jobid = jobs.id
+			AND contracts.courtesycarid = cars.id;
+	END IF;
+END
+$function$;

package.json

@@ -3,64 +3,63 @@
   "version": "0.0.1",
   "license": "UNLICENSED",
   "engines": {
-    "node": ">=16.0.0",
+    "node": ">=18.0.0",
     "npm": ">=8.0.0"
   },
   "scripts": {
-    "setup": "rm -rf node_modules && yarn && cd client && rm -rf node_modules && yarn",
-    "admin": "cd admin && yarn start",
-    "client": "cd client && yarn start",
+    "setup": "rm -rf node_modules && npm i && cd client && rm -rf node_modules && npm i",
+    "admin": "cd admin && npm start",
+    "client": "cd client && npm start",
     "server": "nodemon server.js",
-    "build": "cd client && yarn run build",
-    "dev": "concurrently --kill-others-on-fail \"yarn run server\" \"yarn run client\"",
-    "deva": "concurrently --kill-others-on-fail \"yarn run server\" \"yarn run client\" \"yarn run admin\"",
+    "build": "cd client && npm run build",
+    "dev": "concurrently --kill-others-on-fail \"npm run server\" \"npm run client\"",
+    "deva": "concurrently --kill-others-on-fail \"npm run server\" \"npm run client\" \"npm run admin\"",
     "start": "node server.js"
   },
   "dependencies": {
-    "@aws-sdk/client-secrets-manager": "^3.388.0",
-    "@aws-sdk/credential-provider-node": "^3.319.0",
-    "@opensearch-project/opensearch": "^2.2.1",
-    "aws-sdk": "^2.1326.0",
+    "@aws-sdk/client-secrets-manager": "^3.454.0",
+    "@aws-sdk/client-ses": "^3.454.0",
+    "@aws-sdk/credential-provider-node": "^3.451.0",
+    "@opensearch-project/opensearch": "^2.4.0",
     "aws4": "^1.12.0",
-    "axios": "^0.27.2",
+    "axios": "^1.6.2",
     "bluebird": "^3.7.2",
     "body-parser": "^1.20.2",
-    "cloudinary": "^1.34.0",
+    "cloudinary": "^1.41.0",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
     "cors": "2.8.5",
     "csrf": "^3.1.0",
     "dinero.js": "^1.9.1",
-    "dotenv": "16.0.3",
+    "dotenv": "^16.3.1",
     "express": "^4.18.2",
-    "firebase-admin": "^11.5.0",
-    "graphql": "^16.6.0",
-    "graphql-request": "^4.2.0",
+    "firebase-admin": "^11.11.0",
+    "graphql": "^16.8.1",
+    "graphql-request": "^6.1.0",
     "graylog2": "^0.2.1",
     "inline-css": "^4.0.2",
     "intuit-oauth": "^4.0.0",
-    "json-2-csv": "^3.19.0",
+    "json-2-csv": "^5.0.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.41",
     "multer": "^1.4.5-lts.1",
-    "node-mailjet": "^6.0.2",
+    "node-mailjet": "^6.0.4",
     "node-persist": "^3.1.3",
-    "node-quickbooks": "^2.0.41",
-    "nodemailer": "^6.9.1",
-    "phone": "^3.1.35",
-    "query-string": "^7.1.1",
+    "node-quickbooks": "^2.0.43",
+    "nodemailer": "^6.9.7",
+    "phone": "^3.1.41",
     "soap": "^1.0.0",
-    "socket.io": "^4.6.1",
-    "ssh2-sftp-client": "^9.0.4",
-    "stripe": "^9.15.0",
-    "twilio": "^4.8.0",
-    "uuid": "^9.0.0",
-    "xml2js": "^0.4.23",
-    "xmlbuilder2": "^3.0.2"
+    "socket.io": "^4.7.2",
+    "ssh2-sftp-client": "^9.1.0",
+    "stripe": "^14.5.0",
+    "twilio": "^4.19.0",
+    "uuid": "^9.0.1",
+    "xml2js": "^0.6.2",
+    "xmlbuilder2": "^3.1.1"
   },
   "devDependencies": {
-    "concurrently": "^7.3.0",
+    "concurrently": "^8.2.2",
     "source-map-explorer": "^2.5.2"
   }
 }

server.js

@@ -5,8 +5,8 @@ const path = require("path");
 const compression = require("compression");
 const twilio = require("twilio");
 const logger = require("./server/utils/logger");
-var fb = require("./server/firebase/firebase-handler");
-var cookieParser = require("cookie-parser");
+const fb = require("./server/firebase/firebase-handler");
+const cookieParser = require("cookie-parser");
 const multer = require("multer");
 const upload = multer();
 //var enforce = require("express-sslify");
@@ -223,6 +223,7 @@ app.post("/qbo/payments", fb.validateFirebaseIdToken, qbo.payments);
 
 var data = require("./server/data/data");
 app.post("/data/ah", data.autohouse);
+app.post("/data/cc", data.claimscorp);
 app.post("/record-handler/arms", data.arms);
 
 var taskHandler = require("./server/tasks/tasks");

server/accounting/qbo/qbo-callback.js

@@ -9,7 +9,7 @@ const logger = require("../../utils/logger");
 const OAuthClient = require("intuit-oauth");
 const client = require("../../graphql-client/graphql-client").client;
 const queries = require("../../graphql-client/queries");
-const queryString = require("query-string");
+const {parse, stringify} = require("querystring");
 
 const oauthClient = new OAuthClient({
   clientId: process.env.QBO_CLIENT_ID,
@@ -30,7 +30,8 @@ if (process.env.NODE_ENV === "production") {
 }
 
 exports.default = async (req, res) => {
-  const params = queryString.parse(req.url.split("?").reverse()[0]);
+  const queryString = req.url.split("?").reverse()[0];
+  const params = parse(queryString);
   try {
     logger.log("qbo-callback-create-token", "DEBUG", params.state, null, null);
     const authResponse = await oauthClient.createToken(req.url);
@@ -58,7 +59,7 @@ exports.default = async (req, res) => {
       );
 
       res.redirect(
-        `${url}/manage/accounting/qbo?${queryString.stringify(params)}`
+        `${url}/manage/accounting/qbo?${stringify(params)}`
       );
     }
   } catch (e) {

server/cdk/cdk-job-export.js

@@ -879,6 +879,12 @@ async function UpdateDmsVehicle(socket) {
           },
           vehicle: {
             ...socket.DMSVeh.vehicle,
+            ...(socket.txEnvelope.dms_model_override
+              ? {
+                  make: socket.txEnvelope.dms_make,
+                  modelAbrev: socket.txEnvelope.dms_model,
+                }
+              : {}),
             deliveryDate:
               socket.txEnvelope.dms_unsold === true
                 ? ""

server/data/autohouse.js

@@ -62,7 +62,7 @@ exports.default = async (req, res) => {
             start: start
               ? moment(start).startOf("day")
               : moment().subtract(5, "days").startOf("day"),
-            ...(end && { end: moment(end).startOf("day") }),
+            ...(end && { end: moment(end).endOf("day") }),
           }
         );
 

server/data/claimscorp.js

@@ -0,0 +1,846 @@
+const path = require("path");
+const queries = require("../graphql-client/queries");
+const Dinero = require("dinero.js");
+const moment = require("moment-timezone");
+var builder = require("xmlbuilder2");
+const _ = require("lodash");
+const logger = require("../utils/logger");
+const fs = require("fs");
+require("dotenv").config({
+  path: path.resolve(
+    process.cwd(),
+    `.env.${process.env.NODE_ENV || "development"}`
+  ),
+});
+let Client = require("ssh2-sftp-client");
+
+const client = require("../graphql-client/graphql-client").client;
+const { sendServerEmail } = require("../email/sendemail");
+const CCDineroFormat = "0,0.00";
+const AhDateFormat = "MM/DD/YYYY";
+
+const repairOpCodes = ["OP4", "OP9", "OP10"];
+const replaceOpCodes = ["OP2", "OP5", "OP11", "OP12"];
+
+const ftpSetup = {
+  host: process.env.CLAIMSCORP_HOST,
+  port: process.env.CLAIMSCORP_PORT,
+  username: process.env.CLAIMSCORP_USER,
+  password: process.env.CLAIMSCORP_PASSWORD,
+  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
+  algorithms: {
+    serverHostKey: ["ssh-rsa", "ssh-dss"],
+  },
+};
+
+exports.default = async (req, res) => {
+  //Query for the List of Bodyshop Clients.
+  logger.log("claimscorp-start", "DEBUG", "api", null, null);
+  const { bodyshops } = await client.request(queries.GET_CLAIMSCORP_SHOPS);
+
+  const specificShopIds = req.body.bodyshopIds; // ['uuid]
+  const { start, end, skipUpload } = req.body; //YYYY-MM-DD
+  if (req.headers["x-imex-auth"] !== process.env.AUTOHOUSE_AUTH_TOKEN) {
+    res.sendStatus(401);
+    return;
+  }
+  const allxmlsToUpload = [];
+  const allErrors = [];
+  try {
+    for (const bodyshop of specificShopIds
+      ? bodyshops.filter((b) => specificShopIds.includes(b.id))
+      : bodyshops) {
+      logger.log("claimscorp-start-shop-extract", "DEBUG", "api", bodyshop.id, {
+        shopname: bodyshop.shopname,
+      });
+      const erroredJobs = [];
+      try {
+        const { jobs, bodyshops_by_pk } = await client.request(
+          queries.CLAIMSCORP_QUERY,
+          {
+            bodyshopid: bodyshop.id,
+            start: start
+              ? moment(start).startOf("day")
+              : moment().subtract(5, "days").startOf("day"),
+            ...(end && { end: moment(end).endOf("day") }),
+          }
+        );
+
+        const claimsCorpObject = {
+          DataFeed: {
+            ShopInfo: {
+              ShopID: bodyshops_by_pk.claimscorpid,
+              ShopName: bodyshops_by_pk.shopname,
+              RO: jobs.map((j) =>
+                CreateRepairOrderTag(
+                  { ...j, bodyshop: bodyshops_by_pk },
+                  function ({ job, error }) {
+                    erroredJobs.push({ job: job, error: error.toString() });
+                  }
+                )
+              ),
+            },
+          },
+        };
+
+        if (erroredJobs.length > 0) {
+          logger.log("claimscorp-failed-jobs", "ERROR", "api", bodyshop.id, {
+            count: erroredJobs.length,
+            jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number)),
+          });
+        }
+
+        var ret = builder
+          .create(
+            {
+              // version: "1.0",
+              // encoding: "UTF-8",
+              //keepNullNodes: true,
+            },
+            claimsCorpObject
+          )
+          .end({ allowEmptyTags: true });
+
+        allxmlsToUpload.push({
+          count: claimsCorpObject.DataFeed.ShopInfo.RO.length,
+          xml: ret,
+          filename: `${bodyshop.claimscorpid}-${moment().format(
+            "YYYYMMDDTHHMMss"
+          )}.xml`,
+        });
+
+        logger.log("claimscorp-end-shop-extract", "DEBUG", "api", bodyshop.id, {
+          shopname: bodyshop.shopname,
+        });
+      } catch (error) {
+        //Error at the shop level.
+        logger.log("claimscorp-error-shop", "ERROR", "api", bodyshop.id, {
+          ...error,
+        });
+
+        allErrors.push({
+          bodyshopid: bodyshop.id,
+          imexshopid: bodyshop.imexshopid,
+          claimscorpid: bodyshop.claimscorpid,
+          fatal: true,
+          errors: [error.toString()],
+        });
+      } finally {
+        allErrors.push({
+          bodyshopid: bodyshop.id,
+          imexshopid: bodyshop.imexshopid,
+          claimscorpid: bodyshop.claimscorpid,
+          errors: erroredJobs.map((ej) => ({
+            ro_number: ej.job?.ro_number,
+            jobid: ej.job?.id,
+            error: ej.error,
+          })),
+        });
+      }
+    }
+
+    if (skipUpload) {
+      for (const xmlObj of allxmlsToUpload) {
+        fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
+      }
+
+      res.json(allxmlsToUpload);
+      sendServerEmail({
+        subject: `ClaimsCorp Report ${moment().format("MM-DD-YY")}`,
+        text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
+      Uploaded: ${JSON.stringify(
+        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
+        null,
+        2
+      )}
+      `,
+      });
+      return;
+    }
+
+    let sftp = new Client();
+    sftp.on("error", (errors) =>
+      logger.log("claimscorp-sftp-error", "ERROR", "api", null, {
+        ...errors,
+      })
+    );
+    try {
+      //Connect to the FTP and upload all.
+
+      await sftp.connect(ftpSetup);
+
+      for (const xmlObj of allxmlsToUpload) {
+        logger.log("claimscorp-sftp-upload", "DEBUG", "api", null, {
+          filename: xmlObj.filename,
+        });
+
+        const uploadResult = await sftp.put(
+          Buffer.from(xmlObj.xml),
+          `/${xmlObj.filename}`
+        );
+        logger.log("claimscorp-sftp-upload-result", "DEBUG", "api", null, {
+          uploadResult,
+        });
+      }
+
+      //***TODO  Change filing naming when creating the cron job. IM_ShopInternalName_DDMMYYYY_HHMMSS.xml
+    } catch (error) {
+      logger.log("claimscorp-sftp-error", "ERROR", "api", null, {
+        ...error,
+      });
+    } finally {
+      sftp.end();
+    }
+    sendServerEmail({
+      subject: `ClaimsCorp Report ${moment().format("MM-DD-YY")}`,
+      text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
+      Uploaded: ${JSON.stringify(
+        allxmlsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
+        null,
+        2
+      )}
+      `,
+    });
+    res.sendStatus(200);
+  } catch (error) {
+    res.status(200).json(error);
+  }
+};
+
+const CreateRepairOrderTag = (job, errorCallback) => {
+  //Level 2
+
+  if (!job.job_totals) {
+    errorCallback({
+      jobid: job.id,
+      job: job,
+      ro_number: job.ro_number,
+      error: { toString: () => "No job totals for RO." },
+    });
+    return {};
+  }
+
+  const repairCosts = CreateCosts(job);
+
+  //Calculate detail only lines.
+  const detailAdjustments = job.joblines
+    .filter((jl) => jl.ah_detail_line && jl.mod_lbr_ty)
+    .reduce(
+      (acc, val) => {
+        return {
+          hours: acc.hours + val.mod_lb_hrs,
+          amount: acc.amount.add(
+            Dinero({
+              amount: Math.round(
+                (job.job_totals.rates[val.mod_lbr_ty.toLowerCase()].rate || 0) *
+                  val.mod_lb_hrs *
+                  100
+              ),
+            })
+          ),
+        };
+      },
+      { hours: 0, amount: Dinero() }
+    );
+
+  try {
+    const ret = {
+      RoNumber: job.ro_number,
+      Customer: {
+        CustomerZip: (job.ownr_zip && job.ownr_zip.substring(0, 3)) || "",
+        CustomerState: job.ownr_st || "",
+      },
+      Vehicle: {
+        Year: job.v_model_yr
+          ? parseInt(job.v_model_yr.match(/\d/g))
+            ? parseInt(job.v_model_yr.match(/\d/g).join(""), 10)
+            : ""
+          : "",
+        Make: job.v_make_desc || "",
+        Model: job.v_model_desc || "",
+        BodyStyle: (job.vehicle && job.vehicle.v_bstyle) || "",
+        Color: job.v_color || "",
+        VIN: job.v_vin || "",
+      },
+      Carrier: {
+        UniqueID: job.ins_co_nm || "",
+        InsuranceCompany: job.ins_co_nm || "",
+      },
+      Claim: job.clm_no || "",
+      Contacts: {
+        PC: job.employee_csr_rel
+          ? `${
+              job.employee_csr_rel.last_name
+                ? job.employee_csr_rel.last_name
+                : ""
+            }${job.employee_csr_rel.last_name ? ", " : ""}${
+              job.employee_csr_rel.first_name
+                ? job.employee_csr_rel.first_name
+                : ""
+            }`
+          : "",
+        Phone1: "",
+        Phone2: "",
+        Estimator: `${job.est_ct_ln ? job.est_ct_ln : ""}${
+          job.est_ct_ln ? ", " : ""
+        }${job.est_ct_fn ? job.est_ct_fn : ""}`,
+        BodyTechnician: job.employee_body_rel
+          ? `${
+              job.employee_body_rel.last_name
+                ? job.employee_body_rel.last_name
+                : ""
+            }${job.employee_body_rel.last_name ? ", " : ""}${
+              job.employee_body_rel.first_name
+                ? job.employee_body_rel.first_name
+                : ""
+            }`
+          : "",
+        PaintTechnician: job.employee_refinish_rel
+          ? `${
+              job.employee_refinish_rel.last_name
+                ? job.employee_refinish_rel.last_name
+                : ""
+            }${job.employee_refinish_rel.last_name ? ", " : ""}${
+              job.employee_refinish_rel.first_name
+                ? job.employee_refinish_rel.first_name
+                : ""
+            }`
+          : "",
+      },
+      Dates: {
+        DateCreated:
+          (job.date_estimated &&
+            moment(job.date_estimated).format(AhDateFormat)) ||
+          "",
+        DateLoss:
+          (job.loss_date && moment(job.loss_date).format(AhDateFormat)) || "",
+        DateFNOL: "",
+        DateContact: "",
+        DateEstimated:
+          (job.date_estimated &&
+            moment(job.date_estimated).format(AhDateFormat)) ||
+          "",
+        DateScheduled:
+          (job.scheduled_in &&
+            moment(job.scheduled_in)
+              .tz(job.bodyshop.timezone)
+              .format(AhDateFormat)) ||
+          "",
+        DateArrived:
+          (job.actual_in &&
+            moment(job.actual_in)
+              .tz(job.bodyshop.timezone)
+              .format(AhDateFormat)) ||
+          "",
+        DateFirstPartsOrdered:
+          (job.parts_orders &&
+            job.parts_orders[0] &&
+            moment(job.parts_orders[0].created_at)
+              .tz(job.bodyshop.timezone)
+              .format(AhDateFormat)) ||
+          "",
+        DateStart: job.date_repairstarted
+          ? (job.date_repairstarted &&
+              moment(job.date_repairstarted)
+                .tz(job.bodyshop.timezone)
+                .format(AhDateFormat)) ||
+            ""
+          : (job.date_repairstarted &&
+              moment(job.actual_in)
+                .tz(job.bodyshop.timezone)
+                .format(AhDateFormat)) ||
+            "",
+        BodyStart: "",
+        BodyEnd: "",
+        FrameStart: "",
+        FrameEnd: "",
+        PrepStart: "",
+        PrepEnd: "",
+        SprayStart: "",
+        SprayEnd: "",
+        DateReady:
+          (job.actual_completion &&
+            moment(job.actual_completion)
+              .tz(job.bodyshop.timezone)
+              .format(AhDateFormat)) ||
+          "",
+        DateScheduledDelivery:
+          (job.scheduled_delivery &&
+            moment(job.scheduled_delivery)
+              .tz(job.bodyshop.timezone)
+              .format(AhDateFormat)) ||
+          "",
+        DateDelivered:
+          (job.actual_delivery &&
+            moment(job.actual_delivery)
+              .tz(job.bodyshop.timezone)
+              .format(AhDateFormat)) ||
+          "",
+        DateClosed:
+          (job.date_invoiced &&
+            moment(job.date_invoiced)
+              .tz(job.bodyshop.timezone)
+              .format(AhDateFormat)) ||
+          "",
+        BilledDate: "",
+        PaidInFullDate: "",
+        ROStatus: job.tlos_ind
+          ? "TOT"
+          : StatusMapping(job.status, job.bodyshop.md_ro_statuses),
+      },
+      Sales: {
+        Body: Dinero(job.job_totals.rates.lab.total)
+          .add(Dinero(job.job_totals.rates.laa.total))
+          .add(Dinero(job.job_totals.rates.lad.total))
+          .add(Dinero(job.job_totals.rates.las.total))
+          .toFormat(CCDineroFormat),
+        Paint: Dinero(job.job_totals.rates.lar.total).toFormat(CCDineroFormat),
+        Prep: Dinero().toFormat(CCDineroFormat),
+        Frame: Dinero(job.job_totals.rates.laf.total).toFormat(CCDineroFormat),
+        Mech: Dinero(job.job_totals.rates.lam.total).toFormat(CCDineroFormat),
+        Glass: Dinero(job.job_totals.rates.lag.total).toFormat(CCDineroFormat),
+        Elec: Dinero(job.job_totals.rates.lae.total).toFormat(CCDineroFormat),
+        Detail: detailAdjustments.amount.toFormat(CCDineroFormat),
+        Reassem: Dinero().toFormat(CCDineroFormat),
+        OtherLabor: Dinero(job.job_totals.rates.la1.total)
+          .add(Dinero(job.job_totals.rates.la2.total))
+          .add(Dinero(job.job_totals.rates.la3.total))
+          .add(Dinero(job.job_totals.rates.la4.total))
+          .add(Dinero(job.job_totals.rates.lau.total))
+          .subtract(detailAdjustments.amount)
+          .toFormat(CCDineroFormat),
+        BMatl: Dinero(job.job_totals.rates.mash.total).toFormat(CCDineroFormat),
+        PMatl: Dinero(job.job_totals.rates.mapa.total).toFormat(CCDineroFormat),
+        OEM: Dinero(
+          job.job_totals.parts.parts.list.PAN &&
+            job.job_totals.parts.parts.list.PAN.total
+        )
+          .add(
+            Dinero(
+              job.job_totals.parts.parts.list.PAP &&
+                job.job_totals.parts.parts.list.PAP.total
+            )
+          )
+          .toFormat(CCDineroFormat),
+        LKQ: Dinero(
+          job.job_totals.parts.parts.list.PAL &&
+            job.job_totals.parts.parts.list.PAL.total
+        ).toFormat(CCDineroFormat),
+        AM: Dinero(
+          job.job_totals.parts.parts.list.PAA &&
+            job.job_totals.parts.parts.list.PAA.total
+        ).toFormat(CCDineroFormat),
+        MechParts: Dinero().toFormat(CCDineroFormat),
+        OtherParts: Dinero(
+          job.job_totals.parts.parts.list.PAO &&
+            job.job_totals.parts.parts.list.PAO.total
+        ).toFormat(CCDineroFormat),
+        OtherSales: Dinero(job.job_totals.additional.storage).toFormat(
+          CCDineroFormat
+        ),
+        Sublet: Dinero(job.job_totals.parts.sublets.total).toFormat(
+          CCDineroFormat
+        ),
+        Towing: Dinero(job.job_totals.additional.towing).toFormat(
+          CCDineroFormat
+        ),
+        Storage: "0.00",
+        Rental:
+          job.job_totals.additional.additionalCostItems.includes(
+            "ATS Amount"
+          ) === true
+            ? Dinero(
+                job.job_totals.additional.additionalCostItems[
+                  job.job_totals.additional.additionalCostItems.indexOf(
+                    "ATS Amount"
+                  )
+                ].total
+              ).toFormat(CCDineroFormat)
+            : Dinero().toFormat(CCDineroFormat),
+        HazWaste: Dinero().toFormat(CCDineroFormat),
+        Discounts: Dinero(job.job_totals.additional.adjustments).toFormat(
+          CCDineroFormat
+        ),
+        Tax: Dinero(job.job_totals.totals.local_tax)
+          .add(Dinero(job.job_totals.totals.state_tax))
+          .add(Dinero(job.job_totals.totals.federal_tax))
+          .add(Dinero(job.job_totals.additional.pvrt))
+          .toFormat(CCDineroFormat),
+        NetSaleTotal: Dinero(job.job_totals.totals.subtotal).toFormat(
+          CCDineroFormat
+        ),
+        SaleTotal: Dinero(job.job_totals.totals.total_repairs).toFormat(
+          CCDineroFormat
+        ),
+      },
+      SaleHours: {
+        Body: job.job_totals.rates.lab.hours.toFixed(2),
+        BodyRepairHours: job.joblines
+          .filter((line) => repairOpCodes.includes(line.lbr_op))
+          .reduce((acc, val) => acc + val.mod_lb_hrs, 0)
+          .toFixed(2),
+        BodyReplacehours: job.joblines
+          .filter((line) => replaceOpCodes.includes(line.lbr_op))
+          .reduce((acc, val) => acc + val.mod_lb_hrs, 0)
+          .toFixed(2),
+        Paint: job.job_totals.rates.lar.hours.toFixed(2),
+        Prep: "0.00",
+        Frame: job.job_totals.rates.laf.hours.toFixed(2),
+        Mech: job.job_totals.rates.lam.hours.toFixed(2),
+        Glass: job.job_totals.rates.lag.hours.toFixed(2),
+        Elec: job.job_totals.rates.lae.hours.toFixed(2),
+        Detail: detailAdjustments.hours,
+        Reassem: "0.00",
+        Other: (
+          job.job_totals.rates.la1.hours +
+          job.job_totals.rates.la2.hours +
+          job.job_totals.rates.la3.hours +
+          job.job_totals.rates.la4.hours +
+          job.job_totals.rates.lau.hours -
+          detailAdjustments.hours
+        ).toFixed(2),
+        TotalHours: job.joblines
+          .reduce((acc, val) => acc + val.mod_lb_hrs, 0)
+          .toFixed(2),
+      },
+      Costs: {
+        Body: repairCosts.BodyLaborTotalCost.toFormat(CCDineroFormat),
+        Paint: repairCosts.RefinishLaborTotalCost.toFormat(CCDineroFormat),
+        Prep: Dinero().toFormat(CCDineroFormat),
+        Frame: Dinero(job.job_totals.rates.laf.total).toFormat(CCDineroFormat),
+        Mech: repairCosts.MechanicalLaborTotalCost.toFormat(CCDineroFormat),
+        Glass: repairCosts.GlassLaborTotalCost.toFormat(CCDineroFormat),
+        Elec: repairCosts.ElectricalLaborTotalCost.toFormat(CCDineroFormat),
+        Detail: Dinero().toFormat(CCDineroFormat),
+        Reassem: Dinero().toFormat(CCDineroFormat),
+        OtherLabor: repairCosts.LaborMiscTotalCost.toFormat(CCDineroFormat),
+        Bmatl: repairCosts.BMTotalCost.toFormat(CCDineroFormat),
+        Pmatl: repairCosts.PMTotalCost.toFormat(CCDineroFormat),
+        OEM: repairCosts.PartsOemCost.toFormat(CCDineroFormat),
+        LKQ: repairCosts.PartsRecycledCost.toFormat(CCDineroFormat),
+        AM: repairCosts.PartsAMCost.toFormat(CCDineroFormat),
+        MechParts: Dinero().toFormat(CCDineroFormat),
+        OtherParts: Dinero().toFormat(CCDineroFormat), //Check Synergy
+        OtherCost: repairCosts.PartsOtherCost.toFormat(CCDineroFormat),
+        Sublet: repairCosts.SubletTotalCost.toFormat(CCDineroFormat),
+        Towing: repairCosts.TowingTotalCost.toFormat(CCDineroFormat),
+        Storage: repairCosts.StorageTotalCost.toFormat(CCDineroFormat),
+        Rental: Dinero().toFormat(CCDineroFormat),
+        HazWaste: Dinero().toFormat(CCDineroFormat),
+        CostTotal: repairCosts.TotalCost.toFormat(CCDineroFormat),
+      },
+      CostHours: {
+        Body: repairCosts.BodyLaborTotalHrs.toFixed(2),
+        Paint: repairCosts.RefinishLaborTotalHrs.toFixed(2),
+        Prep: "0.00",
+        Frame: repairCosts.FrameLaborTotalHrs.toFixed(2),
+        Mech: repairCosts.MechanicalLaborTotalHrs.toFixed(2),
+        Glass: repairCosts.GlassLaborTotalHrs.toFixed(2),
+        Elec: repairCosts.ElectricalLaborTotalHrs.toFixed(2),
+        Detail: "0.00",
+        Other: repairCosts.LaborMiscTotalHrs.toFixed(2),
+        CostTotalHours: repairCosts.TotalHrs.toFixed(2),
+      },
+    };
+    return ret;
+  } catch (error) {
+    logger.log("claimscorp-job-calculate-error", "ERROR", "api", null, {
+      error,
+    });
+
+    errorCallback({ jobid: job.id, ro_number: job.ro_number, error });
+  }
+};
+
+const CreateCosts = (job) => {
+  //Create a mapping based on AH Requirements
+
+  //For DMS, the keys in the object below are the CIECA part types.
+  const billTotalsByCostCenters = job.bills.reduce((bill_acc, bill_val) => {
+    //At the bill level.
+    bill_val.billlines.map((line_val) => {
+      //At the bill line level.
+
+      if (!bill_acc[line_val.cost_center])
+        bill_acc[line_val.cost_center] = Dinero();
+
+      bill_acc[line_val.cost_center] = bill_acc[line_val.cost_center].add(
+        Dinero({
+          amount: Math.round((line_val.actual_cost || 0) * 100),
+        })
+          .multiply(line_val.quantity)
+          .multiply(bill_val.is_credit_memo ? -1 : 1)
+      );
+
+      return null;
+    });
+    return bill_acc;
+  }, {});
+
+  //If the hourly rates for job costing are set, add them in.
+  if (
+    job.bodyshop.jc_hourly_rates &&
+    (job.bodyshop.jc_hourly_rates.mapa ||
+      typeof job.bodyshop.jc_hourly_rates.mapa === "number" ||
+      isNaN(job.bodyshop.jc_hourly_rates.mapa) === false)
+  ) {
+    if (
+      !billTotalsByCostCenters[
+        job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
+      ]
+    )
+      billTotalsByCostCenters[
+        job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
+      ] = Dinero();
+    if (job.bodyshop.use_paint_scale_data === true) {
+      if (job.mixdata.length > 0) {
+        billTotalsByCostCenters[
+          job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
+        ] = Dinero({
+          amount: Math.round(
+            ((job.mixdata[0] && job.mixdata[0].totalliquidcost) || 0) * 100
+          ),
+        });
+      } else {
+        billTotalsByCostCenters[
+          job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
+        ] = billTotalsByCostCenters[
+          job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
+        ].add(
+          Dinero({
+            amount: Math.round(
+              (job.bodyshop.jc_hourly_rates &&
+                job.bodyshop.jc_hourly_rates.mapa * 100) ||
+                0
+            ),
+          }).multiply(job.job_totals.rates.mapa.hours)
+        );
+      }
+    } else {
+      billTotalsByCostCenters[
+        job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
+      ] = billTotalsByCostCenters[
+        job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
+      ].add(
+        Dinero({
+          amount: Math.round(
+            (job.bodyshop.jc_hourly_rates &&
+              job.bodyshop.jc_hourly_rates.mapa * 100) ||
+              0
+          ),
+        }).multiply(job.job_totals.rates.mapa.hours)
+      );
+    }
+  }
+  if (job.bodyshop.jc_hourly_rates && job.bodyshop.jc_hourly_rates.mash) {
+    if (
+      !billTotalsByCostCenters[
+        job.bodyshop.md_responsibility_centers.defaults.costs.MASH
+      ]
+    )
+      billTotalsByCostCenters[
+        job.bodyshop.md_responsibility_centers.defaults.costs.MASH
+      ] = Dinero();
+    billTotalsByCostCenters[
+      job.bodyshop.md_responsibility_centers.defaults.costs.MASH
+    ] = billTotalsByCostCenters[
+      job.bodyshop.md_responsibility_centers.defaults.costs.MASH
+    ].add(
+      Dinero({
+        amount: Math.round(
+          (job.bodyshop.jc_hourly_rates &&
+            job.bodyshop.jc_hourly_rates.mash * 100) ||
+            0
+        ),
+      }).multiply(job.job_totals.rates.mash.hours)
+    );
+  }
+  //Uses CIECA Labor types.
+  const ticketTotalsByCostCenter = job.timetickets.reduce(
+    (ticket_acc, ticket_val) => {
+      //At the invoice level.
+      if (!ticket_acc[ticket_val.cost_center])
+        ticket_acc[ticket_val.cost_center] = Dinero();
+
+      ticket_acc[ticket_val.cost_center] = ticket_acc[
+        ticket_val.cost_center
+      ].add(
+        Dinero({
+          amount: Math.round((ticket_val.rate || 0) * 100),
+        }).multiply(
+          (ticket_val.flat_rate
+            ? ticket_val.productivehrs
+            : ticket_val.actualhrs) || 0
+        )
+      );
+
+      return ticket_acc;
+    },
+    {}
+  );
+  const ticketHrsByCostCenter = job.timetickets.reduce(
+    (ticket_acc, ticket_val) => {
+      //At the invoice level.
+      if (!ticket_acc[ticket_val.cost_center])
+        ticket_acc[ticket_val.cost_center] = 0;
+
+      ticket_acc[ticket_val.cost_center] =
+        ticket_acc[ticket_val.cost_center] +
+          (ticket_val.flat_rate
+            ? ticket_val.productivehrs
+            : ticket_val.actualhrs) || 0;
+
+      return ticket_acc;
+    },
+    {}
+  );
+  //CIECA STANDARD MAPPING OBJECT.
+
+  const ciecaObj = {
+    ATS: "ATS",
+    LA1: "LA1",
+    LA2: "LA2",
+    LA3: "LA3",
+    LA4: "LA4",
+    LAA: "LAA",
+    LAB: "LAB",
+    LAD: "LAD",
+    LAE: "LAE",
+    LAF: "LAF",
+    LAG: "LAG",
+    LAM: "LAM",
+    LAR: "LAR",
+    LAS: "LAS",
+    LAU: "LAU",
+    PAA: "PAA",
+    PAC: "PAC",
+    PAG: "PAG",
+    PAL: "PAL",
+    PAM: "PAM",
+    PAN: "PAN",
+    PAO: "PAO",
+    PAP: "PAP",
+    PAR: "PAR",
+    PAS: "PAS",
+    TOW: "TOW",
+    MAPA: "MAPA",
+    MASH: "MASH",
+    PASL: "PASL",
+  };
+  const defaultCosts =
+    job.bodyshop.cdk_dealerid || job.bodyshop.pbs_serialnumber
+      ? ciecaObj
+      : job.bodyshop.md_responsibility_centers.defaults.costs;
+
+  return {
+    PartsTotalCost: Object.keys(billTotalsByCostCenters).reduce((acc, key) => {
+      if (
+        key !== defaultCosts.PAS &&
+        key !== defaultCosts.PASL &&
+        key !== defaultCosts.MAPA &&
+        key !== defaultCosts.MASH &&
+        key !== defaultCosts.TOW
+      )
+        return acc.add(billTotalsByCostCenters[key]);
+      return acc;
+    }, Dinero()),
+    PartsOemCost: (billTotalsByCostCenters[defaultCosts.PAN] || Dinero()).add(
+      billTotalsByCostCenters[defaultCosts.PAP] || Dinero()
+    ),
+    PartsAMCost: billTotalsByCostCenters[defaultCosts.PAA] || Dinero(),
+    PartsReconditionedCost:
+      billTotalsByCostCenters[defaultCosts.PAM] || Dinero(),
+    PartsRecycledCost: billTotalsByCostCenters[defaultCosts.PAL] || Dinero(),
+    PartsOtherCost: billTotalsByCostCenters[defaultCosts.PAO] || Dinero(),
+    SubletTotalCost:
+      billTotalsByCostCenters[defaultCosts.PAS] ||
+      Dinero(billTotalsByCostCenters[defaultCosts.PASL] || Dinero()),
+    BodyLaborTotalCost: ticketTotalsByCostCenter[defaultCosts.LAB] || Dinero(),
+    BodyLaborTotalHrs: ticketHrsByCostCenter[defaultCosts.LAB] || 0,
+    RefinishLaborTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAR] || Dinero(),
+    RefinishLaborTotalHrs: ticketHrsByCostCenter[defaultCosts.LAR] || 0,
+    MechanicalLaborTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAM] || Dinero(),
+    MechanicalLaborTotalHrs: ticketHrsByCostCenter[defaultCosts.LAM] || 0,
+    StructuralLaborTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAS] || Dinero(),
+    StructuralLaborTotalHrs: ticketHrsByCostCenter[defaultCosts.LAS] || 0,
+    ElectricalLaborTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAE] || Dinero(),
+    ElectricalLaborTotalHrs: ticketHrsByCostCenter[defaultCosts.LAE] || 0,
+    FrameLaborTotalCost: ticketTotalsByCostCenter[defaultCosts.LAF] || Dinero(),
+    FrameLaborTotalHrs: ticketHrsByCostCenter[defaultCosts.LAF] || 0,
+    GlassLaborTotalCost: ticketTotalsByCostCenter[defaultCosts.LAG] || Dinero(),
+    GlassLaborTotalHrs: ticketHrsByCostCenter[defaultCosts.LAG] || 0,
+    DetailLaborTotalCost: Dinero(),
+    //   ticketTotalsByCostCenter[defaultCosts.LAD] || Dinero(),
+    LaborMiscTotalCost: (ticketTotalsByCostCenter[defaultCosts.LA1] || Dinero())
+      .add(ticketTotalsByCostCenter[defaultCosts.LA2] || Dinero())
+      .add(ticketTotalsByCostCenter[defaultCosts.LA2] || Dinero())
+      .add(ticketTotalsByCostCenter[defaultCosts.LA3] || Dinero())
+      .add(ticketTotalsByCostCenter[defaultCosts.LA4] || Dinero())
+      .add(ticketTotalsByCostCenter[defaultCosts.LAU] || Dinero()),
+    LaborMiscTotalHrs:
+      (ticketHrsByCostCenter[defaultCosts.LA1] || 0) +
+      (ticketHrsByCostCenter[defaultCosts.LA2] || 0) +
+      (ticketHrsByCostCenter[defaultCosts.LA3] || 0) +
+      (ticketHrsByCostCenter[defaultCosts.LA4] || 0) +
+      (ticketHrsByCostCenter[defaultCosts.LAU] || 0),
+    PMTotalCost: billTotalsByCostCenters[defaultCosts.MAPA] || Dinero(),
+    BMTotalCost: billTotalsByCostCenters[defaultCosts.MASH] || Dinero(),
+    MiscTotalCost: billTotalsByCostCenters[defaultCosts.PAO] || Dinero(),
+    TowingTotalCost: billTotalsByCostCenters[defaultCosts.TOW] || Dinero(),
+    StorageTotalCost: Dinero(),
+    DetailTotal: Dinero(),
+    DetailTotalCost: Dinero(),
+    SalesTaxTotalCost: Dinero(),
+    LabourTotalCost: Object.keys(ticketTotalsByCostCenter).reduce(
+      (acc, key) => {
+        return acc.add(ticketTotalsByCostCenter[key]);
+      },
+      Dinero()
+    ),
+    TotalCost: Object.keys(billTotalsByCostCenters).reduce((acc, key) => {
+      return acc.add(billTotalsByCostCenters[key]);
+    }, Dinero()),
+    TotalHrs: job.timetickets.reduce((acc, ticket_val) => {
+      return (
+        acc +
+          (ticket_val.flat_rate
+            ? ticket_val.productivehrs
+            : ticket_val.actualhrs) || 0
+      );
+    }, 0),
+  };
+};
+
+const StatusMapping = (status, md_ro_statuses) => {
+  //Possible return statuses CLO, CAN, OPN
+  const {
+    default_imported,
+    default_open,
+    default_scheduled,
+    default_arrived,
+    default_completed,
+    default_delivered,
+    default_invoiced,
+    default_exported,
+    default_void,
+  } = md_ro_statuses;
+
+  if (
+    status === default_open ||
+    status === default_imported ||
+    status === default_scheduled ||
+    status === default_arrived ||
+    status === default_completed ||
+    status === default_delivered ||
+    md_ro_statuses.production_statuses.includes(status)
+  )
+    return "OPN";
+  else if (status === default_invoiced || status === default_exported)
+    return "CLO";
+  else if (status === default_void) return "CAN";
+  else return "UNDEFINED";
+};

server/data/data.js

@@ -1,2 +1,3 @@
 exports.autohouse = require("./autohouse").default;
-exports.arms = require("./arms").default;
+exports.claimscorp = require("./claimscorp").default;
+exports.arms = require("./arms").default;

server/email/sendemail.js

@@ -7,15 +7,19 @@ require("dotenv").config({
 });
 const axios = require("axios");
 let nodemailer = require("nodemailer");
-let aws = require("aws-sdk");
+let aws = require("@aws-sdk/client-ses");
+let { defaultProvider } = require("@aws-sdk/credential-provider-node");
+
 const logger = require("../utils/logger");
 const client = require("../graphql-client/graphql-client").client;
 const queries = require("../graphql-client/queries");
 
 const ses = new aws.SES({
+  // The key apiVersion is no longer supported in v3, and can be removed.
+  // @deprecated The client uses the "latest" apiVersion.
   apiVersion: "latest",
-
   region: "ca-central-1",
+  defaultProvider
 });
 
 let transporter = nodemailer.createTransport({
@@ -48,7 +52,6 @@ exports.sendServerEmail = async function ({ subject, text }) {
   } catch (error) {
     console.log(error);
     logger.log("server-email-failure", "error", null, null, error);
-    res.status(500).json(error);
   }
 };
 exports.sendTaskEmail = async function ({ to, subject, text, attachments }) {

server/graphql-client/queries.js

@@ -1,16 +1,12 @@
 exports.FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID = `
-query FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID(
-    $mssid: String!
-    $phone: String!
-  ) {
+query FIND_BODYSHOP_BY_MESSAGING_SERVICE_SID($mssid: String!, $phone: String!) {
     bodyshops(where: { messagingservicesid: { _eq: $mssid } }) {
       id
       conversations(where: { phone_num: { _eq: $phone } }) {
         id
       }
     }
-  }
-`;
+  }`;
 
 exports.GET_JOB_BY_RO_NUMBER = `
   query GET_JOB_BY_RO_NUMBER($ro_number: String!) {
@@ -20,8 +16,7 @@ exports.GET_JOB_BY_RO_NUMBER = `
         id
       }
     }
-  }
-`;
+  }`;
 
 exports.INSERT_NEW_PAYMENT = `
   mutation INSERT_NEW_PAYMENT($paymentInput: [payments_insert_input!]!) {
@@ -30,28 +25,23 @@ exports.INSERT_NEW_PAYMENT = `
         id
       }
     }
-  }
-`;
+  }`;
 
 exports.INSERT_PAYMENT_RESPONSE = `
-  mutation INSERT_PAYMENT_RESPONSE(
-    $paymentResponse: [payment_response_insert_input!]!
-  ) {
+  mutation INSERT_PAYMENT_RESPONSE($paymentResponse: [payment_response_insert_input!]!) {
     insert_payment_response(objects: $paymentResponse) {
       returning {
         id
       }
     }
-  }
-`;
+  }`;
 
 exports.UNARCHIVE_CONVERSATION = `
 mutation UNARCHIVE_CONVERSATION($id: uuid!) {
   update_conversations_by_pk(pk_columns: {id: $id}, _set: {archived: false}) {
     id
   }
-}
-`;
+}`;
 
 exports.INSERT_NEW_JOB_LINE = `
   mutation INSERT_NEW_JOB_LINE($lineInput: [joblines_insert_input!]!) {
@@ -60,8 +50,7 @@ exports.INSERT_NEW_JOB_LINE = `
         id
       }
     }
-  }
-`;
+  }`;
 
 exports.UPDATE_JOB_LINE = `
   mutation UPDATE_JOB_LINE($lineId: uuid!, $line: joblines_set_input!) {
@@ -82,8 +71,7 @@ exports.UPDATE_JOB_LINE = `
         removed
       }
     }
-  }
-`;
+  }`;
 
 exports.RECEIVE_MESSAGE = `
 mutation RECEIVE_MESSAGE($msg: [messages_insert_input!]!) {
@@ -92,7 +80,7 @@ mutation RECEIVE_MESSAGE($msg: [messages_insert_input!]!) {
       conversation {
         id
         archived
-        bodyshop{
+        bodyshop {
           imexshopid
         }
         created_at
@@ -114,10 +102,7 @@ mutation RECEIVE_MESSAGE($msg: [messages_insert_input!]!) {
       userid
     }
   }
-}
-
-
-  `;
+}`;
 
 exports.INSERT_MESSAGE = `
 mutation INSERT_MESSAGE($msg: [messages_insert_input!]!, $conversationid: uuid!) {
@@ -130,7 +115,7 @@ mutation INSERT_MESSAGE($msg: [messages_insert_input!]!, $conversationid: uuid!)
       conversation {
         id
         archived
-        bodyshop{
+        bodyshop {
           imexshopid
         }
         created_at
@@ -152,10 +137,7 @@ mutation INSERT_MESSAGE($msg: [messages_insert_input!]!, $conversationid: uuid!)
       userid
     }
   }
-}
-
-
-  `;
+}`;
 
 exports.UPDATE_MESSAGE_STATUS = `
 mutation UPDATE_MESSAGE($msid: String!, $fields: messages_set_input!) {
@@ -164,8 +146,7 @@ mutation UPDATE_MESSAGE($msid: String!, $fields: messages_set_input!) {
         id
       }
     }
-  }
-  `;
+  }`;
 
 exports.QUERY_JOBS_FOR_RECEIVABLES_EXPORT = `
 query QUERY_JOBS_FOR_RECEIVABLES_EXPORT($ids: [uuid!]!) {
@@ -228,7 +209,7 @@ query QUERY_JOBS_FOR_RECEIVABLES_EXPORT($ids: [uuid!]!) {
     owner {
       accountingid
     }
-      joblines(where:{removed: {_eq:false}}) {
+    joblines(where:{removed: {_eq:false}}) {
       id
       line_desc
       part_type
@@ -257,8 +238,7 @@ query QUERY_JOBS_FOR_RECEIVABLES_EXPORT($ids: [uuid!]!) {
     timezone
     md_ro_statuses
   }
-}
-  `;
+}`;
 
 exports.QUERY_JOBS_FOR_CDK_EXPORT = `
 query QUERY_JOBS_FOR_CDK_EXPORT($id: uuid!) {
@@ -318,19 +298,19 @@ query QUERY_JOBS_FOR_CDK_EXPORT($id: uuid!) {
     v_make_desc
     v_color
     ca_customer_gst
-      bodyshop {
-    id
-    md_ro_statuses
-    md_responsibility_centers
-    accountingconfig
-    cdk_dealerid
-    cdk_configuration
-    timezone
-  }
+    bodyshop {
+      id
+      md_ro_statuses
+      md_responsibility_centers
+      accountingconfig
+      cdk_dealerid
+      cdk_configuration
+      timezone
+    }
     owner {
       accountingid
     }
-      joblines(where:{removed: {_eq:false}}) {
+    joblines(where:{removed: {_eq:false}}) {
       id
       line_desc
       part_type
@@ -345,9 +325,7 @@ query QUERY_JOBS_FOR_CDK_EXPORT($id: uuid!) {
       prt_dsmk_p
     }
   }
-
-}
-  `;
+}`;
 
 exports.QUERY_JOBS_FOR_PBS_EXPORT = `
 query QUERY_JOBS_FOR_PBS_EXPORT($id: uuid!) {
@@ -410,24 +388,24 @@ query QUERY_JOBS_FOR_PBS_EXPORT($id: uuid!) {
     v_make_desc
     v_color
     ca_customer_gst
-    vehicle{
+    vehicle {
       v_trimcode
       v_makecode
     }
-      bodyshop {
-    id
-    md_ro_statuses
-    md_responsibility_centers
-    accountingconfig
-   pbs_serialnumber
-    pbs_configuration
-    timezone
-  }
+    bodyshop {
+      id
+      md_ro_statuses
+      md_responsibility_centers
+      accountingconfig
+      pbs_serialnumber
+      pbs_configuration
+      timezone
+    }
     owner {
       id
       accountingid
     }
-      joblines(where:{removed: {_eq:false}}) {
+    joblines(where:{removed: {_eq:false}}) {
       id
       line_desc
       part_type
@@ -444,9 +422,7 @@ query QUERY_JOBS_FOR_PBS_EXPORT($id: uuid!) {
       line_ref
     }
   }
-
-}
-  `;
+}`;
 
 exports.QUERY_BILLS_FOR_PAYABLES_EXPORT = `
 query QUERY_BILLS_FOR_PAYABLES_EXPORT($bills: [uuid!]!) {
@@ -490,18 +466,17 @@ query QUERY_BILLS_FOR_PAYABLES_EXPORT($bills: [uuid!]!) {
       due_date
     }
   }
-}
-  `;
+}`;
 
 exports.QUERY_PAYMENTS_FOR_EXPORT = `
-  query QUERY_PAYMENTS_FOR_EXPORT($payments: [uuid!]!) 
-  {  bodyshops(where: {associations: {active: {_eq: true}}}) {
-    id
-    md_responsibility_centers
-    accountingconfig
-    timezone
-    md_ins_cos
-  }
+  query QUERY_PAYMENTS_FOR_EXPORT($payments: [uuid!]!) {
+    bodyshops(where: {associations: {active: {_eq: true}}}) {
+      id
+      md_responsibility_centers
+      accountingconfig
+      timezone
+      md_ins_cos
+    }
     payments(where: {id: {_in: $payments}}) {
       id
       created_at
@@ -509,15 +484,14 @@ exports.QUERY_PAYMENTS_FOR_EXPORT = `
       job {
         id
         ro_number
-            ownerid
-    ownr_ln
-    ownr_fn
-    ownr_addr1
-    ownr_addr2
-    ownr_zip
-    ownr_city
-    ownr_st
-
+        ownerid
+        ownr_ln
+        ownr_fn
+        ownr_addr1
+        ownr_addr2
+        ownr_zip
+        ownr_city
+        ownr_st
         ins_co_nm
         owner{
           accountingid
@@ -525,7 +499,7 @@ exports.QUERY_PAYMENTS_FOR_EXPORT = `
         ownr_fn
         ownr_ln
         ownr_co_nm
-        bodyshop{
+        bodyshop {
           accountingconfig
           md_responsibility_centers
           md_ins_cos
@@ -542,8 +516,7 @@ exports.QUERY_PAYMENTS_FOR_EXPORT = `
       paymentnum
       date
     }
-  }
-    `;
+  }`;
 
 exports.QUERY_UPCOMING_APPOINTMENTS = `query QUERY_UPCOMING_APPOINTMENTS($now: timestamptz!, $jobId: uuid!) {
   jobs_by_pk(id: $jobId) {
@@ -643,8 +616,7 @@ exports.QUERY_UPCOMING_APPOINTMENTS = `query QUERY_UPCOMING_APPOINTMENTS($now: t
       }
     }
   }
-}
-`;
+}`;
 
 exports.QUERY_EMPLOYEE_PIN = `query QUERY_EMPLOYEE_PIN($shopId: uuid!, $employeeId: String!) {
   employees(where: {_and: {shopid: {_eq: $shopId}, employee_number: {_eq: $employeeId}}}) {
@@ -835,8 +807,179 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
       totalliquidcost
     }
   }
-}
-`;
+}`;
+
+exports.CLAIMSCORP_QUERY = `query CLAIMSCORP_EXPORT($start: timestamptz, $bodyshopid: uuid!, $end: timestamptz) {
+  bodyshops_by_pk(id: $bodyshopid){
+    id
+    shopname
+    address1
+    city
+    state
+    zip_post
+    country
+    phone
+    md_ro_statuses
+    md_order_statuses
+    claimscorpid
+    md_responsibility_centers
+    jc_hourly_rates
+    cdk_dealerid
+    pbs_serialnumber
+    use_paint_scale_data
+    timezone
+  }
+  jobs(where: {_and: [{converted: {_eq: true}}, {updated_at: {_gt: $start}}, {updated_at: {_lte: $end}}, {shopid: {_eq: $bodyshopid}}]}) {
+    id
+    created_at
+    ro_number
+    status
+    est_ct_fn
+    est_ct_ln
+    ownr_st
+    ownr_zip
+    tlos_ind
+    v_color
+    v_model_yr
+    v_model_desc
+    v_make_desc
+    v_vin
+    vehicle {
+      v_bstyle
+    }
+    ins_co_nm
+    clm_no
+    loss_date
+    asgn_date
+    date_estimated
+    date_open
+    scheduled_in
+    actual_in
+    scheduled_completion
+    actual_completion
+    scheduled_delivery
+    actual_delivery
+    date_invoiced
+    date_exported
+    rate_la1
+    rate_la2
+    rate_la3
+    rate_la4
+    rate_laa
+    rate_lab
+    rate_lad
+    rate_lae
+    rate_laf
+    rate_lag
+    rate_lam
+    rate_lar
+    rate_las
+    rate_lau
+    rate_ma2s
+    rate_ma2t
+    rate_ma3s
+    rate_mabl
+    rate_macs
+    rate_mahw
+    rate_matd
+    rate_mapa
+    rate_mash
+    job_totals
+    parts_tax_rates
+    date_repairstarted
+    joblines(where: {removed: {_eq: false}}) {
+      id
+      line_no
+      line_ind
+      status
+      line_ind
+      db_price
+      act_price
+      mod_lb_hrs
+      mod_lbr_ty
+      line_desc
+      prt_dsmk_m
+      prt_dsmk_p
+      part_qty
+      part_type
+      oem_partno
+      lbr_op
+      profitcenter_part
+      profitcenter_labor
+      ah_detail_line
+      parts_order_lines(order_by: {parts_order: {order_date: desc_nulls_last}} limit: 1){
+        parts_order{
+          id
+          order_date
+        }
+      }
+      billlines(order_by: {bill: {date: desc_nulls_last}} limit: 1) {
+        actual_cost
+        actual_price
+        quantity
+        bill {
+          vendor {
+            name
+          }
+          invoice_number
+          date
+        }
+      }
+    }
+    bills {
+      id
+      federal_tax_rate
+      local_tax_rate
+      state_tax_rate
+      is_credit_memo
+      billlines {
+        actual_cost
+        cost_center
+        id
+        quantity
+      }
+    }
+    employee_body_rel {
+      first_name
+      last_name
+      employee_number
+      id
+    }
+    employee_csr_rel {
+      first_name
+      last_name
+      employee_number
+      id
+    }
+    employee_prep_rel {
+      first_name
+      last_name
+      employee_number
+      id
+    }
+    employee_refinish_rel {
+      first_name
+      last_name
+      employee_number
+      id
+    }
+    parts_orders(limit: 1, order_by: {created_at: desc}) {
+      created_at
+    }
+    timetickets {
+      id
+      rate
+      cost_center
+      actualhrs
+      productivehrs
+      flat_rate
+    }
+    mixdata(limit: 1, order_by: {updated_at: desc}) {
+      jobid
+      totalliquidcost
+    }
+  }
+}`;
 
 exports.ENTEGRAL_EXPORT = `
 query ENTEGRAL_EXPORT($bodyshopid: uuid!) {
@@ -925,8 +1068,7 @@ query ENTEGRAL_EXPORT($bodyshopid: uuid!) {
     cieca_ttl
     adjustment_bottom_line
   }
-}
-`;
+}`;
 
 exports.UPDATE_JOB = `
   mutation UPDATE_JOB($jobId: uuid!, $job: jobs_set_input!) {
@@ -941,8 +1083,7 @@ exports.UPDATE_JOB = `
         lbr_adjustments
       }
     }
-  }
-`;
+  }`;
 
 exports.GET_JOB_BY_PK = `query GET_JOB_BY_PK($id: uuid!) {
     jobs_by_pk(id: $id) {
@@ -954,7 +1095,7 @@ exports.GET_JOB_BY_PK = `query GET_JOB_BY_PK($id: uuid!) {
       kmout
       comment
       referral_source
-       referral_source_extra
+      referral_source_extra
       unit_number
       po_number
       special_coverage_policy
@@ -990,10 +1131,10 @@ exports.GET_JOB_BY_PK = `query GET_JOB_BY_PK($id: uuid!) {
       est_ct_fn
       shopid
       est_ct_ln
-vehicle{
-  id
-  notes
-}
+      vehicle {
+        id
+        notes
+      }
       est_ph1
       est_ea
       selling_dealer
@@ -1353,19 +1494,17 @@ exports.QUERY_JOB_COSTING_DETAILS_MULTI = ` query QUERY_JOB_COSTING_DETAILS_MULT
       use_paint_scale_data
     }
   }
-}
-`;
+}`;
 
 exports.INSERT_IOEVENT = ` mutation INSERT_IOEVENT($event: ioevents_insert_input!) {
   insert_ioevents_one(object: $event) {
     id
   }
-}
-`;
+}`;
 
 exports.GET_AUTOHOUSE_SHOPS = `query GET_AUTOHOUSE_SHOPS {
-  bodyshops(where: {autohouseid: {_is_null: false}}){
-         id
+  bodyshops(where: {autohouseid: {_is_null: false}, _or: {autohouseid: {_neq: ""}}}){
+      id
       shopname
       address1
       city
@@ -1381,12 +1520,31 @@ exports.GET_AUTOHOUSE_SHOPS = `query GET_AUTOHOUSE_SHOPS {
       imexshopid
       timezone
   }
-}
-`;
+}`;
+
+exports.GET_CLAIMSCORP_SHOPS = `query GET_CLAIMSCORP_SHOPS {
+  bodyshops(where: {claimscorpid: {_is_null: false}, _or: {claimscorpid: {_neq: ""}}}){
+      id
+      shopname
+      address1
+      city
+      state
+      zip_post
+      country
+      phone
+      md_ro_statuses
+      md_order_statuses
+      claimscorpid
+      md_responsibility_centers
+      jc_hourly_rates
+      imexshopid
+      timezone
+  }
+}`;
 
 exports.GET_ENTEGRAL_SHOPS = `query GET_AUTOHOUSE_SHOPS {
-  bodyshops(where: {entegral_id: {_is_null: false}}){
-         id
+  bodyshops(where: {entegral_id: {_is_null: false}, _or: {entegral_id: {_neq: ""}}}){
+      id
       shopname
       address1
       city
@@ -1402,22 +1560,19 @@ exports.GET_ENTEGRAL_SHOPS = `query GET_AUTOHOUSE_SHOPS {
       timezone
       features
   }
-}
-`;
+}`;
 
 exports.DELETE_ALL_DMS_VEHICLES = `mutation DELETE_ALL_DMS_VEHICLES{
   delete_dms_vehicles(where: {}) {
     affected_rows
   }
-}
-`;
+}`;
+
 exports.INSERT_DMS_VEHICLES = `mutation INSERT_DMS_VEHICLES($vehicles: [dms_vehicles_insert_input!]!) {
   insert_dms_vehicles(objects: $vehicles) {
 affected_rows
   }
-}
-
-`;
+}`;
 
 exports.GET_CDK_ALLOCATIONS = `query QUERY_JOB_CLOSE_DETAILS($id: uuid!) {
   jobs_by_pk(id: $id) {
@@ -1534,8 +1689,7 @@ exports.GET_CDK_ALLOCATIONS = `query QUERY_JOB_CLOSE_DETAILS($id: uuid!) {
       unq_seq
     }
   }
-}
-`;
+}`;
 
 exports.GET_QBO_AUTH = `query GET_QBO_AUTH($email: String!) {
   associations(where: {_and: {active: {_eq: true}, useremail: {_eq: $email}}}){
@@ -1549,15 +1703,13 @@ exports.SET_QBO_AUTH_WITH_REALM = `mutation SET_QBO_AUTH($email: String!, $qbo_a
   update_associations(_set: {qbo_auth: $qbo_auth, qbo_realmId: $qbo_realmId}, where: {_and: {active: {_eq: true}, useremail: {_eq: $email}}}){
     affected_rows
   }
-}
-`;
+}`;
 
 exports.SET_QBO_AUTH = `mutation SET_QBO_AUTH($email: String!, $qbo_auth: jsonb!) {
   update_associations(_set: {qbo_auth: $qbo_auth}, where: {_and: {active: {_eq: true}, useremail: {_eq: $email}}}){
     affected_rows
   }
-}
-`;
+}`;
 
 exports.MARK_JOB_EXPORTED = `
 mutation MARK_JOB_EXPORTED($jobId: uuid!, $job: jobs_set_input!, $log: exportlog_insert_input!, $bill: bills_set_input!) {
@@ -1576,10 +1728,9 @@ mutation MARK_JOB_EXPORTED($jobId: uuid!, $job: jobs_set_input!, $log: exportlog
     id
   }
   update_bills(where:{jobid:{_eq :$jobId}}, _set:$bill){
-  affected_rows
+    affected_rows
   }
-}
-`;
+}`;
 
 exports.MARK_BILLS_EXPORTED = `
 mutation UPDATE_BILLS($billids: [uuid!]!, $bill: bills_set_input!, $logs: [exportlog_insert_input!]!) {
@@ -1591,28 +1742,25 @@ mutation UPDATE_BILLS($billids: [uuid!]!, $bill: bills_set_input!, $logs: [expor
     }
   }
   insert_exportlog(objects: $logs) {
-returning{
-  id
-}
+    returning{
+      id
+    }
   }
-}
-`;
+}`;
 
 exports.INSERT_EXPORT_LOG = `
 mutation INSERT_EXPORT_LOG($log: exportlog_insert_input!) {
   insert_exportlog_one(object: $log) {
     id
   }
-}
-`;
+}`;
 
 exports.QUERY_EXISTING_TRANSITION = `
 mutation INSERT_EXPORT_LOG($log: exportlog_insert_input!) {
   insert_exportlog_one(object: $log) {
     id
   }
-}
-`;
+}`;
 
 exports.UPDATE_OLD_TRANSITION = `mutation UPDATE_OLD_TRANSITION($jobid: uuid!, $existingTransition: transitions_set_input!){
   update_transitions(where:{jobid:{_eq:$jobid}, end:{_is_null:true
@@ -1636,9 +1784,7 @@ exports.INSERT_NEW_TRANSITION = `mutation INSERT_NEW_TRANSITION($newTransition:
   update_transitions(where: {id: {_eq: $oldTransitionId}}, _set: {duration: $duration}) {
     affected_rows
   }
-}
-
-`;
+}`;
 
 exports.QUERY_JOB_ID_MIXDATA = `query QUERY_JOB_ID_MIXDATA($roNumbers: [String!]!) {
   jobs(where: {ro_number: {_in: $roNumbers}}) {
@@ -1648,9 +1794,7 @@ exports.QUERY_JOB_ID_MIXDATA = `query QUERY_JOB_ID_MIXDATA($roNumbers: [String!]
       id
     }
   }
-}
-
-`;
+}`;
 
 exports.QBO_MARK_JOB_EXPORTED = `
 mutation QBO_MARK_JOB_EXPORTED($jobId: uuid!, $job: jobs_set_input!, $logs: [exportlog_insert_input!]!) {
@@ -1663,9 +1807,8 @@ mutation QBO_MARK_JOB_EXPORTED($jobId: uuid!, $job: jobs_set_input!, $logs: [exp
 
     }
   }
-}
+}`;
 
-`;
 exports.QBO_MARK_BILL_EXPORTED = `
 mutation QBO_MARK_BILL_EXPORTED($billId: uuid!, $bill: bills_set_input!, $logs: [exportlog_insert_input!]!) {
   insert_exportlog(objects: $logs) {
@@ -1676,9 +1819,7 @@ mutation QBO_MARK_BILL_EXPORTED($billId: uuid!, $bill: bills_set_input!, $logs:
         id
       }
     }
-}
-
-`;
+}`;
 
 exports.QBO_MARK_PAYMENT_EXPORTED = `
 mutation QBO_MARK_PAYMENT_EXPORTED($paymentId: uuid!, $payment: payments_set_input!, $logs: [exportlog_insert_input!]!) {
@@ -1693,19 +1834,17 @@ mutation QBO_MARK_PAYMENT_EXPORTED($paymentId: uuid!, $payment: payments_set_inp
 }`;
 
 exports.INSERT_EXPORT_LOG = `
-  mutation INSERT_EXPORT_LOG($logs: [exportlog_insert_input!]!) {
-    insert_exportlog(objects: $logs) {
-      affected_rows
-    }
+mutation INSERT_EXPORT_LOG($logs: [exportlog_insert_input!]!) {
+  insert_exportlog(objects: $logs) {
+    affected_rows
   }
-`;
+}`;
 
 exports.INSERT_EMAIL_AUDIT = `mutation INSERT_EMAIL_AUDIT($email: email_audit_trail_insert_input!) {
   insert_email_audit_trail_one(object: $email) {
     id
   }
-}
-`;
+}`;
 
 exports.DELETE_MEDIA_DOCUMENTS = `
 mutation DELETE_DOCUMENTS($ids: [uuid!]!) {
@@ -1714,8 +1853,7 @@ mutation DELETE_DOCUMENTS($ids: [uuid!]!) {
       id
     }
   }
-}
-`;
+}`;
 
 exports.UPDATE_EMAIL_AUDIT = `
 mutation ($sesid: String!, $status: String, $context: jsonb) {
@@ -1767,8 +1905,7 @@ query GET_PBS_AP_ALLOCATIONS($billids: [uuid!]) {
       quantity
     }
   }
-}
-`;
+}`;
 
 exports.QUERY_PARTS_SCAN = `query QUERY_PARTS_SCAN ($id: uuid!) {
   jobs_by_pk(id: $id) {
@@ -1782,8 +1919,7 @@ exports.QUERY_PARTS_SCAN = `query QUERY_PARTS_SCAN ($id: uuid!) {
       critical
     }
   }
-}
-`;
+}`;
 
 exports.UPDATE_PARTS_CRITICAL = `mutation UPDATE_PARTS_CRITICAL ($IdsToMarkCritical:[uuid!]!, $jobid: uuid!){
   critical: update_joblines(where:{id:{_in:$IdsToMarkCritical}}, _set:{critical: true}){
@@ -1799,5 +1935,4 @@ exports.ACTIVE_SHOP_BY_USER = `query ACTIVE_SHOP_BY_USER($user: String) {
     id
     shopid
   }
-}
-`;
+}`;

server/intellipay/aws-secrets-manager.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const AWS = require("aws-sdk");
+const awsSecretManager = require("@aws-sdk/client-secrets-manager");
 
 class SecretsManager {
   /**
@@ -8,11 +8,10 @@ class SecretsManager {
    */
   static async getSecret(secretName, region) {
     const config = { region: region };
-    let secretsManager = new AWS.SecretsManager(config);
+    let secretsManager = new awsSecretManager.SecretsManager(config);
     try {
       let secretValue = await secretsManager
-        .getSecretValue({ SecretId: secretName })
-        .promise();
+        .getSecretValue({ SecretId: secretName });
       if ("SecretString" in secretValue) {
         return secretValue.SecretString;
       } else {