IO-2600 Tech Console Job Logout Console Log

IO-2520 Adjust to imexshopid instead of shopname & prettify

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

@@ -15,6 +15,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 import BillMarkSelectedExported from "../payable-mark-selected-exported/payable-mark-selected-exported.component";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -210,7 +211,7 @@ export function AccountingPayablesTableComponent({
       <Table
         loading={loading}
         dataSource={dataSource}
-        pagination={{ position: "top", pageSize: 50 }}
+        pagination={{ position: "top", pageSize: pageLimit }}
         columns={columns}
         rowKey="id"
         onChange={handleTableChange}

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

@@ -15,6 +15,7 @@ import PaymentExportButton from "../payment-export-button/payment-export-button.
 import PaymentMarkSelectedExported from "../payment-mark-selected-exported/payment-mark-selected-exported.component";
 import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -209,7 +210,7 @@ export function AccountingPayablesTableComponent({
       <Table
         loading={loading}
         dataSource={dataSource}
-        pagination={{ position: "top", pageSize: 50 }}
+        pagination={{ position: "top", pageSize: pageLimit }}
         columns={columns}
         rowKey="id"
         onChange={handleTableChange}

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

@@ -4,6 +4,7 @@ import { alphaSort } from "../../utils/sorters";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { useTranslation } from "react-i18next";
 import AuditTrailValuesComponent from "../audit-trail-values/audit-trail-values.component";
+import {pageLimit} from "../../utils/config";
 
 export default function AuditTrailListComponent({ loading, data }) {
   const [state, setState] = useState({
@@ -74,7 +75,7 @@ export default function AuditTrailListComponent({ loading, data }) {
     <Table
       {...formItemLayout}
       loading={loading}
-      pagination={{ position: "top", defaultPageSize: 25 }}
+      pagination={{ position: "top", defaultPageSize: pageLimit }}
       columns={columns}
       rowKey="id"
       dataSource={data}

client/src/components/audit-trail-list/email-audit-trail-list.component.jsx

@@ -3,6 +3,7 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
+import {pageLimit} from "../../utils/config";
 
 export default function EmailAuditTrailListComponent({ loading, data }) {
   const [state, setState] = useState({
@@ -53,7 +54,7 @@ export default function EmailAuditTrailListComponent({ loading, data }) {
     <Table
       {...formItemLayout}
       loading={loading}
-      pagination={{ position: "top", defaultPageSize: 25 }}
+      pagination={{ position: "top", defaultPageSize: pageLimit }}
       columns={columns}
       rowKey="id"
       dataSource={data}

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

@@ -10,7 +10,7 @@ import { createStructuredSelector } from "reselect";
 import {
   DELETE_BILL_LINE,
   INSERT_NEW_BILL_LINES,
-  UPDATE_BILL_LINE
+  UPDATE_BILL_LINE,
 } from "../../graphql/bill-lines.queries";
 import { QUERY_BILL_BY_PK, UPDATE_BILL } from "../../graphql/bills.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
@@ -20,6 +20,7 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import AlertComponent from "../alert/alert.component";
 import BillFormContainer from "../bill-form/bill-form.container";
 import BillMarkExportedButton from "../bill-mark-exported-button/bill-mark-exported-button.component";
+import BillPrintButton from "../bill-print-button/bill-print-button.component";
 import BillReeportButtonComponent from "../bill-reexport-button/bill-reexport-button.component";
 import JobDocumentsGallery from "../jobs-documents-gallery/jobs-documents-gallery.container";
 import JobsDocumentsLocalGallery from "../jobs-documents-local-gallery/jobs-documents-local-gallery.container";
@@ -176,7 +177,7 @@ export function BillDetailEditcontainer({
             extra={
               <Space>
                 <BillDetailEditReturn data={data} />
-
+                <BillPrintButton billid={search.billid} />
                 <Popconfirm
                   visible={visible}
                   onConfirm={() => form.submit()}

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

@@ -79,6 +79,20 @@ export function BillFormComponent({
       });
   };
 
+  const handleFederalTaxExemptSwitchToggle = (checked) => {
+    // Early gate
+    if (!checked) return;
+    const values = form.getFieldsValue("billlines");
+    // Gate bill lines
+    if (!values?.billlines?.length) return;
+
+    const billlines = values.billlines.map((b) => {
+      b.applicable_taxes.federal = false;
+      return b;
+    });
+    form.setFieldsValue({ billlines });
+  };
+
   useEffect(() => {
     if (job) form.validateFields(["is_credit_memo"]);
   }, [job, form]);
@@ -387,7 +401,16 @@ export function BillFormComponent({
         >
           <CurrencyInput min={0} />
         </Form.Item>
-        <Form.Item shouldUpdate span={15}>
+        {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
+          <Form.Item
+            span={2}
+            label={t("bills.labels.federal_tax_exempt")}
+            name="federal_tax_exempt"
+          >
+            <Switch onChange={handleFederalTaxExemptSwitchToggle} />
+          </Form.Item>
+        ) : null}
+        <Form.Item shouldUpdate span={13}>
           {() => {
             const values = form.getFieldsValue([
               "billlines",
@@ -405,7 +428,7 @@ export function BillFormComponent({
               totals = CalculateBillTotal(values);
             if (!!totals)
               return (
-                <div>
+                <div align="right">
                   <Space wrap>
                     <Statistic
                       title={t("bills.labels.subtotal")}

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

@@ -1,14 +1,15 @@
 import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import {
-  Button, Form,
+  Button,
+  Form,
   Input,
   InputNumber,
   Select,
   Space,
   Switch,
   Table,
-  Tooltip
+  Tooltip,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -466,7 +467,8 @@ export function BillEnterModalLinesComponent({
           return {
             key: `${field.index}fedtax`,
             valuePropName: "checked",
-            initialValue: true,
+            initialValue:
+              form.getFieldValue("federal_tax_exempt") === true ? false : true,
             name: [field.name, "applicable_taxes", "federal"],
           };
         },

client/src/components/bill-print-button/bill-print-button.component.jsx

@@ -0,0 +1,38 @@
+import { Button, Space } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
+
+export default function BillPrintButton({ billid }) {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+  const Templates = TemplateList("job_special");
+
+  const submitHandler = async () => {
+    setLoading(true);
+    try {
+      await GenerateDocument(
+        {
+          name: Templates.parts_invoice_label_single.key,
+          variables: {
+            id: billid,
+          },
+        },
+        {},
+        "p"
+      );
+    } catch (e) {
+      console.warn("Warning: Error generating a document.");
+    }
+    setLoading(false);
+  };
+
+  return (
+    <Space wrap>
+      <Button loading={loading} onClick={submitHandler}>
+        {t("bills.labels.printlabels")}
+      </Button>
+    </Space>
+  );
+}

client/src/components/chat-conversation-title/chat-conversation-title.component.jsx

@@ -4,6 +4,7 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import ChatArchiveButton from "../chat-archive-button/chat-archive-button.component";
 import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conversation-title-tags.component";
 import ChatLabelComponent from "../chat-label/chat-label.component";
+import ChatPrintButton from "../chat-print-button/chat-print-button.component";
 import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container";
 
 export default function ChatConversationTitle({ conversation }) {
@@ -13,6 +14,7 @@ export default function ChatConversationTitle({ conversation }) {
         {conversation && conversation.phone_num}
       </PhoneNumberFormatter>
       <ChatLabelComponent conversation={conversation} />
+      <ChatPrintButton conversation={conversation} />
       <ChatConversationTitleTags
         jobConversations={
           (conversation && conversation.job_conversations) || []

client/src/components/chat-popup/chat-popup.component.jsx

@@ -132,7 +132,7 @@ export function ChatPopupComponent({
             onClick={() => toggleChatVisible()}
             style={{ cursor: "pointer" }}
           >
-            <MessageOutlined />
+            <MessageOutlined className="chat-popup-info-icon" />
             <strong>{t("messaging.labels.messaging")}</strong>
           </div>
         )}

client/src/components/chat-popup/chat-popup.styles.scss

@@ -13,6 +13,9 @@
     height: 100%;
   }
 }
+.chat-popup-info-icon {
+  margin-right: 5px;
+}
 
 @media only screen and (min-width: 992px) {
   .chat-popup {

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

@@ -0,0 +1,59 @@
+import { MailOutlined, PrinterOutlined } from "@ant-design/icons";
+import { Space, Spin } from "antd";
+import React, { useState } from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { setEmailOptions } from "../../redux/email/email.actions";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
+
+const mapStateToProps = createStructuredSelector({});
+
+const mapDispatchToProps = (dispatch) => ({
+  setEmailOptions: (e) => dispatch(setEmailOptions(e)),
+});
+
+export function ChatPrintButton({ conversation }) {
+  const [loading, setLoading] = useState(false);
+
+  return (
+    <Space wrap>
+      <PrinterOutlined
+        onClick={() => {
+          setLoading(true);
+          GenerateDocument(
+            {
+              name: TemplateList("messaging").conversation_list.key,
+              variables: { id: conversation.id },
+            },
+            {
+              subject: TemplateList("messaging").conversation_list.subject,
+            },
+            "p",
+            conversation.id
+          );
+          setLoading(false);
+        }}
+      />
+      <MailOutlined
+        onClick={() => {
+          setLoading(true);
+          GenerateDocument(
+            {
+              name: TemplateList("messaging").conversation_list.key,
+              variables: { id: conversation.id },
+            },
+            {
+              subject: TemplateList("messaging").conversation_list.subject,
+            },
+            "e",
+            conversation.id
+          );
+          setLoading(false);
+        }}
+      />
+      {loading && <Spin />}
+    </Space>
+  );
+}
+export default connect(mapStateToProps, mapDispatchToProps)(ChatPrintButton);

client/src/components/contract-cars/contract-cars.component.jsx

@@ -35,6 +35,15 @@ export default function ContractsCarsComponent({
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => <div>{t(record.status)}</div>,
     },
+    {
+      title: t("courtesycars.fields.readiness"),
+      dataIndex: "readiness",
+      key: "readiness",
+      sorter: (a, b) => alphaSort(a.readiness, b.readiness),
+      sortOrder:
+        state.sortedInfo.columnKey === "readiness" && state.sortedInfo.order,
+      render: (text, record) => t(record.readiness),
+    },
     {
       title: t("courtesycars.fields.year"),
       dataIndex: "year",

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

@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import {pageLimit} from "../../utils/config";
 
 export default function ContractsJobsComponent({
   loading,
@@ -175,7 +176,7 @@ export default function ContractsJobsComponent({
         loading={loading}
         pagination={{
           position: "top",
-          defaultPageSize: 10,
+          defaultPageSize: pageLimit,
           defaultCurrent: defaultCurrent,
         }}
         columns={columns}

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

@@ -13,6 +13,7 @@ import moment from "moment";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -209,7 +210,7 @@ export function ContractsList({
         }}
         pagination={{
           position: "top",
-          pageSize: 25,
+          pageSize: pageLimit,
           current: parseInt(page || 1),
           total: total,
         }}

client/src/components/courtesy-car-contract-list/courtesy-car-contract-list.component.jsx

@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
+import {pageLimit} from "../../utils/config";
 
 export default function CourtesyCarContractListComponent({
   contracts,
@@ -89,7 +90,7 @@ export default function CourtesyCarContractListComponent({
         scroll={{ x: true }}
         pagination={{
           position: "top",
-          pageSize: 25,
+          pageSize: pageLimit,
           current: parseInt(page || 1),
           total: totalContracts,
         }}

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

@@ -7,6 +7,7 @@ import { useTranslation } from "react-i18next";
 import { CHECK_CC_FLEET_NUMBER } from "../../graphql/courtesy-car.queries";
 import { DateFormatter } from "../../utils/DateFormatter";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
+import CourtesyCarReadiness from "../courtesy-car-readiness-select/courtesy-car-readiness-select.component";
 import CourtesyCarStatus from "../courtesy-car-status-select/courtesy-car-status-select.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 //import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
@@ -213,6 +214,9 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         >
           <CourtesyCarStatus />
         </Form.Item>
+        <Form.Item label={t("courtesycars.fields.readiness")} name="readiness">
+          <CourtesyCarReadiness />
+        </Form.Item>
         <div>
           <Form.Item
             label={t("courtesycars.fields.nextservicekm")}
@@ -227,9 +231,9 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           >
             {() => {
               const nextservicekm = form.getFieldValue("nextservicekm");
-              const mileageOver =
-                nextservicekm <= form.getFieldValue("mileage");
-
+              const mileageOver = nextservicekm
+                ? nextservicekm <= form.getFieldValue("mileage")
+                : false;
               if (mileageOver)
                 return (
                   <Space direction="vertical" style={{ color: "tomato" }}>

client/src/components/courtesy-car-fuel-select/courtesy-car-fuel-select.component.jsx

@@ -34,6 +34,32 @@ const CourtesyCarFuelComponent = (props, ref) => {
       step={null}
       style={{ marginLeft: "2rem", marginRight: "2rem" }}
       {...props}
+      tooltip={{
+        formatter: (value) => {
+          switch (value) {
+            case 0:
+              return t("courtesycars.labels.fuel.empty");
+            case 13:
+              return t("courtesycars.labels.fuel.18");
+            case 25:
+              return t("courtesycars.labels.fuel.14");
+            case 38:
+              return t("courtesycars.labels.fuel.38");
+            case 50:
+              return t("courtesycars.labels.fuel.12");
+            case 63:
+              return t("courtesycars.labels.fuel.58");
+            case 75:
+              return t("courtesycars.labels.fuel.34");
+            case 88:
+              return t("courtesycars.labels.fuel.78");
+            case 100:
+              return t("courtesycars.labels.fuel.full");
+            default:
+              return value;
+          }
+        },
+      }}
     />
   );
 };

client/src/components/courtesy-car-readiness-select/courtesy-car-readiness-select.component.jsx

@@ -0,0 +1,35 @@
+import { Select } from "antd";
+import React, { forwardRef, useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+const { Option } = Select;
+
+const CourtesyCarReadinessComponent = ({ value, onChange }, ref) => {
+  const [option, setOption] = useState(value);
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    if (value !== option && onChange) {
+      onChange(option);
+    }
+  }, [value, option, onChange]);
+
+  return (
+    <Select
+      allowClear
+      ref={ref}
+      value={option}
+      style={{
+        width: 100,
+      }}
+      onChange={setOption}
+    >
+      <Option value="courtesycars.readiness.ready">
+        {t("courtesycars.readiness.ready")}
+      </Option>
+      <Option value="courtesycars.readiness.notready">
+        {t("courtesycars.readiness.notready")}
+      </Option>
+    </Select>
+  );
+};
+export default forwardRef(CourtesyCarReadinessComponent);

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

@@ -74,10 +74,11 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       render: (text, record) => {
         const { nextservicedate, nextservicekm, mileage } = record;
 
-        const mileageOver = nextservicekm <= mileage;
+        const mileageOver = nextservicekm ? nextservicekm <= mileage : false;
 
         const dueForService =
-          nextservicedate && moment(nextservicedate).isBefore(moment());
+          nextservicedate &&
+          moment(nextservicedate).endOf("day").isSameOrBefore(moment());
 
         return (
           <Space>
@@ -91,6 +92,26 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
         );
       },
     },
+    {
+      title: t("courtesycars.fields.readiness"),
+      dataIndex: "readiness",
+      key: "readiness",
+      sorter: (a, b) => alphaSort(a.readiness, b.readiness),
+      filters: [
+        {
+          text: t("courtesycars.readiness.ready"),
+          value: "courtesycars.readiness.ready",
+        },
+        {
+          text: t("courtesycars.readiness.notready"),
+          value: "courtesycars.readiness.notready",
+        },
+      ],
+      onFilter: (value, record) => value.includes(record.readiness),
+      sortOrder:
+        state.sortedInfo.columnKey === "readiness" && state.sortedInfo.order,
+      render: (text, record) => t(record.readiness),
+    },
     {
       title: t("courtesycars.fields.year"),
       dataIndex: "year",
@@ -131,6 +152,36 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       sortOrder:
         state.sortedInfo.columnKey === "plate" && state.sortedInfo.order,
     },
+    {
+      title: t("courtesycars.fields.fuel"),
+      dataIndex: "fuel",
+      key: "fuel",
+      sorter: (a, b) => alphaSort(a.fuel, b.fuel),
+      sortOrder:
+        state.sortedInfo.columnKey === "fuel" && state.sortedInfo.order,
+      render: (text, record) => {
+        switch (record.fuel) {
+          case 100:
+            return t("courtesycars.labels.fuel.full");
+          case 88:
+            return t("courtesycars.labels.fuel.78");
+          case 63:
+            return t("courtesycars.labels.fuel.58");
+          case 50:
+            return t("courtesycars.labels.fuel.12");
+          case 38:
+            return t("courtesycars.labels.fuel.34");
+          case 25:
+            return t("courtesycars.labels.fuel.14");
+          case 13:
+            return t("courtesycars.labels.fuel.18");
+          case 0:
+            return t("courtesycars.labels.fuel.empty");
+          default:
+            return record.fuel;
+        }
+      },
+    },
     {
       title: t("courtesycars.labels.outwith"),
       dataIndex: "outwith",

client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx

@@ -7,6 +7,7 @@ import { Link, useHistory, useLocation } from "react-router-dom";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import {pageLimit} from "../../utils/config";
 
 export default function CsiResponseListPaginated({
   refetch,
@@ -106,7 +107,7 @@ export default function CsiResponseListPaginated({
         loading={loading}
         pagination={{
           position: "top",
-          pageSize: 25,
+          pageSize: pageLimit,
           current: parseInt(page || 1),
           total: total,
         }}

client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx

@@ -6,6 +6,7 @@ import { alphaSort } from "../../../utils/sorters";
 import LoadingSkeleton from "../../loading-skeleton/loading-skeleton.component";
 import Dinero from "dinero.js";
 import DashboardRefreshRequired from "../refresh-required.component";
+import {pageLimit} from "../../../utils/config";
 
 export default function DashboardMonthlyJobCosting({ data, ...cardProps }) {
   const { t } = useTranslation();
@@ -118,7 +119,7 @@ export default function DashboardMonthlyJobCosting({ data, ...cardProps }) {
         <div style={{ height: "100%" }}>
           <Table
             onChange={handleTableChange}
-            pagination={{ position: "top", defaultPageSize: 50 }}
+            pagination={{ position: "top", defaultPageSize: pageLimit }}
             columns={columns}
             scroll={{ x: true, y: "calc(100% - 4em)" }}
             rowKey="id"

client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx

@@ -11,6 +11,7 @@ import { Link } from "react-router-dom";
 import ChatOpenButton from "../../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../../owner-name-display/owner-name-display.component";
 import DashboardRefreshRequired from "../refresh-required.component";
+import {pageLimit} from "../../../utils/config";
 
 export default function DashboardScheduledInToday({ data, ...cardProps }) {
   const { t } = useTranslation();
@@ -195,7 +196,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
       <div style={{ height: "100%" }}>
         <Table
           onChange={handleTableChange}
-          pagination={{ position: "top", defaultPageSize: 50 }}
+          pagination={{ position: "top", defaultPageSize: pageLimit }}
           columns={columns}
           scroll={{ x: true, y: "calc(100% - 2em)" }}
           rowKey="id"

client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx

@@ -11,6 +11,7 @@ import { Link } from "react-router-dom";
 import ChatOpenButton from "../../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../../owner-name-display/owner-name-display.component";
 import DashboardRefreshRequired from "../refresh-required.component";
+import {pageLimit} from "../../../utils/config";
 
 export default function DashboardScheduledOutToday({ data, ...cardProps }) {
   const { t } = useTranslation();
@@ -165,7 +166,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
       <div style={{ height: "100%" }}>
         <Table
           onChange={handleTableChange}
-          pagination={{ position: "top", defaultPageSize: 50 }}
+          pagination={{ position: "top", defaultPageSize: pageLimit }}
           columns={columns}
           scroll={{ x: true, y: "calc(100% - 2em)" }}
           rowKey="id"

client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx

@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -117,7 +118,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
       }
     >
       <Table
-        pagination={{ position: "top", defaultPageSize: 50 }}
+        pagination={{ position: "top", defaultPageSize: pageLimit }}
         columns={columns}
         rowKey={(record) => `${record.InvoiceNumber}${record.Account}`}
         dataSource={allocationsSummary}

client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx

@@ -6,6 +6,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import Dinero from "dinero.js";
 import { SyncOutlined } from "@ant-design/icons";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -94,7 +95,7 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
         <Alert type="warning" message={t("jobs.labels.dms.disablebillwip")} />
       )}
       <Table
-        pagination={{ position: "top", defaultPageSize: 50 }}
+        pagination={{ position: "top", defaultPageSize: pageLimit }}
         columns={columns}
         rowKey="center"
         dataSource={allocationsSummary}

client/src/components/form-date-picker/form-date-picker.component.jsx

@@ -65,8 +65,17 @@ export function FormDatePicker({
       });
     }
 
-    if (_a.isValid() && onChange)
-      onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
+    if (_a.isValid() && onChange) {
+      if (onlyFuture) {
+        if (moment().subtract(1, "day").isBefore(_a)) {
+          onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
+        } else {
+          onChange(isDateOnly ? moment().format("YYYY-MM-DD") : moment());
+        }
+      } else {
+        onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
+      }
+    }
   };
 
   return (

client/src/components/form-date-time-picker/form-date-time-picker.component.jsx

@@ -1,9 +1,9 @@
 import React, { forwardRef } from "react";
 //import DatePicker from "react-datepicker";
 //import "react-datepicker/src/stylesheets/datepicker.scss";
-import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import { TimePicker } from "antd";
 import moment from "moment";
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
 //To be used as a form element only.
 
 const DateTimePicker = (
@@ -26,20 +26,21 @@ const DateTimePicker = (
         value={value}
         onBlur={onBlur}
         onChange={onChange}
+        onlyFuture={onlyFuture}
         isDateOnly={false}
       />
 
       <TimePicker
-      value={value ? moment(value) : null}
-      {...(onlyFuture && {
-        disabledDate: (d) => moment().isAfter(d),
-      })}
-      onChange={onChange}
-      showSecond={false}
-      minuteStep={15}
-      onBlur={onBlur}
-      format="hh:mm a"
-      {...restProps}
+        value={value ? moment(value) : null}
+        {...(onlyFuture && {
+          disabledDate: (d) => moment().isAfter(d),
+        })}
+        onChange={onChange}
+        showSecond={false}
+        minuteStep={15}
+        onBlur={onBlur}
+        format="hh:mm a"
+        {...restProps}
       />
     </div>
   );

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

@@ -11,6 +11,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import InventoryBillRo from "../inventory-bill-ro/inventory-bill-ro.component";
 import InventoryLineDelete from "../inventory-line-delete/inventory-line-delete.component";
+import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
@@ -213,7 +214,7 @@ export function JobsList({
         loading={loading}
         pagination={{
           position: "top",
-          pageSize: 25,
+          pageSize: pageLimit,
           current: parseInt(page || 1),
           total: total,
         }}

client/src/components/inventory-list/inventory-list.container.jsx

@@ -11,6 +11,7 @@ import {
 } from "../../redux/application/application.actions";
 import AlertComponent from "../alert/alert.component";
 import InventoryListPaginated from "./inventory-list.component";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   //bodyshop: selectBodyshop,
@@ -32,8 +33,8 @@ export function InventoryList({ setBreadcrumbs, setSelectedHeader }) {
       nextFetchPolicy: "network-only",
       variables: {
         search: search || "",
-        offset: page ? (page - 1) * 25 : 0,
-        limit: 25,
+        offset: page ? (page - 1) * pageLimit : 0,
+        limit: pageLimit,
         consumedIsNull: showall === "true" ? null : true,
         order: [
           {

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

@@ -3,6 +3,7 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
 import Dinero from "dinero.js";
+import {pageLimit} from "../../utils/config";
 export default function JobCostingPartsTable({ data, summaryData }) {
   const [searchText, setSearchText] = useState("");
   const [state, setState] = useState({
@@ -98,7 +99,7 @@ export default function JobCostingPartsTable({ data, summaryData }) {
           x: "50%", //y: "40rem"
         }}
         onChange={handleTableChange}
-        pagination={{ position: "top", defaultPageSize: 50 }}
+        pagination={{ position: "top", defaultPageSize: pageLimit }}
         columns={columns}
         rowKey="id"
         dataSource={filteredData}

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

@@ -1,6 +1,6 @@
-import { GET_ALL_JOBLINES_BY_PK } from "../../graphql/jobs-lines.queries";
 import { gql } from "@apollo/client";
 import _ from "lodash";
+import { GET_ALL_JOBLINES_BY_PK } from "../../graphql/jobs-lines.queries";
 
 export const GetSupplementDelta = async (client, jobId, newLines) => {
   const {
@@ -50,7 +50,7 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
     .reduce((acc, value, idx) => {
       return acc + generateRemoveQuery(value, idx);
     }, "");
-  console.log(insertQueries, updateQueries, removeQueries);
+  //console.log(insertQueries, updateQueries, removeQueries);
 
   if ((insertQueries + updateQueries + removeQueries).trim() === "") {
     return new Promise((resolve, reject) => {

client/src/components/jobs-available-table/jobs-available-supplement.headerfields.js

@@ -114,7 +114,7 @@ const headerFields = [
   "ins_ct_ph",
   "ins_ct_phx",
   "loss_cat",
-  //ad2
+  //AD2
   "clmt_ln",
   "clmt_fn",
   "clmt_title",
@@ -219,7 +219,16 @@ const headerFields = [
   "loc_title",
   "loc_ph",
   "loc_phx",
-  "loc_ea"
+  "loc_ea",
+  //VEH
+  "plate_no",
+  "plate_st",
+  "v_vin",
+  "v_model_yr",
+  "v_make_desc",
+  "v_model_desc",
+  "v_options",
+  "v_color",
 ];
 
 export default headerFields;

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

@@ -108,6 +108,14 @@ export function JobsDetailHeaderActions({
         },
       },
     });
+    insertAuditTrail({
+      jobid: job.id,
+      operation: AuditTrailMapping.alertToggle(
+        !!job.production_vars && !!job.production_vars.alert
+          ? !job.production_vars.alert
+          : true
+      ),
+    });
   };
 
   const handleSuspend = (e) => {

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

@@ -1,8 +1,8 @@
 import {
+  BranchesOutlined,
   ExclamationCircleFilled,
   PauseCircleOutlined,
   WarningFilled,
-  BranchesOutlined,
 } from "@ant-design/icons";
 import { Card, Col, Row, Space, Tag, Tooltip } from "antd";
 import React, { useState } from "react";
@@ -221,6 +221,14 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               <VehicleVinDisplay>
                 {`${job.v_vin || t("general.labels.na")}`}
               </VehicleVinDisplay>
+              {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
+                job.v_vin?.length !== 17 ? (
+                  <WarningFilled style={{ color: "tomato", marginLeft: ".3rem" }} />
+                ) : null
+              ) : null}
+            </DataLabel>
+            <DataLabel label={t("jobs.fields.regie_number")}>
+              {job.regie_number || t("general.labels.na")}
             </DataLabel>
             <DataLabel label={t("jobs.labels.relatedros")}>
               <JobsRelatedRos jobid={job.id} job={job} />

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

@@ -12,6 +12,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
@@ -33,17 +34,14 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-
       sorter: true, //(a, b) => alphaSort(a.ro_number, b.ro_number),
       sortOrder: sortcolumn === "ro_number" && sortorder,
-
       render: (text, record) => (
         <Link to={"/manage/jobs/" + record.id}>
           {record.ro_number || t("general.labels.na")}
         </Link>
       ),
     },
-
     {
       title: t("jobs.fields.owner"),
       dataIndex: "ownr_ln",
@@ -125,7 +123,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("vehicles.fields.plate_no"),
       dataIndex: "plate_no",
       key: "plate_no",
-
       ellipsis: true,
       sorter: true, //(a, b) => alphaSort(a.plate_no, b.plate_no),
       sortOrder: sortcolumn === "plate_no" && sortorder,
@@ -137,7 +134,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.clm_no"),
       dataIndex: "clm_no",
       key: "clm_no",
-
       ellipsis: true,
       sorter: true, //(a, b) => alphaSort(a.clm_no, b.clm_no),
       sortOrder: sortcolumn === "clm_no" && sortorder,
@@ -259,11 +255,11 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
         pagination={
           search?.search
             ? {
-                pageSize: 25,
+                pageSize: pageLimit,
                 showSizeChanger: false,
               }
             : {
-                pageSize: 25,
+                pageSize: pageLimit,
                 current: parseInt(page || 1),
                 total: total,
                 showSizeChanger: false,

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

@@ -1,8 +1,8 @@
 import {
-  SyncOutlined,
-  ExclamationCircleFilled,
-  PauseCircleOutlined,
-  BranchesOutlined,
+    SyncOutlined,
+    ExclamationCircleFilled,
+    PauseCircleOutlined,
+    BranchesOutlined,
 } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
 import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
@@ -22,374 +22,374 @@ import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
+    bodyshop: selectBodyshop,
 });
 
 export function JobsList({ bodyshop }) {
-  const searchParams = queryString.parse(useLocation().search);
-  const { selected } = searchParams;
-  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
-    .filter((screen) => !!screen[1])
-    .slice(-1)[0];
-  const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
-    variables: {
-      statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
-    },
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-  });
+    const searchParams = queryString.parse(useLocation().search);
+    const { selected } = searchParams;
+    const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+        .filter((screen) => !!screen[1])
+        .slice(-1)[0];
+    const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
+        variables: {
+            statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
+        },
+        fetchPolicy: "network-only",
+        nextFetchPolicy: "network-only",
+    });
 
-  const [state, setState] = useState({
-    sortedInfo: {},
-    filteredInfo: { text: "" },
-  });
+    const [state, setState] = useState({
+        sortedInfo: {},
+        filteredInfo: { text: "" },
+    });
 
-  const { t } = useTranslation();
-  const history = useHistory();
-  const [searchText, setSearchText] = useState("");
+    const { t } = useTranslation();
+    const history = useHistory();
+    const [searchText, setSearchText] = useState("");
 
-  if (error) return <AlertComponent message={error.message} type="error" />;
+    if (error) return <AlertComponent message={error.message} type="error" />;
 
-  const jobs = data
-    ? searchText === ""
-      ? data.jobs
-      : data.jobs.filter(
-          (j) =>
-            (j.ro_number || "")
-              .toString()
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.ownr_co_nm || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.comments || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.ownr_fn || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.ownr_ln || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.clm_no || "").toLowerCase().includes(searchText.toLowerCase()) ||
-            (j.plate_no || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.v_model_desc || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.est_ct_fn || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.est_ct_ln || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase()) ||
-            (j.v_make_desc || "")
-              .toLowerCase()
-              .includes(searchText.toLowerCase())
-        )
-    : [];
+    const jobs = data
+        ? searchText === ""
+            ? data.jobs
+            : data.jobs.filter(
+                (j) =>
+                    (j.ro_number || "")
+                        .toString()
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.ownr_co_nm || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.comments || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.ownr_fn || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.ownr_ln || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.clm_no || "").toLowerCase().includes(searchText.toLowerCase()) ||
+                    (j.plate_no || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.v_model_desc || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.est_ct_fn || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.est_ct_ln || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.v_make_desc || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase())
+            )
+        : [];
 
-  const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
-  };
+    const handleTableChange = (pagination, filters, sorter) => {
+        setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    };
 
-  const handleOnRowClick = (record) => {
-    if (record) {
-      if (record.id) {
-        history.push({
-          search: queryString.stringify({
-            ...searchParams,
-            selected: record.id,
-          }),
-        });
-      }
-    }
-  };
+    const handleOnRowClick = (record) => {
+        if (record) {
+            if (record.id) {
+                history.push({
+                    search: queryString.stringify({
+                        ...searchParams,
+                        selected: record.id,
+                    }),
+                });
+            }
+        }
+    };
 
-  const columns = [
-    {
-      title: t("jobs.fields.ro_number"),
-      dataIndex: "ro_number",
-      key: "ro_number",
-      sorter: (a, b) =>
-        parseInt((a.ro_number || "0").replace(/\D/g, "")) -
-        parseInt((b.ro_number || "0").replace(/\D/g, "")),
-      sortOrder:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+    const columns = [
+        {
+            title: t("jobs.fields.ro_number"),
+            dataIndex: "ro_number",
+            key: "ro_number",
+            sorter: (a, b) =>
+                parseInt((a.ro_number || "0").replace(/\D/g, "")) -
+                parseInt((b.ro_number || "0").replace(/\D/g, "")),
+            sortOrder:
+                state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
 
-      render: (text, record) => (
-        <Link
-          to={"/manage/jobs/" + record.id}
-          onClick={(e) => e.stopPropagation()}
-        >
-          <Space>
-            {record.ro_number || t("general.labels.na")}
-            {record.production_vars && record.production_vars.alert ? (
-              <ExclamationCircleFilled className="production-alert" />
-            ) : null}
-            {record.suspended && (
-              <PauseCircleOutlined style={{ color: "orangered" }} />
-            )}
-            {record.iouparent && (
-              <Tooltip title={t("jobs.labels.iou")}>
-                <BranchesOutlined style={{ color: "orangered" }} />
-              </Tooltip>
-            )}
-          </Space>
-        </Link>
-      ),
-    },
-    {
-      title: t("jobs.fields.owner"),
-      dataIndex: "owner",
-      key: "owner",
-      ellipsis: true,
+            render: (text, record) => (
+                <Link
+                    to={"/manage/jobs/" + record.id}
+                    onClick={(e) => e.stopPropagation()}
+                >
+                    <Space>
+                        {record.ro_number || t("general.labels.na")}
+                        {record.production_vars && record.production_vars.alert ? (
+                            <ExclamationCircleFilled className="production-alert" />
+                        ) : null}
+                        {record.suspended && (
+                            <PauseCircleOutlined style={{ color: "orangered" }} />
+                        )}
+                        {record.iouparent && (
+                            <Tooltip title={t("jobs.labels.iou")}>
+                                <BranchesOutlined style={{ color: "orangered" }} />
+                            </Tooltip>
+                        )}
+                    </Space>
+                </Link>
+            ),
+        },
+        {
+            title: t("jobs.fields.owner"),
+            dataIndex: "owner",
+            key: "owner",
+            ellipsis: true,
 
-      responsive: ["md"],
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
-      sortOrder:
-        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
-      render: (text, record) => {
-        return record.ownerid ? (
-          <Link
-            to={"/manage/owners/" + record.ownerid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            <OwnerNameDisplay ownerObject={record} />
-          </Link>
-        ) : (
-          <span>
+            responsive: ["md"],
+            sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+            sortOrder:
+                state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
+            render: (text, record) => {
+                return record.ownerid ? (
+                    <Link
+                        to={"/manage/owners/" + record.ownerid}
+                        onClick={(e) => e.stopPropagation()}
+                    >
+                        <OwnerNameDisplay ownerObject={record} />
+                    </Link>
+                ) : (
+                    <span>
             <OwnerNameDisplay ownerObject={record} />
           </span>
-        );
-      },
-    },
-    {
-      title: t("jobs.fields.ownr_ph1"),
-      dataIndex: "ownr_ph1",
-      key: "ownr_ph1",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
-      ),
-    },
-    {
-      title: t("jobs.fields.ownr_ph2"),
-      dataIndex: "ownr_ph2",
-      key: "ownr_ph2",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
-      ),
-    },
-
-    {
-      title: t("jobs.fields.status"),
-      dataIndex: "status",
-      key: "status",
-      ellipsis: true,
-
-      sorter: (a, b) => alphaSort(a.status, b.status),
-      sortOrder:
-        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
-      filters:
-        (jobs &&
-          jobs
-            .map((j) => j.status)
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "No Status*",
-                value: [s],
-              };
-            })) ||
-        [],
-      onFilter: (value, record) => value.includes(record.status),
-    },
-
-    {
-      title: t("jobs.fields.vehicle"),
-      dataIndex: "vehicle",
-      key: "vehicle",
-      ellipsis: true,
-      render: (text, record) => {
-        return record.vehicleid ? (
-          <Link
-            to={"/manage/vehicles/" + record.vehicleid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-              record.v_model_desc || ""
-            }`}
-          </Link>
-        ) : (
-          <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-            record.v_model_desc || ""
-          }`}</span>
-        );
-      },
-    },
-    {
-      title: t("vehicles.fields.plate_no"),
-      dataIndex: "plate_no",
-      key: "plate_no",
-      ellipsis: true,
-
-      responsive: ["md"],
-      sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
-      sortOrder:
-        state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
-    },
-    {
-      title: t("jobs.fields.clm_no"),
-      dataIndex: "clm_no",
-      key: "clm_no",
-      ellipsis: true,
-      responsive: ["md"],
-      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
-      sortOrder:
-        state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
-      render: (text, record) =>
-        `${record.clm_no || ""}${
-          record.po_number ? ` (PO: ${record.po_number})` : ""
-        }`,
-    },
-    {
-      title: t("jobs.fields.ins_co_nm"),
-      dataIndex: "ins_co_nm",
-      key: "ins_co_nm",
-      ellipsis: true,
-      filters:
-        (jobs &&
-          jobs
-            .map((j) => j.ins_co_nm)
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s,
-                value: [s],
-              };
-            })) ||
-        [],
-      onFilter: (value, record) => value.includes(record.ins_co_nm),
-      responsive: ["md"],
-    },
-    {
-      title: t("jobs.fields.clm_total"),
-      dataIndex: "clm_total",
-      key: "clm_total",
-      responsive: ["md"],
-      ellipsis: true,
-
-      sorter: (a, b) => a.clm_total - b.clm_total,
-      sortOrder:
-        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
-      render: (text, record) => (
-        <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
-      ),
-    },
-    {
-      title: t("jobs.labels.estimator"),
-      dataIndex: "jobs.labels.estimator",
-      key: "jobs.labels.estimator",
-      ellipsis: true,
-      responsive: ["xl"],
-      filterSearch: true,
-      filters:
-        (jobs &&
-          jobs
-            .map((j) => `${j.est_ct_fn || ""} ${j.est_ct_ln || ""}`.trim())
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "N/A",
-                value: [s],
-              };
-            })) ||
-        [],
-      onFilter: (value, record) =>
-        value.includes(
-          `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim()
-        ),
-      render: (text, record) =>
-        `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim(),
-    },
-    {
-      title: t("jobs.fields.comment"),
-      dataIndex: "comment",
-      key: "comment",
-      ellipsis: true,
-      responsive: ["md"],
-    },
-    // {
-    //   title: t("jobs.fields.owner_owing"),
-    //   dataIndex: "owner_owing",
-    //   key: "owner_owing",
-    //   responsive: ["md"],
-    //   render: (text, record) => (
-    //     <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
-    //   ),
-    // },
-  ];
-
-  const scrollMapper = {
-    xs: true,
-    sm: true,
-    md: true,
-    lg: "100%",
-    xl: "100%",
-    xxl: "100%",
-  };
-
-  return (
-    <Card
-      title={t("titles.bc.jobs-active")}
-      extra={
-        <Space wrap>
-          <Button onClick={() => refetch()}>
-            <SyncOutlined />
-          </Button>
-          <Input.Search
-            placeholder={t("general.labels.search")}
-            onChange={(e) => {
-              setSearchText(e.target.value);
-            }}
-            value={searchText}
-            enterButton
-          />
-        </Space>
-      }
-    >
-      <Table
-        loading={loading}
-        pagination={{ defaultPageSize: 50 }}
-        columns={columns}
-        rowKey="id"
-        dataSource={jobs}
-        scroll={{
-          x: selectedBreakpoint ? scrollMapper[selectedBreakpoint[0]] : "100%",
-        }}
-        rowSelection={{
-          onSelect: (record) => {
-            handleOnRowClick(record);
-          },
-          selectedRowKeys: [selected],
-          type: "radio",
-        }}
-        onChange={handleTableChange}
-        onRow={(record, rowIndex) => {
-          return {
-            onClick: (event) => {
-              handleOnRowClick(record);
+                );
             },
-          };
-        }}
-      />
-    </Card>
-  );
+        },
+        {
+            title: t("jobs.fields.ownr_ph1"),
+            dataIndex: "ownr_ph1",
+            key: "ownr_ph1",
+            ellipsis: true,
+            responsive: ["md"],
+            render: (text, record) => (
+                <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
+            ),
+        },
+        {
+            title: t("jobs.fields.ownr_ph2"),
+            dataIndex: "ownr_ph2",
+            key: "ownr_ph2",
+            ellipsis: true,
+            responsive: ["md"],
+            render: (text, record) => (
+                <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
+            ),
+        },
+
+        {
+            title: t("jobs.fields.status"),
+            dataIndex: "status",
+            key: "status",
+            ellipsis: true,
+
+            sorter: (a, b) => alphaSort(a.status, b.status),
+            sortOrder:
+                state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+            filters:
+                (jobs &&
+                    jobs
+                        .map((j) => j.status)
+                        .filter(onlyUnique)
+                        .map((s) => {
+                            return {
+                                text: s || "No Status*",
+                                value: [s],
+                            };
+                        })) ||
+                [],
+            onFilter: (value, record) => value.includes(record.status),
+        },
+
+        {
+            title: t("jobs.fields.vehicle"),
+            dataIndex: "vehicle",
+            key: "vehicle",
+            ellipsis: true,
+            render: (text, record) => {
+                return record.vehicleid ? (
+                    <Link
+                        to={"/manage/vehicles/" + record.vehicleid}
+                        onClick={(e) => e.stopPropagation()}
+                    >
+                        {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+                            record.v_model_desc || ""
+                        }`}
+                    </Link>
+                ) : (
+                    <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+                        record.v_model_desc || ""
+                    }`}</span>
+                );
+            },
+        },
+        {
+            title: t("vehicles.fields.plate_no"),
+            dataIndex: "plate_no",
+            key: "plate_no",
+            ellipsis: true,
+
+            responsive: ["md"],
+            sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
+            sortOrder:
+                state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
+        },
+        {
+            title: t("jobs.fields.clm_no"),
+            dataIndex: "clm_no",
+            key: "clm_no",
+            ellipsis: true,
+            responsive: ["md"],
+            sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
+            sortOrder:
+                state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
+            render: (text, record) =>
+                `${record.clm_no || ""}${
+                    record.po_number ? ` (PO: ${record.po_number})` : ""
+                }`,
+        },
+        {
+            title: t("jobs.fields.ins_co_nm"),
+            dataIndex: "ins_co_nm",
+            key: "ins_co_nm",
+            ellipsis: true,
+            filters:
+                (jobs &&
+                    jobs
+                        .map((j) => j.ins_co_nm)
+                        .filter(onlyUnique)
+                        .map((s) => {
+                            return {
+                                text: s,
+                                value: [s],
+                            };
+                        })) ||
+                [],
+            onFilter: (value, record) => value.includes(record.ins_co_nm),
+            responsive: ["md"],
+        },
+        {
+            title: t("jobs.fields.clm_total"),
+            dataIndex: "clm_total",
+            key: "clm_total",
+            responsive: ["md"],
+            ellipsis: true,
+
+            sorter: (a, b) => a.clm_total - b.clm_total,
+            sortOrder:
+                state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
+            render: (text, record) => (
+                <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
+            ),
+        },
+        {
+            title: t("jobs.labels.estimator"),
+            dataIndex: "jobs.labels.estimator",
+            key: "jobs.labels.estimator",
+            ellipsis: true,
+            responsive: ["xl"],
+            filterSearch: true,
+            filters:
+                (jobs &&
+                    jobs
+                        .map((j) => `${j.est_ct_fn || ""} ${j.est_ct_ln || ""}`.trim())
+                        .filter(onlyUnique)
+                        .map((s) => {
+                            return {
+                                text: s || "N/A",
+                                value: [s],
+                            };
+                        })) ||
+                [],
+            onFilter: (value, record) =>
+                value.includes(
+                    `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim()
+                ),
+            render: (text, record) =>
+                `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim(),
+        },
+        {
+            title: t("jobs.fields.comment"),
+            dataIndex: "comment",
+            key: "comment",
+            ellipsis: true,
+            responsive: ["md"],
+        },
+        // {
+        //   title: t("jobs.fields.owner_owing"),
+        //   dataIndex: "owner_owing",
+        //   key: "owner_owing",
+        //   responsive: ["md"],
+        //   render: (text, record) => (
+        //     <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
+        //   ),
+        // },
+    ];
+
+    const scrollMapper = {
+        xs: true,
+        sm: true,
+        md: true,
+        lg: "100%",
+        xl: "100%",
+        xxl: "100%",
+    };
+
+    return (
+        <Card
+            title={t("titles.bc.jobs-active")}
+            extra={
+                <Space wrap>
+                    <Button onClick={() => refetch()}>
+                        <SyncOutlined />
+                    </Button>
+                    <Input.Search
+                        placeholder={t("general.labels.search")}
+                        onChange={(e) => {
+                            setSearchText(e.target.value);
+                        }}
+                        value={searchText}
+                        enterButton
+                    />
+                </Space>
+            }
+        >
+            <Table
+                loading={loading}
+                pagination={{ defaultPageSize: 50 }}
+                columns={columns}
+                rowKey="id"
+                dataSource={jobs}
+                scroll={{
+                    x: selectedBreakpoint ? scrollMapper[selectedBreakpoint[0]] : "100%",
+                }}
+                rowSelection={{
+                    onSelect: (record) => {
+                        handleOnRowClick(record);
+                    },
+                    selectedRowKeys: [selected],
+                    type: "radio",
+                }}
+                onChange={handleTableChange}
+                onRow={(record, rowIndex) => {
+                    return {
+                        onClick: (event) => {
+                            handleOnRowClick(record);
+                        },
+                    };
+                }}
+            />
+        </Card>
+    );
 }
 
 export default connect(mapStateToProps, null)(JobsList);

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

@@ -20,6 +20,7 @@ import { alphaSort } from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -377,7 +378,7 @@ export function JobsReadyList({ bodyshop }) {
     >
       <Table
         loading={loading}
-        pagination={{ defaultPageSize: 50 }}
+        pagination={{ defaultPageSize: pageLimit }}
         columns={columns}
         rowKey="id"
         dataSource={jobs}

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

@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import {pageLimit} from "../../utils/config";
 
 export default function OwnersListComponent({
   loading,
@@ -122,7 +123,7 @@ export default function OwnersListComponent({
         loading={loading}
         pagination={{
           position: "top",
-          pageSize: 25,
+          pageSize: pageLimit,
           current: parseInt(page || 1),
           total: total,
         }}

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

@@ -5,6 +5,7 @@ import AlertComponent from "../alert/alert.component";
 import OwnersListComponent from "./owners-list.component";
 import queryString from "query-string";
 import { useLocation } from "react-router-dom";
+import {pageLimit} from "../../utils/config";
 
 export default function OwnersListContainer() {
   const searchParams = queryString.parse(useLocation().search);
@@ -16,8 +17,8 @@ export default function OwnersListContainer() {
       nextFetchPolicy: "network-only",
       variables: {
         search: search || "",
-        offset: page ? (page - 1) * 25 : 0,
-        limit: 25,
+        offset: page ? (page - 1) * pageLimit : 0,
+        limit: pageLimit,
         order: [
           {
             [sortcolumn || "created_at"]: sortorder

client/src/components/payments-list-paginated/payment-list-paginated.component.jsx

@@ -18,6 +18,7 @@ import { alphaSort } from "../../utils/sorters";
 import CaBcEtfTableModalContainer from "../ca-bc-etf-table-modal/ca-bc-etf-table-modal.container";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -282,11 +283,11 @@ export function PaymentsListPaginated({
         pagination={
           search?.search
             ? {
-                pageSize: 25,
+                pageSize: pageLimit,
                 showSizeChanger: false,
               }
             : {
-                pageSize: 25,
+                pageSize: pageLimit,
                 current: parseInt(page || 1),
                 total: total,
                 showSizeChanger: false,

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

@@ -1,7 +1,7 @@
-import React from "react";
 import { Button, Dropdown, Menu } from "antd";
-import dataSource from "./production-list-columns.data";
+import React from "react";
 import { useTranslation } from "react-i18next";
+import dataSource from "./production-list-columns.data";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -24,6 +24,7 @@ export function ProductionColumnsComponent({
   columnState,
   technician,
   bodyshop,
+  data,
   tableState,
 }) {
   const [columns, setColumns] = columnState;
@@ -36,6 +37,7 @@ export function ProductionColumnsComponent({
         bodyshop,
         technician,
         state: tableState,
+        data: data,
         activeStatuses: bodyshop.md_ro_statuses.active_statuses,
       }).filter((i) => i.key === e.key),
     ]);
@@ -46,6 +48,7 @@ export function ProductionColumnsComponent({
     technician,
     state: tableState,
     activeStatuses: bodyshop.md_ro_statuses.active_statuses,
+    data: data,
   });
   const menu = (
     <Menu

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

@@ -1,12 +1,23 @@
 import { ExclamationCircleFilled } from "@ant-design/icons";
+import { useMutation } from "@apollo/client";
 import { Dropdown, Menu } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { useMutation } from "@apollo/client";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
-export default function ProductionListColumnAlert({ record }) {
+const mapStateToProps = createStructuredSelector({});
+
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+
+export function ProductionListColumnAlert({ record, insertAuditTrail }) {
   const { t } = useTranslation();
 
   const [updateAlert] = useMutation(UPDATE_JOB);
@@ -27,6 +38,14 @@ export default function ProductionListColumnAlert({ record }) {
           },
         },
       },
+    });
+    insertAuditTrail({
+      jobid: record.id,
+      operation: AuditTrailMapping.alertToggle(
+        !!record.production_vars && !!record.production_vars.alert
+          ? !record.production_vars.alert
+          : true
+      ),
     }).then(() => {
       if (record.refetch) record.refetch();
     });
@@ -58,3 +77,8 @@ export default function ProductionListColumnAlert({ record }) {
     </Dropdown>
   );
 }
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ProductionListColumnAlert);

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

@@ -1,4 +1,4 @@
-import { PauseCircleOutlined, BranchesOutlined } from "@ant-design/icons";
+import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons";
 import { Space, Tooltip } from "antd";
 import i18n from "i18next";
 import moment from "moment";
@@ -6,6 +6,7 @@ import { Link } from "react-router-dom";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { TimeFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
+import { onlyUnique } from "../../utils/arrayHelper";
 import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
 import JobAltTransportChange from "../job-at-change/job-at-change.component";
 import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
@@ -25,7 +26,7 @@ import ProductionListColumnCategory from "./production-list-columns.status.categ
 import ProductionListColumnStatus from "./production-list-columns.status.component";
 import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
 
-const r = ({ technician, state, activeStatuses, bodyshop }) => {
+const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
   return [
     {
       title: i18n.t("jobs.actions.viewdetail"),
@@ -536,6 +537,36 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         <JobPartsQueueCount parts={record.joblines_status} record={record} />
       ),
     },
+    {
+      title: i18n.t("jobs.labels.estimator"),
+      dataIndex: "estimator",
+      key: "estimator",
+      sorter: (a, b) =>
+        alphaSort(
+          `${a.est_ct_fn || ""} ${a.est_ct_ln || ""}`.trim(),
+          `${b.est_ct_fn || ""} ${b.est_ct_ln || ""}`.trim()
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "estimator" && state.sortedInfo.order,
+      filters:
+        (data &&
+          data
+            .map((j) => `${j.est_ct_fn || ""} ${j.est_ct_ln || ""}`.trim())
+            .filter(onlyUnique)
+            .map((s) => {
+              return {
+                text: s || "N/A",
+                value: [s],
+              };
+            })) ||
+        [],
+      onFilter: (value, record) =>
+        value.includes(
+          `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim()
+        ),
+      render: (text, record) =>
+        `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim(),
+    },
 
     //Added as a place holder for St Claude. Not implemented as it requires another join for a field used by only 1 client.
     // {

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

@@ -24,6 +24,7 @@ export function ProductionListTable({
   technician,
   currentUser,
   state,
+  data,
   setColumns,
   setState,
 }) {
@@ -41,6 +42,7 @@ export function ProductionListTable({
               bodyshop,
               technician,
               state,
+              data: data,
               activeStatuses: bodyshop.md_ro_statuses.active_statuses,
             }).find((e) => e.key === k.key),
             width: k.width,
@@ -95,6 +97,7 @@ export function ProductionListTable({
           ...ProductionListColumns({
             technician,
             state,
+            data: data,
             activeStatuses: bodyshop.md_ro_statuses.active_statuses,
           }).find((e) => e.key === k.key),
           width: k.width,

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

@@ -10,7 +10,7 @@ import {
   Statistic,
   Table,
 } from "antd";
-import React, { useMemo, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import ReactDragListView from "react-drag-listview";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -79,6 +79,7 @@ export function ProductionListTable({
             bodyshop,
             technician,
             state,
+            data: data,
             activeStatuses: bodyshop.md_ro_statuses.active_statuses,
           }).find((e) => e.key === k.key),
           width: k.width ?? 100,
@@ -87,6 +88,33 @@ export function ProductionListTable({
       []
   );
 
+  useEffect(() => {
+    const newColumns =
+      (state &&
+        matchingColumnConfig &&
+        matchingColumnConfig.columns.columnKeys.map((k) => {
+          return {
+            ...ProductionListColumns({
+              bodyshop,
+              technician,
+              state,
+              data: data,
+              activeStatuses: bodyshop.md_ro_statuses.active_statuses,
+            }).find((e) => e.key === k.key),
+            width: k.width ?? 100,
+          };
+        })) ||
+      [];
+    setColumns(newColumns);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [
+    //state,
+    matchingColumnConfig,
+    bodyshop,
+    technician,
+    data,
+  ]); //State removed from dependency array as it causes race condition when removing columns from table view and is not needed.
+
   const handleTableChange = (pagination, filters, sorter) => {
     setState({
       ...state,
@@ -104,7 +132,8 @@ export function ProductionListTable({
 
   const removeColumn = (e) => {
     const { key } = e;
-    setColumns(columns.filter((i) => i.key !== key));
+    const newColumns = columns.filter((i) => i.key !== key);
+    setColumns(newColumns);
   };
 
   const handleResize =
@@ -227,6 +256,7 @@ export function ProductionListTable({
             <ProductionListColumnsAdd
               columnState={[columns, setColumns]}
               tableState={state}
+              data={data}
             />
             <ProductionListSaveConfigButton
               columns={columns}
@@ -237,6 +267,7 @@ export function ProductionListTable({
               state={state}
               setState={setState}
               setColumns={setColumns}
+              data={data}
             />
 
             <Input

client/src/components/rbac-wrapper/rbac-defaults.js

@@ -55,10 +55,11 @@ const ret = {
   "shiftclock:view": 2,
 
   "shop:config": 4,
-  "shop:rbac": 5,
-  "shop:vendors": 2,
   "shop:dashboard": 3,
+  "shop:rbac": 5,
+  "shop:reportcenter": 2,
   "shop:templates": 4,
+  "shop:vendors": 2,
 
   "temporarydocs:view": 2,
 

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

@@ -5,6 +5,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectReportCenter } from "../../redux/modals/modals.selectors";
+import RbacWrapperComponent from "../rbac-wrapper/rbac-wrapper.component";
 import ReportCenterModalComponent from "./report-center-modal.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -33,7 +34,9 @@ export function ReportCenterModalContainer({
       destroyOnClose
       width="80%"
     >
-      <ReportCenterModalComponent />
+      <RbacWrapperComponent action="shop:reportcenter">
+        <ReportCenterModalComponent />
+      </RbacWrapperComponent>
     </Modal>
   );
 }

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

@@ -10,13 +10,14 @@ import OwnerNameDisplay from "../owner-name-display/owner-name-display.component
 import ScoreboardEntryEdit from "../scoreboard-entry-edit/scoreboard-entry-edit.component";
 import ScoreboardRemoveButton from "../scoreboard-remove-button/scorebard-remove-button.component";
 import { SyncOutlined } from "@ant-design/icons";
+import {pageLimit} from "../../utils/config";
 export default function ScoreboardJobsList({ scoreBoardlist }) {
   const { t } = useTranslation();
   const [state, setState] = useState({
     visible: false,
     search: "",
     current: 1,
-    pageSize: 10,
+    pageSize: pageLimit,
   });
 
   const { loading, error, data, refetch } = useQuery(
@@ -148,7 +149,7 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
             }
             pagination={{
               position: "top",
-              pageSize: state.pageSize || 10,
+              pageSize: state.pageSize || pageLimit,
               current: state.current || 1,
               total: data ? data.scoreboard_aggregate.aggregate.count : 0,
             }}

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

@@ -29,7 +29,7 @@ export default connect(
 
 export function ScoreboardTimeTicketsStats({ bodyshop }) {
   const { t } = useTranslation();
-  const startDate = moment().startOf("month")
+  const startDate = moment().startOf("month");
   const endDate = moment().endOf("month");
 
   const fixedPeriods = useMemo(() => {
@@ -84,6 +84,8 @@ export function ScoreboardTimeTicketsStats({ bodyshop }) {
       end: endDate.format("YYYY-MM-DD"),
       fixedStart: fixedPeriods.start.format("YYYY-MM-DD"),
       fixedEnd: fixedPeriods.end.format("YYYY-MM-DD"),
+      jobStart: startDate,
+      jobEnd: endDate,
     },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
@@ -340,11 +342,21 @@ export function ScoreboardTimeTicketsStats({ bodyshop }) {
       larData.push({ ...r, ...lar });
     });
 
+    const jobData = {};
+    data.jobs.forEach((job) => {
+      job.tthrs = job.joblines.reduce((acc, val) => acc + val.mod_lb_hrs, 0);
+    });
+    jobData.tthrs = data.jobs
+      .reduce((acc, val) => acc + val.tthrs, 0)
+      .toFixed(1);
+    jobData.count = data.jobs.length.toFixed(0);
+
     return {
       fixed: ret,
       combinedData: combinedData,
       labData: labData,
       larData: larData,
+      jobData: jobData,
     };
   }, [fixedPeriods, data, bodyshop]);
 
@@ -356,7 +368,10 @@ export function ScoreboardTimeTicketsStats({ bodyshop }) {
         <ScoreboardTimeticketsTargetsTable />
       </Col>
       <Col span={24}>
-        <ScoreboardTicketsStats data={calculatedData.fixed} />
+        <ScoreboardTicketsStats
+          data={calculatedData.fixed}
+          jobData={calculatedData.jobData}
+        />
       </Col>
       <Col span={24}>
         <ScoreboardTimeTicketsChart

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

@@ -41,7 +41,7 @@ function useLocalStorage(key, initialValue) {
   return [storedValue, setStoredValue];
 }
 
-export function ScoreboardTicketsStats({ data, bodyshop }) {
+export function ScoreboardTicketsStats({ data, jobData, bodyshop }) {
   const { t } = useTranslation();
   const [isLarge, setIsLarge] = useLocalStorage("isLargeStatistic", false);
 
@@ -408,7 +408,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
             {/* Monthly Stats */}
             <Row gutter={[16, 16]}>
               {/* This Month */}
-              <Col span={8} align="center">
+              <Col span={7} align="center">
                 <Card size="small" title={t("scoreboard.labels.thismonth")}>
                   <Row gutter={[16, 16]}>
                     <Col span={24}>
@@ -482,7 +482,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
                 </Card>
               </Col>
               {/* Last Month */}
-              <Col span={8} align="center">
+              <Col span={7} align="center">
                 <Card size="small" title={t("scoreboard.labels.lastmonth")}>
                   <Row gutter={[16, 16]}>
                     <Col span={24}>
@@ -556,7 +556,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
                 </Card>
               </Col>
               {/* Efficiency Over Period */}
-              <Col span={8} align="center">
+              <Col span={7} align="center">
                 <Card
                   size="small"
                   title={t("scoreboard.labels.efficiencyoverperiod")}
@@ -604,6 +604,40 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
                   </Row>
                 </Card>
               </Col>
+              <Col span={3} align="center">
+                <Card
+                  size="small"
+                  title={t("scoreboard.labels.jobscompletednotinvoiced")}
+                >
+                  <Row gutter={[16, 16]}>
+                    <Col span={24}>
+                      <Statistic
+                        value={jobData.count}
+                        valueStyle={{
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                  <Row gutter={[16, 16]}>
+                    <Col span={24}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.totalhrs")}
+                          </Typography.Text>
+                        }
+                        value={jobData.tthrs}
+                        valueStyle={{
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                </Card>
+              </Col>
             </Row>
           </Space>
           {/* Disclaimer */}

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

@@ -65,6 +65,8 @@ export default function ScoreboardTimeTickets() {
       end: endDate.format("YYYY-MM-DD"),
       fixedStart: fixedPeriods.start.format("YYYY-MM-DD"),
       fixedEnd: fixedPeriods.end.format("YYYY-MM-DD"),
+      jobStart: startDate,
+      jobEnd: endDate,
     },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",

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

@@ -28,18 +28,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
   return (
     <RbacWrapper action="shop:rbac">
       <LayoutFormRow>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.accounting.payables")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "accounting:payables"]}
-        >
-          <InputNumber />
-        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.accounting.exportlog")}
           rules={[
@@ -52,6 +40,18 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.accounting.payables")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "accounting:payables"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.accounting.payments")}
           rules={[
@@ -77,26 +77,62 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.csi.page")}
+          label={t("bodyshop.fields.rbac.bills.delete")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "csi:page"]}
+          name={["md_rbac", "bills:delete"]}
         >
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.csi.export")}
+          label={t("bodyshop.fields.rbac.bills.enter")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "csi:export"]}
+          name={["md_rbac", "bills:enter"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.bills.list")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "bills:list"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.bills.reexport")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "bills:reexport"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.bills.view")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "bills:view"]}
         >
           <InputNumber />
         </Form.Item>
@@ -173,26 +209,38 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.jobs.list-active")}
+          label={t("bodyshop.fields.rbac.csi.export")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "jobs:list-active"]}
+          name={["md_rbac", "csi:export"]}
         >
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.jobs.list-ready")}
+          label={t("bodyshop.fields.rbac.csi.page")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "jobs:list-ready"]}
+          name={["md_rbac", "csi:page"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.employees.page")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "employees:page"]}
         >
           <InputNumber />
         </Form.Item>
@@ -208,30 +256,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.jobs.partsqueue")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "jobs:partsqueue"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.jobs.list-all")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "jobs:list-all"]}
-        >
-          <InputNumber />
-        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.jobs.available-list")}
           rules={[
@@ -245,26 +269,14 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.jobs.create")}
+          label={t("bodyshop.fields.rbac.jobs.checklist-view")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "jobs:create"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.jobs.intake")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "jobs:intake"]}
+          name={["md_rbac", "jobs:checklist-view"]}
         >
           <InputNumber />
         </Form.Item>
@@ -280,6 +292,18 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.jobs.create")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "jobs:create"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.jobs.deliver")}
           rules={[
@@ -305,14 +329,62 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.jobs.checklist-view")}
+          label={t("bodyshop.fields.rbac.jobs.intake")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "jobs:checklist-view"]}
+          name={["md_rbac", "jobs:intake"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.jobs.list-active")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "jobs:list-active"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.jobs.list-all")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "jobs:list-all"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.jobs.list-ready")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "jobs:list-ready"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.jobs.partsqueue")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "jobs:partsqueue"]}
         >
           <InputNumber />
         </Form.Item>
@@ -329,74 +401,14 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.bills.enter")}
+          label={t("bodyshop.fields.rbac.owners.detail")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "bills:enter"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.bills.delete")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "bills:delete"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.bills.reexport")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "bills:reexport"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.bills.view")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "bills:view"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.bills.list")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "bills:list"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.employees.page")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "employees:page"]}
+          name={["md_rbac", "owners:detail"]}
         >
           <InputNumber />
         </Form.Item>
@@ -412,18 +424,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.owners.detail")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "owners:detail"]}
-        >
-          <InputNumber />
-        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.payments.enter")}
           rules={[
@@ -448,6 +448,30 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.phonebook.edit")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "phonebook:edit"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.phonebook.view")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "phonebook:view"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.production.board")}
           rules={[
@@ -509,38 +533,14 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.timetickets.edit")}
+          label={t("bodyshop.fields.rbac.shop.config")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "timetickets:edit"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "timetickets:shiftedit"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.shop.vendors")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "shop:vendors"]}
+          name={["md_rbac", "shop:config"]}
         >
           <InputNumber />
         </Form.Item>
@@ -556,18 +556,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.shop.config")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "shop:config"]}
-        >
-          <InputNumber />
-        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.shop.rbac")}
           rules={[
@@ -580,6 +568,18 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.shop.reportcenter")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "shop:reportcenter"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.shop.templates")}
           rules={[
@@ -592,6 +592,42 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.shop.vendors")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "shop:vendors"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.temporarydocs.view")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "temporarydocs:view"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.timetickets.edit")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "timetickets:edit"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.timetickets.enter")}
           rules={[
@@ -616,6 +652,18 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "timetickets:shiftedit"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.users.editaccess")}
           rules={[
@@ -628,42 +676,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.temporarydocs.view")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "temporarydocs:view"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.phonebook.view")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "phonebook:view"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.phonebook.edit")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "phonebook:edit"]}
-        >
-          <InputNumber />
-        </Form.Item>
         {Simple_Inventory.treatment === "on" && (
           <>
             <Form.Item

client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx

@@ -166,9 +166,6 @@ export function TechClockOffButton({
                       },
                       ({ getFieldValue }) => ({
                         validator(rule, value) {
-                          console.log(
-                            bodyshop.tt_enforce_hours_for_tech_console
-                          );
                           if (!bodyshop.tt_enforce_hours_for_tech_console) {
                             return Promise.resolve();
                           }

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

@@ -5,6 +5,7 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
+import {pageLimit} from "../../utils/config";
 export default function VehiclesListComponent({
   loading,
   vehicles,
@@ -106,7 +107,7 @@ export default function VehiclesListComponent({
         loading={loading}
         pagination={{
           position: "top",
-          pageSize: 25,
+          pageSize: pageLimit,
           current: parseInt(page || 1),
           total: total,
         }}

client/src/components/vehicles-list/vehicles-list.container.jsx

@@ -5,6 +5,7 @@ import AlertComponent from "../alert/alert.component";
 import { QUERY_ALL_VEHICLES_PAGINATED } from "../../graphql/vehicles.queries";
 import queryString from "query-string";
 import { useLocation } from "react-router-dom";
+import {pageLimit} from "../../utils/config";
 
 export default function VehiclesListContainer() {
   const searchParams = queryString.parse(useLocation().search);
@@ -15,8 +16,8 @@ export default function VehiclesListContainer() {
     {
       variables: {
         search: search || "",
-        offset: page ? (page - 1) * 25 : 0,
-        limit: 25,
+        offset: page ? (page - 1) * pageLimit : 0,
+        limit: pageLimit,
         order: [
           {
             [sortcolumn || "created_at"]: sortorder

client/src/graphql/courtesy-car.queries.js

@@ -30,15 +30,15 @@ export const QUERY_AVAILABLE_CC = gql`
       fuel
       id
       make
-      model
-      plate
-      status
-      year
-      dailycost
       mileage
+      model
       notes
       nextservicekm
       nextservicedate
+      plate
+      readiness
+      status
+      year
     }
   }
 `;
@@ -68,19 +68,20 @@ export const QUERY_ALL_CC = gql`
       insuranceexpires
       leaseenddate
       make
+      mileage
       model
       nextservicedate
       nextservicekm
       notes
       plate
       purchasedate
+      readiness
       registrationexpires
       serviceenddate
       servicestartdate
       status
       vin
       year
-      mileage
       cccontracts(
         where: { status: { _eq: "contracts.status.out" } }
         order_by: { contract_date: desc }
@@ -90,10 +91,10 @@ export const QUERY_ALL_CC = gql`
         scheduledreturn
         job {
           id
-          ro_number
           ownr_fn
           ownr_ln
           ownr_co_nm
+          ro_number
         }
       }
     }
@@ -119,19 +120,20 @@ export const QUERY_CC_BY_PK = gql`
       insuranceexpires
       leaseenddate
       make
+      mileage
       model
       nextservicedate
       nextservicekm
       notes
       plate
       purchasedate
+      readiness
       registrationexpires
       serviceenddate
       servicestartdate
       status
       vin
       year
-      mileage
       cccontracts_aggregate {
         aggregate {
           count(distinct: true)
@@ -139,21 +141,20 @@ export const QUERY_CC_BY_PK = gql`
       }
       cccontracts(offset: $offset, limit: $limit, order_by: $order) {
         agreementnumber
+        driver_fn
+        driver_ln
         id
-        status
-        start
-        scheduledreturn
         kmstart
         kmend
-        driver_ln
-        driver_fn
+        scheduledreturn
+        start
+        status
         job {
-          ro_number
-
+          id
           ownr_ln
           ownr_fn
           ownr_co_nm
-          id
+          ro_number
         }
       }
     }

client/src/graphql/jobs.queries.js

@@ -1,5 +1,65 @@
 import { gql } from "@apollo/client";
 
+export const QUERY_ALL_ACTIVE_JOBS_PAGINATED = gql`
+  query QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED(
+    $offset: Int
+    $limit: Int
+    $order: [jobs_order_by!]
+    $statuses: [String!]!, 
+    $isConverted: Boolean
+  ) {
+    jobs(
+      offset: $offset
+      limit: $limit
+      where: { status: { _in: $statuses }, converted: { _eq: $isConverted } }
+      order_by: $order
+    ) {
+      iouparent
+      ownr_fn
+      ownr_ln
+      ownr_co_nm
+      ownr_ph1
+      ownr_ph2
+      ownr_ea
+      ownerid
+      comment
+      plate_no
+      plate_st
+      v_vin
+      v_model_yr
+      v_model_desc
+      v_make_desc
+      v_color
+      vehicleid
+      actual_completion
+      actual_delivery
+      actual_in
+      production_vars
+      id
+      ins_co_nm
+      clm_no
+      po_number
+      clm_total
+      owner_owing
+      ro_number
+      scheduled_completion
+      scheduled_in
+      scheduled_delivery
+      status
+      updated_at
+      ded_amt
+      suspended
+      est_ct_fn
+      est_ct_ln
+    }
+    jobs_aggregate(where: { status: { _in: $statuses } }) {
+      aggregate {
+        count(distinct: true)
+      }
+    }
+  }
+`;
+
 export const QUERY_ALL_ACTIVE_JOBS = gql`
   query QUERY_ALL_ACTIVE_JOBS($statuses: [String!]!, $isConverted: Boolean) {
     jobs(
@@ -304,6 +364,8 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
       employee_refinish
       employee_prep
       employee_csr
+      est_ct_fn
+      est_ct_ln
       suspended
       date_repairstarted
       joblines_status {

client/src/graphql/timetickets.queries.js

@@ -143,9 +143,14 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
     $end: date!
     $fixedStart: date!
     $fixedEnd: date!
+    $jobStart: timestamptz!
+    $jobEnd: timestamptz!
   ) {
     timetickets(
-      where: { date: { _gte: $start, _lte: $end }, cost_center: {_neq: "timetickets.labels.shift"} }
+      where: {
+        date: { _gte: $start, _lte: $end }
+        cost_center: { _neq: "timetickets.labels.shift" }
+      }
       order_by: { date: desc_nulls_first }
     ) {
       actualhrs
@@ -176,7 +181,10 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
       }
     }
     fixedperiod: timetickets(
-      where: { date: { _gte: $fixedStart, _lte: $fixedEnd }, cost_center: {_neq: "timetickets.labels.shift"} }
+      where: {
+        date: { _gte: $fixedStart, _lte: $fixedEnd }
+        cost_center: { _neq: "timetickets.labels.shift" }
+      }
       order_by: { date: desc_nulls_first }
     ) {
       actualhrs
@@ -205,6 +213,25 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
         last_name
       }
     }
+    jobs(
+      where: {
+        date_invoiced: { _is_null: true }
+        ro_number: { _is_null: false }
+        voided: { _eq: false }
+        _or: [
+          { actual_completion: { _gte: $jobStart, _lte: $jobEnd } }
+          { actual_delivery: { _gte: $jobStart, _lte: $jobEnd } }
+        ]
+      }
+    ) {
+      id
+      joblines(order_by: { line_no: asc }, where: { removed: { _eq: false } }) {
+        convertedtolbr
+        convertedtolbr_data
+        mod_lb_hrs
+        mod_lbr_ty
+      }
+    }
   }
 `;
 

client/src/pages/bills/bills.page.component.jsx

@@ -14,6 +14,7 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
 import { alphaSort, dateSort } from "../../utils/sorters";
+import {pageLimit} from "../../utils/config";
 
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
@@ -295,11 +296,11 @@ export function BillsListPage({
         pagination={
           search?.search
             ? {
-                pageSize: 25,
+                pageSize: pageLimit,
                 showSizeChanger: false,
               }
             : {
-                pageSize: 25,
+                pageSize: pageLimit,
                 current: parseInt(page || 1),
                 total: total,
                 showSizeChanger: false,

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

@@ -13,6 +13,7 @@ import {
   setSelectedHeader,
 } from "../../redux/application/application.actions";
 import BillsPageComponent from "./bills.page.component";
+import {pageLimit} from "../../utils/config";
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -38,8 +39,8 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
       fetchPolicy: "network-only",
       nextFetchPolicy: "network-only",
       variables: {
-        offset: page ? (page - 1) * 25 : 0,
-        limit: 25,
+        offset: page ? (page - 1) * pageLimit : 0,
+        limit: pageLimit,
         order: [
           searchObj
             ? JSON.parse(searchObj)

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

@@ -12,6 +12,7 @@ import {
   setSelectedHeader,
 } from "../../redux/application/application.actions";
 import ContractsPageComponent from "./contracts.page.component";
+import {pageLimit} from "../../utils/config";
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -29,8 +30,8 @@ export function ContractsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
       nextFetchPolicy: "network-only",
       variables: {
         search: search || "",
-        offset: page ? (page - 1) * 25 : 0,
-        limit: 25,
+        offset: page ? (page - 1) * pageLimit : 0,
+        limit: pageLimit,
         order: [
           {
             [sortcolumn || "start"]: sortorder

client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx

@@ -1,11 +1,14 @@
 import { useMutation, useQuery } from "@apollo/client";
 import { Form, notification } from "antd";
 import moment from "moment";
+import queryString from "query-string";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useParams } from "react-router-dom";
+import { useLocation, useParams } from "react-router-dom";
 import AlertComponent from "../../components/alert/alert.component";
+import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
+import NotFound from "../../components/not-found/not-found.component";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { QUERY_CC_BY_PK, UPDATE_CC } from "../../graphql/courtesy-car.queries";
 import {
@@ -13,12 +16,10 @@ import {
   setBreadcrumbs,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
+import { pageLimit } from "../../utils/config";
 import { CreateRecentItem } from "../../utils/create-recent-item";
+import UndefinedToNull from "./../../utils/undefinedtonull";
 import CourtesyCarDetailPageComponent from "./courtesy-car-detail.page.component";
-import NotFound from "../../components/not-found/not-found.component";
-import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
-import queryString from "query-string";
-import { useLocation } from "react-router-dom";
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -41,8 +42,8 @@ export function CourtesyCarDetailPageContainer({
   const { loading, error, data } = useQuery(QUERY_CC_BY_PK, {
     variables: {
       id: ccId,
-      offset: page ? (page - 1) * 25 : 0,
-      limit: 25,
+      offset: page ? (page - 1) * pageLimit : 0,
+      limit: pageLimit,
       order: [
         {
           [sortcolumn || "start"]: sortorder
@@ -111,7 +112,10 @@ export function CourtesyCarDetailPageContainer({
     setSaveLoading(true);
 
     const result = await updateCourtesyCar({
-      variables: { cc: { ...values }, ccId: ccId },
+      variables: {
+        cc: { ...UndefinedToNull(values, ["readiness"]) },
+        ccId: ccId,
+      },
       refetchQueries: ["QUERY_CC_BY_PK"],
       awaitRefetchQueries: true,
     });

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

@@ -12,6 +12,7 @@ import AlertComponent from "../../components/alert/alert.component";
 import { QUERY_EXPORT_LOG_PAGINATED } from "../../graphql/accounting.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -29,8 +30,8 @@ export function ExportLogsPageComponent({ bodyshop }) {
       nextFetchPolicy: "network-only",
       variables: {
         search: search || "",
-        offset: page ? (page - 1) * 25 : 0,
-        limit: 25,
+        offset: page ? (page - 1) * pageLimit : 0,
+        limit: pageLimit,
         order: [
           {
             [sortcolumn || "created_at"]: sortorder
@@ -178,7 +179,7 @@ export function ExportLogsPageComponent({ bodyshop }) {
         loading={loading}
         pagination={{
           position: "top",
-          pageSize: 25,
+          pageSize: pageLimit,
           current: parseInt(page || 1),
           total: data && data.search_exportlog_aggregate.aggregate.count,
         }}

client/src/pages/jobs-all/jobs-all.container.jsx

@@ -13,6 +13,7 @@ import {
   setBreadcrumbs,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   //bodyshop: selectBodyshop,
@@ -33,16 +34,16 @@ export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
       fetchPolicy: "network-only",
       nextFetchPolicy: "network-only",
       variables: {
-        offset: page ? (page - 1) * 25 : 0,
-        limit: 25,
+        offset: page ? (page - 1) * pageLimit : 0,
+        limit: pageLimit,
         ...(statusFilters ? { statusList: JSON.parse(statusFilters) } : {}),
         order: [
           {
             [sortcolumn || "ro_number"]:
               sortorder && sortorder !== "false"
-                ? sortorder === "descend"
+                ? (sortorder === "descend"
                   ? "desc"
-                  : "asc"
+                  : "asc")
                 : "desc",
           },
         ],

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

@@ -36,14 +36,22 @@ import JobsCloseLines from "../../components/jobs-close-lines/jobs-close-lines.c
 import LayoutFormRow from "../../components/layout-form-row/layout-form-row.component";
 import { generateJobLinesUpdatesForInvoicing } from "../../graphql/jobs-lines.queries";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   jobRO: selectJobReadOnly,
 });
 
-export function JobsCloseComponent({ job, bodyshop, jobRO }) {
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+
+export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const client = useApolloClient();
@@ -110,6 +118,10 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
       notification["success"]({
         message: t("jobs.successes.closed"),
       });
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.jobinvoiced(),
+      });
       // history.push(`/manage/jobs/${job.id}`);
     } else {
       setLoading(false);
@@ -527,4 +539,4 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
     </div>
   );
 }
-export default connect(mapStateToProps, null)(JobsCloseComponent);
+export default connect(mapStateToProps, mapDispatchToProps)(JobsCloseComponent);

client/src/pages/jobs-create/jobs-create.container.jsx

@@ -1,6 +1,6 @@
-import _ from "lodash";
 import { useLazyQuery, useMutation } from "@apollo/client";
 import { Form, notification } from "antd";
+import _ from "lodash";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -90,6 +90,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
       {},
       values,
       { date_open: new Date() },
+      { date_estimated: new Date() },
       {
         vehicle:
           state.vehicle.selectedid || state.vehicle.none

client/src/pages/parts-queue/parts-queue.page.component.jsx

@@ -18,6 +18,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter, TimeAgoFormatter } from "../../utils/DateFormatter";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -296,7 +297,7 @@ export function PartsQueuePageComponent({ bodyshop }) {
         loading={loading}
         pagination={{
           position: "top",
-          pageSize: 50,
+          pageSize: pageLimit,
           // current: parseInt(page || 1),
           // total: data && data.jobs_aggregate.aggregate.count,
         }}

client/src/pages/payments-all/payments-all.container.page.jsx

@@ -14,6 +14,7 @@ import {
   setSelectedHeader,
 } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -34,8 +35,8 @@ export function AllJobs({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
       fetchPolicy: "network-only",
       nextFetchPolicy: "network-only",
       variables: {
-        offset: page ? (page - 1) * 25 : 0,
-        limit: 25,
+        offset: page ? (page - 1) * pageLimit : 0,
+        limit: pageLimit,
         order: [
           searchObj
           ? JSON.parse(searchObj)

client/src/pages/phonebook/phonebook.page.component.jsx

@@ -17,6 +17,7 @@ import {
 import ChatOpenButton from "../../components/chat-open-button/chat-open-button.component";
 import { alphaSort } from "../../utils/sorters";
 import { HasRbacAccess } from "../../components/rbac-wrapper/rbac-wrapper.component";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -35,8 +36,8 @@ export function PhonebookPageComponent({ bodyshop, authLevel }) {
       nextFetchPolicy: "network-only",
       variables: {
         search: search || "",
-        offset: page ? (page - 1) * 25 : 0,
-        limit: 25,
+        offset: page ? (page - 1) * pageLimit : 0,
+        limit: pageLimit,
         order: [
           {
             [sortcolumn || "lastname"]: sortorder
@@ -189,7 +190,7 @@ export function PhonebookPageComponent({ bodyshop, authLevel }) {
         loading={loading}
         pagination={{
           position: "top",
-          pageSize: 25,
+          pageSize: pageLimit,
           current: parseInt(page || 1),
           total: data && data.search_phonebook_aggregate.aggregate.count,
         }}

client/src/pages/shop-csi/shop-csi.container.page.jsx

@@ -16,6 +16,7 @@ import {
 } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
+import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -42,8 +43,8 @@ export function ShopCsiContainer({
       nextFetchPolicy: "network-only",
       variables: {
         //search: search || "",
-        offset: page ? (page - 1) * 25 : 0,
-        limit: 25,
+        offset: page ? (page - 1) * pageLimit : 0,
+        limit: pageLimit,
         order: [
           {
             [sortcolumn || "completedon"]: sortorder

client/src/translations/en_us/common.json

@@ -56,13 +56,13 @@
 				"history": "History",
 				"inproduction": "Jobs In Production",
 				"manualevent": "Add Manual Appointment",
-				"noarrivingjobs": "No jobs are arriving.",
-				"nocompletingjobs": "No jobs scheduled for completion.",
+				"noarrivingjobs": "No Jobs are arriving.",
+				"nocompletingjobs": "No Jobs scheduled for completion.",
 				"nodateselected": "No date has been selected.",
 				"priorappointments": "Previous Appointments",
 				"reminder": "This is {{shopname}} reminding you about an appointment on {{date}} at {{time}}. Please let us know if you are not able to make the appointment. We look forward to seeing you soon. ",
 				"scheduledfor": "Scheduled appointment for: ",
-				"severalerrorsfound": "Several jobs have issues which may prevent accurate smart scheduling. Click to expand.",
+				"severalerrorsfound": "Several Jobs have issues which may prevent accurate smart scheduling. Click to expand.",
 				"smartscheduling": "Smart Scheduling",
 				"suggesteddates": "Suggested Dates"
 			},
@@ -103,6 +103,7 @@
 				"admin_jobmarkforreexport": "ADMIN: Job marked for re-export.",
 				"admin_jobuninvoice": "ADMIN: Job has been uninvoiced.",
 				"admin_jobunvoid": "ADMIN: Job has been unvoided.",
+				"alerttoggle": "Alert Toggle set to {{status}}",
 				"appointmentcancel": "Appointment canceled. Lost Reason: {{lost_sale_reason}}.",
 				"appointmentinsert": "Appointment created. Appointment Date: {{start}}.",
 				"billposted": "Bill with invoice number {{invoice_number}} posted.",
@@ -111,17 +112,18 @@
 				"jobassignmentchange": "Employee {{name}} assigned to {{operation}}",
 				"jobassignmentremoved": "Employee assignment removed for {{operation}}",
 				"jobchecklist": "Checklist type \"{{type}}\" completed.  In production set to {{inproduction}}.  Status set to {{status}}.",
+				"jobinvoiced": "Job has been invoiced.",
 				"jobconverted": "Job converted and assigned number {{ro_number}}.",
 				"jobfieldchanged": "Job field $t(jobs.fields.{{field}}) changed to {{value}}.",
 				"jobimported": "Job imported.",
 				"jobinproductionchange": "Job production status set to {{inproduction}}",
 				"jobioucreated": "IOU Created.",
 				"jobmodifylbradj": "Labor adjustments modified {{mod_lbr_ty}} / {{hours}}.",
-				"jobnoteadded": "Note added to job.",
-				"jobnotedeleted": "Note deleted from job.",
-				"jobnoteupdated": "Note updated on job.",
-				"jobspartsorder": "Parts order {{order_number}} added to job.",
-				"jobspartsreturn": "Parts return {{order_number}} added to job.",
+				"jobnoteadded": "Note added to Job.",
+				"jobnotedeleted": "Note deleted from Job.",
+				"jobnoteupdated": "Note updated on Job.",
+				"jobspartsorder": "Parts order {{order_number}} added to Job.",
+				"jobspartsreturn": "Parts return {{order_number}} added to Job.",
 				"jobstatuschange": "Job status changed to {{status}}.",
 				"jobsupplement": "Job supplement imported."
 			}
@@ -203,6 +205,7 @@
 				"entered_total": "Total of Entered Lines",
 				"enteringcreditmemo": "You are entering a credit memo. Please ensure you are also entering positive values.",
 				"federal_tax": "Federal Tax",
+				"federal_tax_exempt": "Federal Tax Exempt?",
 				"generatepartslabel": "Generate Parts Labels after Saving?",
 				"iouexists": "An IOU exists that is associated to this RO.",
 				"local_tax": "Local Tax",
@@ -210,7 +213,8 @@
 				"markforreexport": "Mark for Re-export",
 				"new": "New Bill",
 				"noneselected": "No bill selected.",
-				"onlycmforinvoiced": "Only credit memos can be entered for any job that has been invoiced,  exported,  or voided.",
+				"onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced,  exported,  or voided.",
+				"printlabels": "Print Labels",
 				"retailtotal": "Bills Retail Total",
 				"savewithdiscrepancy": "You are about to save this bill with a discrepancy.  The system will continue to use the calculated amount using the bill lines.  Press cancel to return to the bill.",
 				"state_tax": "Provincial/State Tax",
@@ -447,6 +451,7 @@
 						"config": "Shop -> Config",
 						"dashboard": "Shop -> Dashboard",
 						"rbac": "Shop -> RBAC",
+						"reportcenter": "Shop -> Report Center",
 						"templates": "Shop -> Templates",
 						"vendors": "Shop -> Vendors"
 					},
@@ -658,7 +663,7 @@
 				"printall": "Print All Documents"
 			},
 			"errors": {
-				"complete": "Error during job checklist completion. {{error}}",
+				"complete": "Error during Job checklist completion. {{error}}",
 				"nochecklist": "No checklist has been configured for your shop. "
 			},
 			"labels": {
@@ -666,7 +671,7 @@
 				"allow_text_message": "Permission to Text?",
 				"checklist": "Checklist",
 				"printpack": "Job Intake Print Pack",
-				"removefromproduction": "Remove job from production?"
+				"removefromproduction": "Remove Job from Production?"
 			},
 			"successes": {
 				"completed": "Job checklist completed."
@@ -682,9 +687,9 @@
 				"senddltoform": "Insert Driver's License Information"
 			},
 			"errors": {
-				"fetchingjobinfo": "Error fetching job info. {{error}}.",
-				"returning": "Error returning courtesy car. {{error}}",
-				"saving": "Error saving contract. {{error}}",
+				"fetchingjobinfo": "Error fetching Job Info. {{error}}.",
+				"returning": "Error returning Courtesy Car. {{error}}",
+				"saving": "Error saving Contract. {{error}}",
 				"selectjobandcar": "Please ensure both a car and job are selected."
 			},
 			"fields": {
@@ -741,7 +746,7 @@
 				"driverinformation": "Driver's Information",
 				"findcontract": "Find Contract",
 				"findermodal": "Contract Finder",
-				"noteconvertedfrom": "R.O.  created from converted Courtesy Car Contract {{agreementnumber}}.",
+				"noteconvertedfrom": "R.O. created from converted Courtesy Car Contract {{agreementnumber}}.",
 				"populatefromjob": "Populate from Job",
 				"rates": "Contract Rates",
 				"time": "Time",
@@ -763,7 +768,7 @@
 				"return": "Return Car"
 			},
 			"errors": {
-				"saving": "Error saving courtesy card. {{error}}"
+				"saving": "Error saving Courtesy Car. {{error}}"
 			},
 			"fields": {
 				"color": "Color",
@@ -781,6 +786,7 @@
 				"notes": "Notes",
 				"plate": "Plate Number",
 				"purchasedate": "Purchase Date",
+				"readiness": "Readiness",
 				"registrationexpires": "Registration Expires On",
 				"serviceenddate": "Usage End Date",
 				"servicestartdate": "Usage Start Date",
@@ -817,6 +823,10 @@
 			},
 			"successes": {
 				"saved": "Courtesy Car saved successfully."
+			},
+			"readiness": {
+				"notready": "Not Ready",
+				"ready": "Ready"
 			}
 		},
 		"csi": {
@@ -914,7 +924,7 @@
 				"upload_limitexceeded": "Uploading all selected documents will exceed the job storage limit for your shop.  ",
 				"upload_limitexceeded_title": "Unable to upload document(s)",
 				"uploading": "Uploading...",
-				"usage": "of job storage used.  ({{used}} / {{total}})"
+				"usage": "of Job storage used.  ({{used}} / {{total}})"
 			},
 			"successes": {
 				"delete": "Document(s) deleted successfully.",
@@ -1375,28 +1385,28 @@
 			},
 			"errors": {
 				"addingtoproduction": "Error adding to production. {{error}}",
-				"cannotintake": "Intake cannot be completed for this job. It has either already been completed or the job is already here.",
-				"closing": "Error closing job. {{error}}",
-				"creating": "Error encountered while creating job. {{error}}",
-				"deleted": "Error deleting job. {{error}}",
-				"exporting": "Error exporting job. {{error}}",
+				"cannotintake": "Intake cannot be completed for this Job. It has either already been completed or the Job is already here.",
+				"closing": "Error closing Job. {{error}}",
+				"creating": "Error encountered while creating Job. {{error}}",
+				"deleted": "Error deleting Job. {{error}}",
+				"exporting": "Error exporting Job. {{error}}",
 				"exporting-partner": "Unable to connect to ImEX Partner. Please ensure it is running and logged in.",
-				"invoicing": "Error invoicing job. {{error}}",
-				"noaccess": "This job does not exist or you do not have access to it.",
+				"invoicing": "Error invoicing Job. {{error}}",
+				"noaccess": "This Job does not exist or you do not have access to it.",
 				"nodamage": "No damage points on estimate.",
-				"nodates": "No dates specified for this job.",
+				"nodates": "No dates specified for this Job.",
 				"nofinancial": "No financial data has been calculated yet for this job. Please save it again.",
-				"nojobselected": "No job is selected.",
+				"nojobselected": "No Job is selected.",
 				"noowner": "No owner associated.",
 				"novehicle": "No vehicle associated.",
 				"partspricechange": "",
 				"saving": "Error encountered while saving record.",
-				"scanimport": "Error importing job. {{message}}",
-				"totalscalc": "Error while calculating new job totals.",
-				"updating": "Error while updating job(s).  {{error}}",
+				"scanimport": "Error importing Job. {{message}}",
+				"totalscalc": "Error while calculating new Job totals.",
+				"updating": "Error while updating Job(s).  {{error}}",
 				"validation": "Please ensure all fields are entered correctly.",
 				"validationtitle": "Validation Error",
-				"voiding": "Error voiding job.  {{error}}"
+				"voiding": "Error voiding Job.  {{error}}"
 			},
 			"fields": {
 				"actual_completion": "Actual Completion",
@@ -1673,9 +1683,9 @@
 				"adminwarning": "Use the functionality on this page at your own risk.  You are responsible for any and all changes to your data.",
 				"allocations": "Allocations",
 				"alreadyaddedtoscoreboard": "Job has already been added to scoreboard. Saving will update the previous entry.",
-				"alreadyclosed": "This job has already been closed.",
+				"alreadyclosed": "This Job has already been closed.",
 				"appointmentconfirmation": "Send confirmation to customer?",
-				"associationwarning": "Any changes to associations will require updating the data from the new parent record to the job.",
+				"associationwarning": "Any changes to associations will require updating the data from the new parent record to the Job.",
 				"audit": "Audit Trail",
 				"available": "Available",
 				"availablejobs": "Available Jobs",
@@ -1683,7 +1693,7 @@
 					"days": "Days",
 					"rate": "PVRT Rate"
 				},
-				"ca_gst_all_if_null": "If the job is marked as a \"GST Registrant\" and this value is set to $0,  the customer will be responsible for paying all of the GST by default. ",
+				"ca_gst_all_if_null": "If the Job is marked as a \"GST Registrant\" and this value is set to $0,  the customer will be responsible for paying all of the GST by default. ",
 				"calc_repair_days": "Calculated Repair Days",
 				"calc_repair_days_tt": "This is the approximate number of days required to complete the repair according to the target touch time in your shop configuration (current set to {{target_touchtime}}).",
 				"cards": {
@@ -1699,7 +1709,7 @@
 					"totals": "Totals",
 					"vehicle": "Vehicle"
 				},
-				"changeclass": "Changing the job's class can have fundamental impacts to already exported accounting items. Are you sure you want to do this?",
+				"changeclass": "Changing the Job's class can have fundamental impacts to already exported accounting items. Are you sure you want to do this?",
 				"checklistcompletedby": "Checklist completed by {{by}} at {{at}}",
 				"checklistdocuments": "Checklist Documents",
 				"checklists": "Checklists",
@@ -1723,12 +1733,12 @@
 					"vehicleinfo": "Vehicle Info"
 				},
 				"createiouwarning": "Are you sure you want to create an IOU for these lines? A new RO will be created based on those lines for this customer.",
-				"creating_new_job": "Creating new job...",
+				"creating_new_job": "Creating new Job...",
 				"deductible": {
 					"stands": "Stands",
 					"waived": "Waived"
 				},
-				"deleteconfirm": "Are you sure you want to delete this job? This cannot be undone. ",
+				"deleteconfirm": "Are you sure you want to delete this Job? This cannot be undone. ",
 				"deletedelivery": "Delete Delivery Checklist",
 				"deleteintake": "Delete Intake Checklist",
 				"deliverchecklist": "Deliver Checklist",
@@ -1749,7 +1759,7 @@
 				"documents": "Documents",
 				"documents-images": "Images",
 				"documents-other": "Other Documents",
-				"duplicateconfirm": "Are you sure you want to duplicate this job? Some elements of this job will not be duplicated.",
+				"duplicateconfirm": "Are you sure you want to duplicate this Job? Some elements of this Job will not be duplicated.",
 				"emailaudit": "Email Audit Trail",
 				"employeeassignments": "Employee Assignments",
 				"estimatelines": "Estimate Lines",
@@ -1760,7 +1770,7 @@
 				"gppercent": "% G.P.",
 				"hrs_claimed": "Hours Claimed",
 				"hrs_total": "Hours Total",
-				"importnote": "The job was initially imported.",
+				"importnote": "The Job was initially imported.",
 				"inproduction": "In Production",
 				"intakechecklist": "Intake Checklist",
 				"iou": "IOU",
@@ -1793,9 +1803,9 @@
 					"calculatedcreditsnotreceived": "The calculated credits not received is derived by subtracting the amount of credit memos entered from the <b>retail</b> total of returns created. This does not take into account whether the credit was marked as received. You can find more information <a href=\"https://help.imex.online/en/article/credits-not-received-changes-1jy9snw\" target=\"_blank\">here</a>.",
 					"creditmemos": "The total <b>retail</b> amount of all returns created. This amount does not reflect credit memos that have been posted.",
 					"creditsnotreceived": "This total reflects the total <b>retail</b> of parts returns lines that have not been explicitly marked as returned when posting a credit memo. You can learn more about this here <a href=\"https://help.imex.online/en/article/credits-not-received-changes-1jy9snw\" target=\"_blank\">here</a>. ",
-					"discrep1": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>Too many bills/bill lines that have been posted against this RO. Check to make sure every bill posted on this RO is correctly posted and assigned.</li>\n<li>You do not have the latest supplement imported, or, a supplement must be submitted and then imported.</li>\n<li>You have posted a bill line to labor.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this job from reconciling.</i>",
-					"discrep2": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>Used an incorrect rate when deducting from labor.</li>\n<li>An outstanding imbalance higher in the reconciliation process.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this job from reconciling.</i>",
-					"discrep3": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>A parts order return has not been created.</li>\n<li>An outstanding imbalance higher in the reconciliation process.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this job from reconciling.</i>",
+					"discrep1": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>Too many bills/bill lines that have been posted against this RO. Check to make sure every bill posted on this RO is correctly posted and assigned.</li>\n<li>You do not have the latest supplement imported, or, a supplement must be submitted and then imported.</li>\n<li>You have posted a bill line to labor.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this Job from reconciling.</i>",
+					"discrep2": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>Used an incorrect rate when deducting from labor.</li>\n<li>An outstanding imbalance higher in the reconciliation process.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this Job from reconciling.</i>",
+					"discrep3": "If the discrepancy is not $0, you may have one of the following: <br/><br/>\n\n<ul>\n<li>A parts order return has not been created.</li>\n<li>An outstanding imbalance higher in the reconciliation process.</li>\n</ul>\n<br/>\n<i>There may be additional issues not listed above that prevent this Job from reconciling.</i>",
 					"laboradj": "The sum of all bill lines that deducted from labor hours, rather than part prices.",
 					"partstotal": "This is the total of all parts and sublet amounts on the vehicle (some of these may require an in-house invoice).<br/>\nItems such as shop and paint materials, labor online lines, etc. are not included in this total.",
 					"totalreturns": "The total <b>retail</b> amount of returns created for this job."
@@ -1826,13 +1836,13 @@
 				"sale_parts": "Sales - Parts",
 				"sale_sublet": "Sales - Sublet",
 				"sales": "Sales",
-				"savebeforeconversion": "You have unsaved changes on the job.  Please save them before converting it. ",
-				"scheduledinchange": "The scheduled in is based off the latest appointment. To change this date,  please schedule or reschedule the job. ",
+				"savebeforeconversion": "You have unsaved changes on the Job.  Please save them before converting it. ",
+				"scheduledinchange": "The scheduled in is based off the latest appointment. To change this date,  please schedule or reschedule the Job. ",
 				"specialcoveragepolicy": "Special Coverage Policy Applies",
 				"state_tax_amt": "Provincial/State Taxes",
 				"subletstotal": "Sublets Total",
 				"subtotal": "Subtotal",
-				"supplementnote": "The job had a supplement imported.",
+				"supplementnote": "The Job had a supplement imported.",
 				"suspended": "SUSPENDED",
 				"suspense": "Suspense",
 				"threshhold": "Max Threshold: ${{amount}}",
@@ -1841,16 +1851,16 @@
 				"total_repairs": "Total Repairs",
 				"total_sales": "Total Sales",
 				"totals": "Totals",
-				"unvoidnote": "This job was unvoided.",
+				"unvoidnote": "This Job was unvoided.",
 				"vehicle_info": "Vehicle",
 				"vehicleassociation": "Vehicle Association",
 				"viewallocations": "View Allocations",
-				"voidjob": "Are you sure you want to void this job? This cannot be easily undone. ",
-				"voidnote": "This job was voided."
+				"voidjob": "Are you sure you want to void this Job? This cannot be easily undone. ",
+				"voidnote": "This Job was voided."
 			},
 			"successes": {
 				"addedtoproduction": "Job added to production board.",
-				"all_deleted": "{{count}} jobs deleted successfully.",
+				"all_deleted": "{{count}} Jobs deleted successfully.",
 				"closed": "Job closed successfully.",
 				"converted": "Job converted successfully.",
 				"created": "Job created successfully. Click to view.",
@@ -2026,7 +2036,7 @@
 			},
 			"errors": {
 				"invalidphone": "The phone number is invalid.  Unable to open conversation. ",
-				"noattachedjobs": "No jobs have been associated to this conversation. ",
+				"noattachedjobs": "No Jobs have been associated to this conversation. ",
 				"updatinglabel": "Error updating label. {{error}}"
 			},
 			"labels": {
@@ -2035,7 +2045,7 @@
 				"maxtenimages": "You can only select up to a maximum of 10 images at a time.",
 				"messaging": "Messaging",
 				"noallowtxt": "This customer has not indicated their permission to be messaged.",
-				"nojobs": "Not associated to any job.",
+				"nojobs": "Not associated to any Job.",
 				"nopush": "Polling Mode Enabled",
 				"phonenumber": "Phone #",
 				"presets": "Presets",
@@ -2044,6 +2054,9 @@
 				"sentby": "Sent by {{by}} at {{time}}",
 				"typeamessage": "Send a message...",
 				"unarchive": "Unarchive"
+			},
+			"render": {
+				"conversation_list": "Conversation List"
 			}
 		},
 		"notes": {
@@ -2202,7 +2215,7 @@
 				"parts_orders": "Parts Orders",
 				"print": "Show Printed Form",
 				"receive": "Receive Parts Order",
-				"removefrompartsqueue": "Remove from Parts Queue?",
+				"removefrompartsqueue": "Unqueue from Parts Queue?",
 				"returnpartsorder": "Return Parts Order",
 				"sublet_order": "Sublet Order"
 			},
@@ -2455,15 +2468,15 @@
 				"unsuspend": "Unsuspend"
 			},
 			"errors": {
-				"boardupdate": "Error encountered updating job. {{message}}",
+				"boardupdate": "Error encountered updating Job. {{message}}",
 				"removing": "Error removing from production board. {{error}}",
 				"settings": "Error saving board settings: {{error}}"
 			},
 			"labels": {
 				"actual_in": "Actual In",
 				"alert": "Alert",
-				"alertoff": "Remove alert from job",
-				"alerton": "Add alert to job",
+				"alertoff": "Remove alert from Job",
+				"alerton": "Add alert to Job",
 				"ats": "Alternative Transportation",
 				"bodyhours": "B",
 				"bodypriority": "B/P",
@@ -2674,9 +2687,9 @@
 				"edit": "Edit"
 			},
 			"errors": {
-				"adding": "Error adding job to scoreboard. {{message}}",
-				"removing": "Error removing job from scoreboard. {{message}}",
-				"updating": "Error updating scoreboard. {{message}}"
+				"adding": "Error adding Job to Scoreboard. {{message}}",
+				"removing": "Error removing Job from Scoreboard. {{message}}",
+				"updating": "Error updating Scoreboard. {{message}}"
 			},
 			"fields": {
 				"bodyhrs": "Body Hours",
@@ -2695,6 +2708,7 @@
 				"efficiencyoverperiod": "Efficiency over Selected Dates",
 				"entries": "Scoreboard Entries",
 				"jobs": "Jobs",
+				"jobscompletednotinvoiced": "Completed Not Invoiced",
 				"lastmonth": "Last Month",
 				"lastweek": "Last Week",
 				"monthlytarget": "Monthly",
@@ -2709,6 +2723,7 @@
 				"timetickets": "Time Tickets",
 				"timeticketsemployee": "Time Tickets by Employee",
 				"todateactual": "Actual (MTD)",
+				"totalhrs": "Total Hours",
 				"totaloverperiod": "Total over Selected Dates",
 				"weeklyactual": "Actual (W)",
 				"weeklytarget": "Weekly",
@@ -2774,7 +2789,7 @@
 				"ro_number": "Job to Post Against"
 			},
 			"labels": {
-				"alreadyclockedon": "You are already clocked in to the following job(s):",
+				"alreadyclockedon": "You are already clocked in to the following Job(s):",
 				"ambreak": "AM Break",
 				"amshift": "AM Shift",
 				"clockhours": "Shift Clock Hours Summary",

client/src/translations/es/common.json

@@ -103,6 +103,7 @@
 				"admin_jobmarkforreexport": "",
 				"admin_jobuninvoice": "",
 				"admin_jobunvoid": "",
+				"alerttoggle": "",
 				"appointmentcancel": "",
 				"appointmentinsert": "",
 				"billposted": "",
@@ -111,6 +112,7 @@
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
+				"jobinvoiced": "",
 				"jobconverted": "",
 				"jobfieldchanged": "",
 				"jobimported": "",
@@ -203,6 +205,7 @@
 				"entered_total": "",
 				"enteringcreditmemo": "",
 				"federal_tax": "",
+				"federal_tax_exempt": "",
 				"generatepartslabel": "",
 				"iouexists": "",
 				"local_tax": "",
@@ -211,6 +214,7 @@
 				"new": "",
 				"noneselected": "",
 				"onlycmforinvoiced": "",
+				"printlabels": "",
 				"retailtotal": "",
 				"savewithdiscrepancy": "",
 				"state_tax": "",
@@ -447,6 +451,7 @@
 						"config": "",
 						"dashboard": "",
 						"rbac": "",
+						"reportcenter": "",
 						"templates": "",
 						"vendors": ""
 					},
@@ -781,6 +786,7 @@
 				"notes": "",
 				"plate": "",
 				"purchasedate": "",
+				"readiness": "",
 				"registrationexpires": "",
 				"serviceenddate": "",
 				"servicestartdate": "",
@@ -817,6 +823,10 @@
 			},
 			"successes": {
 				"saved": ""
+			},
+			"readiness": {
+				"notready": "",
+				"ready": ""
 			}
 		},
 		"csi": {
@@ -2044,6 +2054,9 @@
 				"sentby": "",
 				"typeamessage": "Enviar un mensaje...",
 				"unarchive": ""
+			},
+			"render": {
+				"conversation_list": ""
 			}
 		},
 		"notes": {
@@ -2695,6 +2708,7 @@
 				"efficiencyoverperiod": "",
 				"entries": "",
 				"jobs": "",
+				"jobscompletednotinvoiced": "",
 				"lastmonth": "",
 				"lastweek": "",
 				"monthlytarget": "",
@@ -2709,6 +2723,7 @@
 				"timetickets": "",
 				"timeticketsemployee": "",
 				"todateactual": "",
+				"totalhrs": "",
 				"totaloverperiod": "",
 				"weeklyactual": "",
 				"weeklytarget": "",

client/src/translations/fr/common.json

@@ -103,6 +103,7 @@
 				"admin_jobmarkforreexport": "",
 				"admin_jobuninvoice": "",
 				"admin_jobunvoid": "",
+				"alerttoggle": "",
 				"appointmentcancel": "",
 				"appointmentinsert": "",
 				"billposted": "",
@@ -111,6 +112,7 @@
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
+				"jobinvoiced": "",
 				"jobconverted": "",
 				"jobfieldchanged": "",
 				"jobimported": "",
@@ -203,6 +205,7 @@
 				"entered_total": "",
 				"enteringcreditmemo": "",
 				"federal_tax": "",
+				"federal_tax_exempt": "",
 				"generatepartslabel": "",
 				"iouexists": "",
 				"local_tax": "",
@@ -211,6 +214,7 @@
 				"new": "",
 				"noneselected": "",
 				"onlycmforinvoiced": "",
+				"printlabels": "",
 				"retailtotal": "",
 				"savewithdiscrepancy": "",
 				"state_tax": "",
@@ -447,6 +451,7 @@
 						"config": "",
 						"dashboard": "",
 						"rbac": "",
+						"reportcenter": "",
 						"templates": "",
 						"vendors": ""
 					},
@@ -781,6 +786,7 @@
 				"notes": "",
 				"plate": "",
 				"purchasedate": "",
+				"readiness": "",
 				"registrationexpires": "",
 				"serviceenddate": "",
 				"servicestartdate": "",
@@ -817,6 +823,10 @@
 			},
 			"successes": {
 				"saved": ""
+			},
+			"readiness": {
+				"notready": "",
+				"ready": ""
 			}
 		},
 		"csi": {
@@ -2044,6 +2054,9 @@
 				"sentby": "",
 				"typeamessage": "Envoyer un message...",
 				"unarchive": ""
+			},
+			"render": {
+				"conversation_list": ""
 			}
 		},
 		"notes": {
@@ -2695,6 +2708,7 @@
 				"efficiencyoverperiod": "",
 				"entries": "",
 				"jobs": "",
+				"jobscompletednotinvoiced": "",
 				"lastmonth": "",
 				"lastweek": "",
 				"monthlytarget": "",
@@ -2709,6 +2723,7 @@
 				"timetickets": "",
 				"timeticketsemployee": "",
 				"todateactual": "",
+				"totalhrs": "",
 				"totaloverperiod": "",
 				"weeklyactual": "",
 				"weeklytarget": "",

client/src/utils/AuditTrailMappings.js

@@ -1,6 +1,7 @@
 import i18n from "i18next";
 
 const AuditTrailMapping = {
+  alertToggle: (status) => i18n.t("audit_trail.messages.alerttoggle", { status }),
   appointmentcancel: (lost_sale_reason) =>
     i18n.t("audit_trail.messages.appointmentcancel", { lost_sale_reason }),
   appointmentinsert: (start) =>
@@ -11,6 +12,8 @@ const AuditTrailMapping = {
     "ADMIN: " + i18n.t("audit_trail.messages.jobstatuschange", { status }),
   jobsupplement: () => i18n.t("audit_trail.messages.jobsupplement"),
   jobimported: () => i18n.t("audit_trail.messages.jobimported"),
+  jobinvoiced: () =>
+  i18n.t("audit_trail.messages.jobinvoiced"),
   jobconverted: (ro_number) =>
     i18n.t("audit_trail.messages.jobconverted", { ro_number }),
   jobfieldchange: (field, value) =>

client/src/utils/TemplateConstants.js

@@ -2102,6 +2102,17 @@ export const TemplateList = (type, context) => {
           // },
         }
       : {}),
+    ...(!type || type === "messaging"
+      ? {
+          conversation_list: {
+            title: i18n.t("messaging.render.conversation_list"),
+            description: "",
+            subject: i18n.t("messaging.render.conversation_list"),
+            key: "conversation_list",
+            disabled: false,
+          },
+        }
+      : {}),
     ...(!type || type === "vendor"
       ? {
           purchases_by_vendor_detailed: {

client/src/utils/config.js

@@ -0,0 +1,4 @@
+
+// Sometimes referred to as PageSize, this variable controls the amount of records
+// to show on one page during pagination.
+export const pageLimit = 50;

hasura/metadata/tables.yaml

@@ -1388,60 +1388,62 @@
                 - active:
                     _eq: true
         columns:
-          - id
-          - created_at
-          - updated_at
           - bodyshopid
-          - make
-          - model
-          - year
-          - plate
           - color
-          - vin
-          - fleetnumber
-          - purchasedate
-          - servicestartdate
-          - serviceenddate
-          - leaseenddate
-          - status
-          - nextservicekm
-          - nextservicedate
-          - damage
-          - notes
-          - fuel
-          - registrationexpires
-          - insuranceexpires
+          - created_at
           - dailycost
+          - damage
+          - fleetnumber
+          - fuel
+          - id
+          - insuranceexpires
+          - leaseenddate
+          - make
           - mileage
+          - model
+          - nextservicedate
+          - nextservicekm
+          - notes
+          - plate
+          - purchasedate
+          - readiness
+          - registrationexpires
+          - serviceenddate
+          - servicestartdate
+          - status
+          - updated_at
+          - vin
+          - year
   select_permissions:
     - role: user
       permission:
         columns:
+          - bodyshopid
+          - color
+          - created_at
+          - dailycost
+          - damage
+          - fleetnumber
+          - fuel
+          - id
           - insuranceexpires
           - leaseenddate
+          - make
+          - mileage
+          - model
           - nextservicedate
+          - nextservicekm
+          - notes
+          - plate
           - purchasedate
+          - readiness
           - registrationexpires
           - serviceenddate
           - servicestartdate
-          - dailycost
-          - fuel
-          - mileage
-          - nextservicekm
-          - color
-          - damage
-          - fleetnumber
-          - make
-          - model
-          - notes
-          - plate
           - status
+          - updated_at
           - vin
           - year
-          - created_at
-          - updated_at
-          - bodyshopid
-          - id
         filter:
           bodyshop:
             associations:
@@ -1456,31 +1458,32 @@
     - role: user
       permission:
         columns:
+          - bodyshopid
+          - color
+          - created_at
+          - dailycost
+          - damage
+          - fleetnumber
+          - fuel
+          - id
           - insuranceexpires
           - leaseenddate
+          - make
+          - mileage
+          - model
           - nextservicedate
+          - nextservicekm
+          - notes
+          - plate
           - purchasedate
+          - readiness
           - registrationexpires
           - serviceenddate
           - servicestartdate
-          - dailycost
-          - fuel
-          - mileage
-          - nextservicekm
-          - color
-          - damage
-          - fleetnumber
-          - make
-          - model
-          - notes
-          - plate
           - status
+          - updated_at
           - vin
           - year
-          - created_at
-          - updated_at
-          - bodyshopid
-          - id
         filter:
           bodyshop:
             associations:
@@ -2020,24 +2023,24 @@
                   - active:
                       _eq: true
         columns:
-          - labor_rates
-          - percentage
           - created_at
-          - updated_at
           - employeeid
           - id
+          - labor_rates
+          - percentage
           - teamid
+          - updated_at
   select_permissions:
     - role: user
       permission:
         columns:
-          - labor_rates
-          - percentage
           - created_at
-          - updated_at
           - employeeid
           - id
+          - labor_rates
+          - percentage
           - teamid
+          - updated_at
         filter:
           employee_team:
             bodyshop:
@@ -2052,13 +2055,13 @@
     - role: user
       permission:
         columns:
-          - labor_rates
-          - percentage
           - created_at
-          - updated_at
           - employeeid
           - id
+          - labor_rates
+          - percentage
           - teamid
+          - updated_at
         filter:
           employee_team:
             bodyshop:
@@ -2120,21 +2123,23 @@
                     _eq: true
         columns:
           - active
-          - name
-          - created_at
-          - updated_at
           - bodyshopid
+          - created_at
           - id
+          - max_load
+          - name
+          - updated_at
   select_permissions:
     - role: user
       permission:
         columns:
           - active
-          - name
-          - created_at
-          - updated_at
           - bodyshopid
+          - created_at
           - id
+          - max_load
+          - name
+          - updated_at
         filter:
           bodyshop:
             associations:
@@ -2150,6 +2155,7 @@
         columns:
           - active
           - bodyshopid
+          - max_load
           - name
           - updated_at
         filter:

hasura/migrations/1701307239375_alter_table_public_courtesycars_alter_column_nextservicekm/down.sql

@@ -0,0 +1,2 @@
+alter table "public"."courtesycars" alter column "nextservicekm" set not null;
+alter table "public"."courtesycars" alter column "nextservicekm" set default '0';

hasura/migrations/1701307239375_alter_table_public_courtesycars_alter_column_nextservicekm/up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "public"."courtesycars" ALTER COLUMN "nextservicekm" drop default;
+alter table "public"."courtesycars" alter column "nextservicekm" drop not null;

hasura/migrations/1703706449547_alter_table_public_courtesycars_add_column_readiness/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"."courtesycars" add column "readiness" text
+--  null;

hasura/migrations/1703706449547_alter_table_public_courtesycars_add_column_readiness/up.sql

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

hasura/migrations/1704401074280_alter_table_public_employee_team_members_add_column_max_load/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"."employee_team_members" add column "max_load" numeric
+--  not null default '10000';

hasura/migrations/1704401074280_alter_table_public_employee_team_members_add_column_max_load/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."employee_team_members" add column "max_load" numeric
+ not null default '10000';

hasura/migrations/1704403786392_alter_table_public_employee_team_members_drop_column_max_load/down.sql

@@ -0,0 +1,3 @@
+alter table "public"."employee_team_members" alter column "max_load" set default '10000'::numeric;
+alter table "public"."employee_team_members" alter column "max_load" drop not null;
+alter table "public"."employee_team_members" add column "max_load" numeric;

hasura/migrations/1704403786392_alter_table_public_employee_team_members_drop_column_max_load/up.sql

@@ -0,0 +1 @@
+alter table "public"."employee_team_members" drop column "max_load" cascade;

hasura/migrations/1704403846373_alter_table_public_employee_teams_add_column_max_load/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"."employee_teams" add column "max_load" numeric
+--  not null default '10000';

hasura/migrations/1704403846373_alter_table_public_employee_teams_add_column_max_load/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."employee_teams" add column "max_load" numeric
+ not null default '10000';

libs/awsUtils.js

@@ -0,0 +1,56 @@
+require("dotenv").config({
+    path: require("path").resolve(
+        process.cwd(),
+        `.env.${process.env.NODE_ENV || "development"}`
+    ),
+});
+const {isNil} = require('lodash');
+const aws4 = require("aws4");
+const {Connection, Client} = require("@opensearch-project/opensearch");
+const {defaultProvider} = require("@aws-sdk/credential-provider-node");
+
+const createAwsConnector = (credentials, region) => {
+    class AmazonConnection extends Connection {
+        buildRequestObject(params) {
+            const request = super.buildRequestObject(params);
+            request.service = "es";
+            request.region = region;
+            request.headers = request.headers || {};
+            request.headers["host"] = request.hostname;
+
+            return aws4.sign(request, credentials);
+        }
+    }
+    return {
+        Connection: AmazonConnection,
+    };
+};
+
+const getClient = async () => {
+
+    // We have manual configuration for OpenSearch,
+    // Return a client using these custom credentials
+    if (
+        !isNil(process.env.OPEN_SEARCH_PASSWORD) &&
+        !isNil(process.env.OPEN_SEARCH_USER) &&
+        !isNil(process.env.OPEN_SEARCH_HOST) &&
+        !isNil(process.env.OPEN_SEARCH_PROTOCOL)
+    ) {
+        // The URI is currently being stored in its entirety, so strip protocol prior to rebuilding it.
+        const hostUrl = process.env.OPEN_SEARCH_HOST.replace(/^https?:\/\//i, '');
+        const node = `${process.env.OPEN_SEARCH_PROTOCOL}://${process.env.OPEN_SEARCH_USER}:${process.env.OPEN_SEARCH_PASSWORD}@${hostUrl}`;
+
+        return new Client({
+            node,
+        });
+    }
+
+    // Default to the AWS Credentials Provider.
+    const credentials = await defaultProvider()();
+    return new Client({
+        ...createAwsConnector(credentials, "ca-central-1"),
+        node: process.env.OPEN_SEARCH_HOST,
+    });
+};
+
+module.exports = { getClient };

os-loader.js

@@ -1,59 +1,17 @@
-const Dinero = require("dinero.js");
-
-//const client = require("../graphql-client/graphql-client").client;
-const _ = require("lodash");
-const GraphQLClient = require("graphql-request").GraphQLClient;
-const logger = require("./server/utils/logger");
-
-const path = require("path");
-const client = require("./server/graphql-client/graphql-client").client;
 require("dotenv").config({
-  path: path.resolve(
-    process.cwd(),
-    `.env.${process.env.NODE_ENV || "development"}`
+  path: require("path").resolve(
+      process.cwd(),
+      `.env.${process.env.NODE_ENV || "development"}`
   ),
 });
-const { Client, Connection } = require("@opensearch-project/opensearch");
-const { defaultProvider } = require("@aws-sdk/credential-provider-node");
-const aws4 = require("aws4");
-const { gql } = require("graphql-request");
-const gqlclient = require("./server/graphql-client/graphql-client").client;
-// const osClient = new Client({
-//   node: `https://imex:Wl0d8k@!@search-imexonline-search-ixp2stfvwp6qocjsowzjzyreoy.ca-central-1.es.amazonaws.com/`,
-// });
 
-var host = process.env.OPEN_SEARCH_HOST; // e.g. https://my-domain.region.es.amazonaws.com
-const createAwsConnector = (credentials, region) => {
-  class AmazonConnection extends Connection {
-    buildRequestObject(params) {
-      const request = super.buildRequestObject(params);
-      request.service = "es";
-      request.region = region;
-      request.headers = request.headers || {};
-      request.headers["host"] = request.hostname;
-
-      return aws4.sign(request, credentials);
-    }
-  }
-  return {
-    Connection: AmazonConnection,
-  };
-};
-
-const getClient = async () => {
-  const credentials = await defaultProvider()();
-  return new Client({
-    ...createAwsConnector(credentials, "ca-central-1"),
-    node: host,
-  });
-};
+const {omit} = require("lodash");
+const gqlClient = require("./server/graphql-client/graphql-client").client;
+const getClient = require('./libs/awsUtils');
 
 async function OpenSearchUpdateHandler(req, res) {
   try {
-    var osClient = await getClient();
-    // const osClient = new Client({
-    //   node: `https://imex:password@search-imexonline-search-ixp2stfvwp6qocjsowzjzyreoy.ca-central-1.es.amazonaws.com`,
-    // });
+    const osClient = await getClient();
 
     //Clear out all current documents
     // const deleteResult = await osClient.deleteByQuery({
@@ -67,11 +25,11 @@ async function OpenSearchUpdateHandler(req, res) {
 
     // return;
 
-    var batchSize = 1000;
-    var promiseQueue = [];
+    const batchSize = 1000;
+    const promiseQueue = [];
 
     //Jobs Load.
-    const jobsData = await gqlclient.request(`query{jobs{
+    const jobsData = await gqlClient.request(`query{jobs{
           id
           bodyshopid:shopid
           clm_no
@@ -105,7 +63,7 @@ async function OpenSearchUpdateHandler(req, res) {
     }
 
     //Owner Load
-    const ownersData = await gqlclient.request(`{
+    const ownersData = await gqlClient.request(`{
       owners {
         id
         bodyshopid: shopid
@@ -131,7 +89,7 @@ async function OpenSearchUpdateHandler(req, res) {
     }
 
     //Vehicles
-    const vehiclesData = await gqlclient.request(`{
+    const vehiclesData = await gqlClient.request(`{
       vehicles {
         id
         bodyshopid: shopid
@@ -158,7 +116,7 @@ async function OpenSearchUpdateHandler(req, res) {
     }
 
     //payments
-    const paymentsData = await gqlclient.request(`{
+    const paymentsData = await gqlClient.request(`{
       payments {
         id
         amount
@@ -198,7 +156,7 @@ async function OpenSearchUpdateHandler(req, res) {
       slicedArray.forEach((payment) => {
         bulkOperation.push({ index: { _index: "payments", _id: payment.id } });
         bulkOperation.push({
-          ..._.omit(payment, ["job"]),
+          ...omit(payment, ["job"]),
           bodyshopid: payment.job.bodyshopid,
         });
       });
@@ -206,7 +164,7 @@ async function OpenSearchUpdateHandler(req, res) {
     }
 
     //bills
-    const billsData = await gqlclient.request(`{
+    const billsData = await gqlClient.request(`{
       bills {
         id
         date
@@ -235,7 +193,7 @@ async function OpenSearchUpdateHandler(req, res) {
       slicedArray.forEach((bill) => {
         bulkOperation.push({ index: { _index: "bills", _id: bill.id } });
         bulkOperation.push({
-          ..._.omit(bill, ["job"]),
+          ...omit(bill, ["job"]),
           bodyshopid: bill.job.bodyshopid,
         });
       });

server.js

@@ -34,6 +34,10 @@ const io = new Server(server, {
       "http://localhost:3000",
       "https://imex.online",
       "https://www.imex.online",
+      "https://beta.test.imex.online",
+      "https://www.beta.test.imex.online",
+      "https://beta.imex.online",
+      "https://www.beta.imex.online",
     ],
     methods: ["GET", "POST"],
     credentials: true,
@@ -224,6 +228,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("/data/kaizen", data.kaizen);
 app.post("/record-handler/arms", data.arms);
 
 var taskHandler = require("./server/tasks/tasks");

server/data/claimscorp.js

@@ -507,7 +507,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         Body: repairCosts.BodyLaborTotalCost.toFormat(CCDineroFormat),
         Paint: repairCosts.RefinishLaborTotalCost.toFormat(CCDineroFormat),
         Prep: Dinero().toFormat(CCDineroFormat),
-        Frame: Dinero(job.job_totals.rates.laf.total).toFormat(CCDineroFormat),
+        Frame: repairCosts.FrameLaborTotalCost.toFormat(CCDineroFormat),
         Mech: repairCosts.MechanicalLaborTotalCost.toFormat(CCDineroFormat),
         Glass: repairCosts.GlassLaborTotalCost.toFormat(CCDineroFormat),
         Elec: repairCosts.ElectricalLaborTotalCost.toFormat(CCDineroFormat),

server/data/data.js

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

server/data/kaizen.js

@@ -0,0 +1,837 @@
+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 DineroFormat = "0,0.00";
+const DateFormat = "MM/DD/YYYY";
+
+const repairOpCodes = ["OP4", "OP9", "OP10"];
+const replaceOpCodes = ["OP2", "OP5", "OP11", "OP12"];
+
+const ftpSetup = {
+  host: process.env.KAIZEN_HOST,
+  port: process.env.KAIZEN_PORT,
+  username: process.env.KAIZEN_USER,
+  password: process.env.KAIZEN_PASSWORD,
+  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
+  algorithms: {
+    serverHostKey: [
+      "ssh-rsa",
+      "ssh-dss",
+      "rsa-sha2-256",
+      "rsa-sha2-512",
+      "ecdsa-sha2-nistp256",
+      "ecdsa-sha2-nistp384",
+    ],
+  },
+};
+
+exports.default = async (req, res) => {
+  //Query for the List of Bodyshop Clients.
+  logger.log("kaizen-start", "DEBUG", "api", null, null);
+  const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE"];
+
+  const { bodyshops } = await client.request(queries.GET_KAIZEN_SHOPS, {
+    imexshopid: kaizenShopsIDs,
+  });
+
+  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("kaizen-start-shop-extract", "DEBUG", "api", bodyshop.id, {
+        shopname: bodyshop.shopname,
+      });
+      const erroredJobs = [];
+      try {
+        const { jobs, bodyshops_by_pk } = await client.request(
+          queries.KAIZEN_QUERY,
+          {
+            bodyshopid: bodyshop.id,
+            start: start
+              ? moment(start).startOf("hours")
+              : moment().subtract(2, "hours").startOf("hour"),
+            ...(end && { end: moment(end).endOf("hours") }),
+          }
+        );
+
+        const kaizenObject = {
+          DataFeed: {
+            ShopInfo: {
+              ShopName: bodyshops_by_pk.shopname,
+              Jobs: 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("kaizen-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,
+            },
+            kaizenObject
+          )
+          .end({ allowEmptyTags: true });
+
+        allxmlsToUpload.push({
+          count: kaizenObject.DataFeed.ShopInfo.Jobs.length,
+          xml: ret,
+          filename: `${bodyshop.shopname}-${moment().format(
+            "YYYYMMDDTHHMMss"
+          )}.xml`,
+        });
+
+        logger.log("kaizen-end-shop-extract", "DEBUG", "api", bodyshop.id, {
+          shopname: bodyshop.shopname,
+        });
+      } catch (error) {
+        //Error at the shop level.
+        logger.log("kaizen-error-shop", "ERROR", "api", bodyshop.id, {
+          ...error,
+        });
+
+        allErrors.push({
+          bodyshopid: bodyshop.id,
+          imexshopid: bodyshop.imexshopid,
+          shopname: bodyshop.shopname,
+          fatal: true,
+          errors: [error.toString()],
+        });
+      } finally {
+        allErrors.push({
+          bodyshopid: bodyshop.id,
+          imexshopid: bodyshop.imexshopid,
+          shopname: bodyshop.shopname,
+          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: `Kaizen 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("kaizen-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("kaizen-sftp-upload", "DEBUG", "api", null, {
+          filename: xmlObj.filename,
+        });
+
+        const uploadResult = await sftp.put(
+          Buffer.from(xmlObj.xml),
+          `/${xmlObj.filename}`
+        );
+        logger.log("kaizen-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("kaizen-sftp-error", "ERROR", "api", null, {
+        ...error,
+      });
+    } finally {
+      sftp.end();
+    }
+    sendServerEmail({
+      subject: `Kaizen 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);
+
+  try {
+    const ret = {
+      JobID: job.id,
+      RoNumber: job.ro_number,
+      JobStatus: job.tlos_ind
+        ? "Total Loss"
+        : job.ro_number
+        ? job.status
+        : "Estimate",
+      Customer: {
+        CompanyName: job.ownr_co_nm?.trim() || "",
+        FirstName: job.ownr_fn?.trim() || "",
+        LastName: job.ownr_ln?.trim() || "",
+        Address1: job.ownr_addr1?.trim() || "",
+        Address2: job.ownr_addr2?.trim() || "",
+        City: job.ownr_city?.trim() || "",
+        State: job.ownr_st?.trim() || "",
+        Zip: job.ownr_zip?.trim() || "",
+      },
+      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?.v_bstyle || "",
+        Color: job.v_color || "",
+        VIN: job.v_vin || "",
+        PlateNo: job.plate_no || "",
+      },
+      InsuranceCompany: job.ins_co_nm || "",
+      Claim: job.clm_no || "",
+      Contacts: {
+        CSR: 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
+                : ""
+            }`
+          : "",
+        Estimator: `${job.est_ct_ln ? job.est_ct_ln : ""}${
+          job.est_ct_ln ? ", " : ""
+        }${job.est_ct_fn ? job.est_ct_fn : ""}`,
+      },
+      Dates: {
+        DateEstimated:
+          (job.date_estimated &&
+            moment(job.date_estimated).format(DateFormat)) ||
+          "",
+        DateOpened:
+          (job.date_opened && moment(job.date_opened).format(DateFormat)) || "",
+        DateScheduled:
+          (job.scheduled_in &&
+            moment(job.scheduled_in)
+              .tz(job.bodyshop.timezone)
+              .format(DateFormat)) ||
+          "",
+        DateArrived:
+          (job.actual_in &&
+            moment(job.actual_in)
+              .tz(job.bodyshop.timezone)
+              .format(DateFormat)) ||
+          "",
+        DateStart: job.date_repairstarted
+          ? (job.date_repairstarted &&
+              moment(job.date_repairstarted)
+                .tz(job.bodyshop.timezone)
+                .format(DateFormat)) ||
+            ""
+          : (job.actual_in &&
+              moment(job.actual_in)
+                .tz(job.bodyshop.timezone)
+                .format(DateFormat)) ||
+            "",
+        DateScheduledCompletion:
+          (job.scheduled_completion &&
+            moment(job.scheduled_completion)
+              .tz(job.bodyshop.timezone)
+              .format(DateFormat)) ||
+          "",
+        DateCompleted:
+          (job.actual_completion &&
+            moment(job.actual_completion)
+              .tz(job.bodyshop.timezone)
+              .format(DateFormat)) ||
+          "",
+        DateScheduledDelivery:
+          (job.scheduled_delivery &&
+            moment(job.scheduled_delivery)
+              .tz(job.bodyshop.timezone)
+              .format(DateFormat)) ||
+          "",
+        DateDelivered:
+          (job.actual_delivery &&
+            moment(job.actual_delivery)
+              .tz(job.bodyshop.timezone)
+              .format(DateFormat)) ||
+          "",
+        DateInvoiced:
+          (job.date_invoiced &&
+            moment(job.date_invoiced)
+              .tz(job.bodyshop.timezone)
+              .format(DateFormat)) ||
+          "",
+        DateExported:
+          (job.date_exported &&
+            moment(job.date_exported)
+              .tz(job.bodyshop.timezone)
+              .format(DateFormat)) ||
+          "",
+      },
+      Sales: {
+        Labour: {
+          Aluminum: Dinero(job.job_totals.rates.laa.total).toFormat(
+            DineroFormat
+          ),
+          Body: Dinero(job.job_totals.rates.lab.total).toFormat(DineroFormat),
+          Diagnostic: Dinero(job.job_totals.rates.lad.total).toFormat(
+            DineroFormat
+          ),
+          Electrical: Dinero(job.job_totals.rates.lae.total).toFormat(
+            DineroFormat
+          ),
+          Frame: Dinero(job.job_totals.rates.laf.total).toFormat(DineroFormat),
+          Glass: Dinero(job.job_totals.rates.lag.total).toFormat(DineroFormat),
+          Mechanical: Dinero(job.job_totals.rates.lam.total).toFormat(
+            DineroFormat
+          ),
+          OtherLabour: 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))
+            .toFormat(DineroFormat),
+          Refinish: Dinero(job.job_totals.rates.lar.total).toFormat(
+            DineroFormat
+          ),
+          Structural: Dinero(job.job_totals.rates.las.total).toFormat(
+            DineroFormat
+          ),
+        },
+        Materials: {
+          Body: Dinero(job.job_totals.rates.mash.total).toFormat(DineroFormat),
+          Refinish: Dinero(job.job_totals.rates.mapa.total).toFormat(
+            DineroFormat
+          ),
+        },
+        Parts: {
+          Aftermarket: Dinero(
+            job.job_totals.parts.parts.list.PAA &&
+              job.job_totals.parts.parts.list.PAA.total
+          ).toFormat(DineroFormat),
+          LKQ: Dinero(
+            job.job_totals.parts.parts.list.PAL &&
+              job.job_totals.parts.parts.list.PAL.total
+          ).toFormat(DineroFormat),
+          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(DineroFormat),
+          OtherParts: Dinero(
+            job.job_totals.parts.parts.list.PAO &&
+              job.job_totals.parts.parts.list.PAO.total
+          ).toFormat(DineroFormat),
+          Reconditioned: Dinero(
+            job.job_totals.parts.parts.list.PAM &&
+              job.job_totals.parts.parts.list.PAM.total
+          ).toFormat(DineroFormat),
+          TotalParts: Dinero(
+            job.job_totals.parts.parts.list.PAA &&
+              job.job_totals.parts.parts.list.PAA.total
+          )
+            .add(
+              Dinero(
+                job.job_totals.parts.parts.list.PAL &&
+                  job.job_totals.parts.parts.list.PAL.total
+              )
+            )
+            .add(
+              Dinero(
+                job.job_totals.parts.parts.list.PAN &&
+                  job.job_totals.parts.parts.list.PAN.total
+              )
+            )
+            .add(
+              Dinero(
+                job.job_totals.parts.parts.list.PAO &&
+                  job.job_totals.parts.parts.list.PAO.total
+              )
+            )
+            .add(
+              Dinero(
+                job.job_totals.parts.parts.list.PAM &&
+                  job.job_totals.parts.parts.list.PAM.total
+              )
+            )
+            .toFormat(DineroFormat),
+        },
+        OtherSales: Dinero(job.job_totals.additional.storage).toFormat(
+          DineroFormat
+        ),
+        Sublet: Dinero(job.job_totals.parts.sublets.total).toFormat(
+          DineroFormat
+        ),
+        Towing: Dinero(job.job_totals.additional.towing).toFormat(DineroFormat),
+        ATS:
+          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(DineroFormat)
+            : Dinero().toFormat(DineroFormat),
+        SaleSubtotal: Dinero(job.job_totals.totals.subtotal).toFormat(
+          DineroFormat
+        ),
+        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(DineroFormat),
+        SaleTotal: Dinero(job.job_totals.totals.total_repairs).toFormat(
+          DineroFormat
+        ),
+      },
+      SaleHours: {
+        Aluminum: job.job_totals.rates.laa.hours.toFixed(2),
+        Body: job.job_totals.rates.lab.hours.toFixed(2),
+        Diagnostic: job.job_totals.rates.lad.hours.toFixed(2),
+        Electrical: job.job_totals.rates.lae.hours.toFixed(2),
+        Frame: job.job_totals.rates.laf.hours.toFixed(2),
+        Glass: job.job_totals.rates.lag.hours.toFixed(2),
+        Mechanical: job.job_totals.rates.lam.hours.toFixed(2),
+        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
+        ).toFixed(2),
+        Refinish: job.job_totals.rates.lar.hours.toFixed(2),
+        Structural: job.job_totals.rates.las.hours.toFixed(2),
+        TotalHours: job.joblines
+          .reduce((acc, val) => acc + val.mod_lb_hrs, 0)
+          .toFixed(2),
+      },
+      Costs: {
+        Labour: {
+          Aluminum: repairCosts.AluminumLabourTotalCost.toFormat(DineroFormat),
+          Body: repairCosts.BodyLabourTotalCost.toFormat(DineroFormat),
+          Diagnostic:
+            repairCosts.DiagnosticLabourTotalCost.toFormat(DineroFormat),
+          Electrical:
+            repairCosts.ElectricalLabourTotalCost.toFormat(DineroFormat),
+          Frame: repairCosts.FrameLabourTotalCost.toFormat(DineroFormat),
+          Glass: repairCosts.GlassLabourTotalCost.toFormat(DineroFormat),
+          Mechancial:
+            repairCosts.MechanicalLabourTotalCost.toFormat(DineroFormat),
+          OtherLabour: repairCosts.LabourMiscTotalCost.toFormat(DineroFormat),
+          Refinish: repairCosts.RefinishLabourTotalCost.toFormat(DineroFormat),
+          Structural:
+            repairCosts.StructuralLabourTotalCost.toFormat(DineroFormat),
+          TotalLabour: repairCosts.LabourTotalCost.toFormat(DineroFormat),
+        },
+        Materials: {
+          Body: repairCosts.BMTotalCost.toFormat(DineroFormat),
+          Refinish: repairCosts.PMTotalCost.toFormat(DineroFormat),
+        },
+        Parts: {
+          Aftermarket: repairCosts.PartsAMCost.toFormat(DineroFormat),
+          LKQ: repairCosts.PartsRecycledCost.toFormat(DineroFormat),
+          OEM: repairCosts.PartsOemCost.toFormat(DineroFormat),
+          OtherCost: repairCosts.PartsOtherCost.toFormat(DineroFormat),
+          Reconditioned:
+            repairCosts.PartsReconditionedCost.toFormat(DineroFormat),
+          TotalParts: repairCosts.PartsAMCost.add(repairCosts.PartsRecycledCost)
+            .add(repairCosts.PartsReconditionedCost)
+            .add(repairCosts.PartsOemCost)
+            .add(repairCosts.PartsOtherCost)
+            .toFormat(DineroFormat),
+        },
+        Sublet: repairCosts.SubletTotalCost.toFormat(DineroFormat),
+        Towing: repairCosts.TowingTotalCost.toFormat(DineroFormat),
+        ATS: Dinero().toFormat(DineroFormat),
+        Storage: repairCosts.StorageTotalCost.toFormat(DineroFormat),
+        CostTotal: repairCosts.TotalCost.toFormat(DineroFormat),
+      },
+      CostHours: {
+        Aluminum: repairCosts.AluminumLabourTotalHrs.toFixed(2),
+        Body: repairCosts.BodyLabourTotalHrs.toFixed(2),
+        Diagnostic: repairCosts.DiagnosticLabourTotalHrs.toFixed(2),
+        Refinish: repairCosts.RefinishLabourTotalHrs.toFixed(2),
+        Frame: repairCosts.FrameLabourTotalHrs.toFixed(2),
+        Mechanical: repairCosts.MechanicalLabourTotalHrs.toFixed(2),
+        Glass: repairCosts.GlassLabourTotalHrs.toFixed(2),
+        Electrical: repairCosts.ElectricalLabourTotalHrs.toFixed(2),
+        Structural: repairCosts.StructuralLabourTotalHrs.toFixed(2),
+        Other: repairCosts.LabourMiscTotalHrs.toFixed(2),
+        CostTotalHours: repairCosts.TotalHrs.toFixed(2),
+      },
+    };
+    return ret;
+  } catch (error) {
+    logger.log("kaizen-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 Labour 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()),
+
+    AluminumLabourTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAA] || Dinero(),
+    AluminumLabourTotalHrs: ticketHrsByCostCenter[defaultCosts.LAA] || 0,
+    BodyLabourTotalCost: ticketTotalsByCostCenter[defaultCosts.LAB] || Dinero(),
+    BodyLabourTotalHrs: ticketHrsByCostCenter[defaultCosts.LAB] || 0,
+    DiagnosticLabourTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAD] || Dinero(),
+    DiagnosticLabourTotalHrs: ticketHrsByCostCenter[defaultCosts.LAD] || 0,
+    ElectricalLabourTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAE] || Dinero(),
+    ElectricalLabourTotalHrs: ticketHrsByCostCenter[defaultCosts.LAE] || 0,
+    FrameLabourTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAF] || Dinero(),
+    FrameLabourTotalHrs: ticketHrsByCostCenter[defaultCosts.LAF] || 0,
+    GlassLabourTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAG] || Dinero(),
+    GlassLabourTotalHrs: ticketHrsByCostCenter[defaultCosts.LAG] || 0,
+    LabourMiscTotalCost: (
+      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()),
+    LabourMiscTotalHrs:
+      (ticketHrsByCostCenter[defaultCosts.LA1] || 0) +
+      (ticketHrsByCostCenter[defaultCosts.LA2] || 0) +
+      (ticketHrsByCostCenter[defaultCosts.LA3] || 0) +
+      (ticketHrsByCostCenter[defaultCosts.LA4] || 0) +
+      (ticketHrsByCostCenter[defaultCosts.LAU] || 0),
+    MechanicalLabourTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAM] || Dinero(),
+    MechanicalLabourTotalHrs: ticketHrsByCostCenter[defaultCosts.LAM] || 0,
+    RefinishLabourTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAR] || Dinero(),
+    RefinishLabourTotalHrs: ticketHrsByCostCenter[defaultCosts.LAR] || 0,
+    StructuralLabourTotalCost:
+      ticketTotalsByCostCenter[defaultCosts.LAS] || Dinero(),
+    StructuralLabourTotalHrs: ticketHrsByCostCenter[defaultCosts.LAS] || 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),
+  };
+};

server/firebase/firebase-handler.js

@@ -50,7 +50,7 @@ exports.createUser = async (req, res) => {
       `,
       {
         user: {
-          email,
+          email: email.toLowerCase(),
           authid: userRecord.uid,
           associations: {
             data: [{ shopid, authlevel, active: true }],

server/graphql-client/queries.js

@@ -1070,6 +1070,183 @@ query ENTEGRAL_EXPORT($bodyshopid: uuid!) {
   }
 }`;
 
+exports.KAIZEN_QUERY = `query KAIZEN_EXPORT($start: timestamptz, $bodyshopid: uuid!, $end: timestamptz) {
+  bodyshops_by_pk(id: $bodyshopid){
+    id
+    shopname
+    address1
+    city
+    state
+    zip_post
+    country
+    phone
+    last_name_first
+    md_ro_statuses
+    md_order_statuses
+    md_responsibility_centers
+    jc_hourly_rates
+    cdk_dealerid
+    pbs_serialnumber
+    use_paint_scale_data
+    timezone
+  }
+  jobs(where: {_and: [{updated_at: {_gt: $start}}, {updated_at: {_lte: $end}}, {shopid: {_eq: $bodyshopid}}]}) {
+    actual_completion
+    actual_delivery
+    actual_in
+    asgn_date
+    bills {
+      billlines {
+        actual_cost
+        cost_center
+        id
+        quantity
+      }
+      federal_tax_rate
+      id
+      is_credit_memo
+      local_tax_rate
+      state_tax_rate
+    }
+    created_at
+    clm_no
+    date_estimated
+    date_exported
+    date_invoiced
+    date_open
+    date_repairstarted
+    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
+    }
+    est_ct_fn
+    est_ct_ln
+    id
+    ins_co_nm
+    joblines(where: {removed: {_eq: false}}) {
+      act_price
+      billlines(order_by: {bill: {date: desc_nulls_last}} limit: 1) {
+        actual_cost
+        actual_price
+        quantity
+        bill {
+          vendor {
+            name
+          }
+          invoice_number
+          date
+        }
+      }
+      db_price
+      id
+      lbr_op
+      line_desc
+      line_ind
+      line_no
+      mod_lb_hrs
+      mod_lbr_ty
+      parts_order_lines(order_by: {parts_order: {order_date: desc_nulls_last}} limit: 1){
+        parts_order{
+          id
+          order_date
+        }
+      }
+      part_qty
+      part_type
+      profitcenter_part
+      profitcenter_labor
+      prt_dsmk_m
+      prt_dsmk_p
+      oem_partno
+      status
+    }
+    job_totals
+    loss_date
+    mixdata(limit: 1, order_by: {updated_at: desc}) {
+      jobid
+      totalliquidcost
+    }
+    ownr_addr1
+    ownr_addr2
+    ownr_city
+    ownr_co_nm
+    ownr_fn
+    ownr_ln
+    ownr_st
+    ownr_zip
+    parts_orders(limit: 1, order_by: {created_at: desc}) {
+      created_at
+    }
+    parts_tax_rates
+    plate_no
+    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
+    ro_number
+    scheduled_completion
+    scheduled_delivery
+    scheduled_in
+    status
+    timetickets {
+      id
+      rate
+      cost_center
+      actualhrs
+      productivehrs
+      flat_rate
+    }
+    tlos_ind
+    v_color
+    v_model_yr
+    v_model_desc
+    v_make_desc
+    v_vin
+    vehicle {
+      v_bstyle
+    }
+  }
+}`;
+
 exports.UPDATE_JOB = `
   mutation UPDATE_JOB($jobId: uuid!, $job: jobs_set_input!) {
     update_jobs(where: { id: { _eq: $jobId } }, _set: $job) {
@@ -1542,7 +1719,7 @@ exports.GET_CLAIMSCORP_SHOPS = `query GET_CLAIMSCORP_SHOPS {
   }
 }`;
 
-exports.GET_ENTEGRAL_SHOPS = `query GET_AUTOHOUSE_SHOPS {
+exports.GET_ENTEGRAL_SHOPS = `query GET_ENTEGRAL_SHOPS {
   bodyshops(where: {entegral_id: {_is_null: false}, _or: {entegral_id: {_neq: ""}}}){
       id
       shopname
@@ -1562,6 +1739,26 @@ exports.GET_ENTEGRAL_SHOPS = `query GET_AUTOHOUSE_SHOPS {
   }
 }`;
 
+exports.GET_KAIZEN_SHOPS = `query GET_KAIZEN_SHOPS($imexshopid: [String]) {
+  bodyshops(where: {imexshopid: {_in: $imexshopid}}){
+      id
+      shopname
+      address1
+      city
+      state
+      zip_post
+      country
+      phone
+      md_ro_statuses
+      md_order_statuses
+      autohouseid
+      md_responsibility_centers
+      jc_hourly_rates
+      imexshopid
+      timezone
+  }
+}`;
+
 exports.DELETE_ALL_DMS_VEHICLES = `mutation DELETE_ALL_DMS_VEHICLES{
   delete_dms_vehicles(where: {}) {
     affected_rows

server/intellipay/intellipay.js

@@ -132,6 +132,7 @@ exports.payment_refund = async (req, res) => {
 exports.generate_payment_url = async (req, res) => {
   logger.log("intellipay-payment-url", "DEBUG", req.user?.email, null, null);
   const shopCredentials = await getShopCredentials(req.body.bodyshop);
+
   try {
     const options = {
       method: "POST",
@@ -139,7 +140,12 @@ exports.generate_payment_url = async (req, res) => {
       //TODO: Move these to environment variables/database.
       data: qs.stringify({
         ...shopCredentials,
-        ...req.body,
+        //...req.body,
+        amount: Dinero({ amount: Math.round(req.body.amount * 100) }).toFormat(
+          "0.00"
+        ),
+        account: req.body.account,
+        invoice: req.body.invoice,
         createshorturl: true,
         //The postback URL is set at the CP teller global terminal settings page.
       }),

server/opensearch/os-handler.js

@@ -1,49 +1,18 @@
-const queries = require("../graphql-client/queries");
-const {pick} = require("lodash");
-const GraphQLClient = require("graphql-request").GraphQLClient;
-const logger = require("../utils/logger");
-//const client = require("../graphql-client/graphql-client").client;
-
-const path = require("path");
-const client = require("../graphql-client/graphql-client").client;
 require("dotenv").config({
-    path: path.resolve(
+    path: require("path").resolve(
         process.cwd(),
         `.env.${process.env.NODE_ENV || "development"}`
     ),
 });
-const {Client, Connection} = require("@opensearch-project/opensearch");
-const {defaultProvider} = require("@aws-sdk/credential-provider-node");
-const aws4 = require("aws4");
-const {gql} = require("graphql-request");
 
-var host = process.env.OPEN_SEARCH_HOST;
+const GraphQLClient = require("graphql-request").GraphQLClient;
+//const client = require("../graphql-client/graphql-client").client;
+const logger = require("../utils/logger");
+const queries = require("../graphql-client/queries");
+const client = require("../graphql-client/graphql-client").client;
+const {pick, isNil} = require("lodash");
+const {getClient} = require('../../libs/awsUtils');
 
-const createAwsConnector = (credentials, region) => {
-    class AmazonConnection extends Connection {
-        buildRequestObject(params) {
-            const request = super.buildRequestObject(params);
-            request.service = "es";
-            request.region = region;
-            request.headers = request.headers || {};
-            request.headers["host"] = request.hostname;
-
-            return aws4.sign(request, credentials);
-        }
-    }
-
-    return {
-        Connection: AmazonConnection,
-    };
-};
-
-const getClient = async () => {
-    const credentials = await defaultProvider()();
-    return new Client({
-        ...createAwsConnector(credentials, "ca-central-1"),
-        node: host,
-    });
-};
 
 async function OpenSearchUpdateHandler(req, res) {
     if (req.headers["event-secret"] !== process.env.EVENT_SECRET) {
@@ -51,10 +20,8 @@ async function OpenSearchUpdateHandler(req, res) {
         return;
     }
     try {
-        var osClient = await getClient();
-        // const osClient = new Client({
-        //   node: `https://imex:<password>@search-imexonline-search-ixp2stfvwp6qocjsowzjzyreoy.ca-central-1.es.amazonaws.com/`,
-        // });
+
+        const osClient = await getClient();
 
         if (req.body.event.op === "DELETE") {
             let response;
@@ -197,14 +164,12 @@ async function OpenSearchUpdateHandler(req, res) {
                 body: document,
             };
 
-            let response;
-            response = await osClient.index(payload);
+            const response = await osClient.index(payload);
             console.log(response.body);
             res.status(200).json(response.body);
         }
     } catch (error) {
         res.status(400).json(JSON.stringify(error));
-    } finally {
     }
 }
 
@@ -240,6 +205,8 @@ async function OpenSearchSearchHandler(req, res) {
 
         const osClient = await getClient();
 
+        const bodyShopIdMatchOverride = isNil(process.env.BODY_SHOP_ID_MATCH_OVERRIDE) ? assocs.associations[0].shopid : process.env.BODY_SHOP_ID_MATCH_OVERRIDE
+
         const {body} = await osClient.search({
             ...(index ? {index} : {}),
             body: {
@@ -249,7 +216,7 @@ async function OpenSearchSearchHandler(req, res) {
                         must: [
                             {
                                 match: {
-                                    bodyshopid: assocs.associations[0].shopid,
+                                    bodyshopid: bodyShopIdMatchOverride,
                                 },
                             },
                             {
@@ -318,7 +285,6 @@ async function OpenSearchSearchHandler(req, res) {
             error: JSON.stringify(error),
         });
         res.status(400).json(error);
-    } finally {
     }
 }