Remove erroneous console log.

# Conflicts:
#	client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx

README.MD

@@ -1,14 +1,3 @@
-Yarn Dependency Management:
-To force upgrades for some packages:
-yarn upgrade-interactive --latest
-
-To Start Hasura CLI:
-npx hasura console
-
-Migrating to Staging:
-npx hasura migrate apply --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
-npx hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret 'Test-ImEXOnlineBySnaptSoftware!'
-
 NGROK TEsting:
 ./ngrok.exe http http://localhost:4000 -host-header="localhost:4000"
 
@@ -21,4 +10,4 @@ hasura migrate apply --version "1620771761757" --skip-execution --endpoint https
 hasura migrate status --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
 
 Generate the license file: 
-$ generate-license-file --input package.json --output third-party-licenses.txt --overwrite
+$ generate-license-file --input package.json --output third-party-licenses.txt --overwrite

client/.env.development

@@ -8,6 +8,6 @@ REACT_APP_CLOUDINARY_API_KEY=957865933348715
 REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
 REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-REACT_APP_AXIOS_BASE_API_URL=https://api.imex.online/
+REACT_APP_AXIOS_BASE_API_URL=http://localhost:4000
 REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc

client/package.json

@@ -4,71 +4,70 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@apollo/client": "^3.6.9",
+    "@apollo/client": "^3.7.9",
     "@asseinfo/react-kanban": "^2.2.0",
-    "@craco/craco": "^6.4.5",
+    "@craco/craco": "^7.0.0",
     "@fingerprintjs/fingerprintjs": "^3.3.3",
     "@jsreport/browser-client": "^3.1.0",
-    "@sentry/react": "^7.7.0",
-    "@sentry/tracing": "^7.7.0",
-    "@splitsoftware/splitio-react": "^1.6.0",
-    "@stripe/react-stripe-js": "^1.9.0",
-    "@stripe/stripe-js": "^1.32.0",
+    "@sentry/react": "^7.40.0",
+    "@sentry/tracing": "^7.40.0",
+    "@splitsoftware/splitio-react": "^1.8.1",
     "@tanem/react-nprogress": "^5.0.8",
-    "antd": "^4.22.3",
-    "apollo-link-logger": "^2.0.0",
-    "axios": "^0.27.2",
-    "craco-less": "^1.20.0",
+    "antd": "^4.24.8",
+    "apollo-link-logger": "^2.0.1",
+    "axios": "^1.3.4",
+    "craco-less": "^2.0.0",
     "dinero.js": "^1.9.1",
     "dotenv": "^16.0.1",
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
-    "firebase": "^9.9.1",
-    "graphql": "^16.5.0",
-    "i18next": "^21.8.14",
-    "i18next-browser-languagedetector": "^6.1.4",
+    "firebase": "^9.17.1",
+    "graphql": "^16.6.0",
+    "i18next": "^22.4.10",
+    "i18next-browser-languagedetector": "^7.0.1",
     "jsoneditor": "^9.9.0",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.10.9",
+    "libphonenumber-js": "^1.10.21",
     "logrocket": "^3.0.1",
-    "markerjs2": "^2.22.0",
+    "markerjs2": "^2.28.1",
     "moment-business-days": "^1.2.0",
-    "moment-timezone": "^0.5.34",
-    "normalize-url": "^7.0.3",
-    "phone": "^3.1.23",
+    "moment-timezone": "^0.5.41",
+    "normalize-url": "^8.0.0",
+    "phone": "^3.1.35",
     "preval.macro": "^5.0.0",
     "prop-types": "^15.8.1",
-    "query-string": "^7.1.1",
+    "query-string": "^7.1.3",
     "rc-queue-anim": "^2.0.0",
     "rc-scroll-anim": "^2.7.6",
     "react": "^17.0.2",
-    "react-big-calendar": "^1.5.0",
+    "react-big-calendar": "^1.6.8",
     "react-color": "^2.19.3",
     "react-cookie": "^4.1.1",
     "react-dom": "^17.0.2",
     "react-drag-listview": "^0.2.1",
-    "react-grid-gallery": "^0.5.5",
+    "react-grid-gallery": "^1.0.0",
     "react-grid-layout": "^1.3.4",
-    "react-i18next": "^11.18.1",
-    "react-icons": "^4.4.0",
-    "react-number-format": "^4.9.3",
-    "react-redux": "^7.2.8",
+    "react-i18next": "^12.2.0",
+    "react-icons": "^4.7.1",
+    "react-image-lightbox": "^5.1.4",
+    "react-number-format": "^5.1.3",
+    "react-redux": "^8.0.5",
     "react-resizable": "^3.0.4",
     "react-router-dom": "^5.3.0",
-    "react-scripts": "^4.0.3",
+    "react-scripts": "^5.0.1",
     "react-sticky": "^6.0.3",
     "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.3",
-    "recharts": "^2.1.12",
-    "redux": "^4.2.0",
+    "recharts": "^2.4.3",
+    "redux": "^4.2.1",
     "redux-persist": "^6.0.0",
-    "redux-saga": "^1.1.3",
+    "redux-saga": "^1.2.2",
     "redux-state-sync": "^3.1.4",
-    "reselect": "^4.1.6",
-    "sass": "^1.54.0",
-    "socket.io-client": "^4.5.1",
-    "styled-components": "^5.3.5",
+    "reselect": "^4.1.7",
+    "sass": "^1.58.3",
+    "socket.io-client": "^4.6.1",
+    "styled-components": "^5.3.6",
     "subscriptions-transport-ws": "^0.11.0",
     "web-vitals": "^2.1.4",
     "workbox-background-sync": "^6.5.3",
@@ -119,7 +118,7 @@
     "react-error-overlay": "6.0.9"
   },
   "devDependencies": {
-    "@sentry/webpack-plugin": "^1.19.0",
+    "@sentry/webpack-plugin": "^1.20.0",
     "@testing-library/cypress": "^8.0.3",
     "cypress": "^10.3.1",
     "eslint-plugin-cypress": "^2.12.1",

client/src/App/App.styles.scss

@@ -147,4 +147,9 @@
 //Update row highlighting on production board. 
 .ant-table-tbody > tr.ant-table-row:hover > td {
   background: #eaeaea !important;
-}
+}
+
+.job-line-manual{
+  color: tomato;
+  font-style: italic;
+}

client/src/components/_test/paymentMethod.jsx

@@ -1,8 +1,4 @@
-import {
-  PaymentRequestButtonElement,
-  useStripe,
-} from "@stripe/react-stripe-js";
-import React, { useEffect, useState } from "react";
+import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
@@ -19,49 +15,6 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 function Test({ bodyshop, setEmailOptions }) {
-  const stripe = useStripe();
-
-  const [paymentRequest, setPaymentRequest] = useState(null);
-  useEffect(() => {
-    if (stripe) {
-      const pr = stripe.paymentRequest({
-        country: "CA",
-        displayItems: [{ label: "Deductible", amount: 1099 }],
-        currency: "cad",
-        total: {
-          label: "Demo total",
-          amount: 1099,
-        },
-        requestPayerName: true,
-        requestPayerEmail: true,
-      });
-
-      // Check the availability of the Payment Request API.
-      pr.canMakePayment().then((result) => {
-        if (result) {
-          setPaymentRequest(pr);
-        } else {
-          // var details = {
-          //   total: { label: "", amount: { currency: "CAD", value: "0.00" } },
-          // };
-          new PaymentRequest(
-            [{ supportedMethods: ["basic-card"] }],
-            {}
-            //  details
-          ).show();
-        }
-      });
-    }
-  }, [stripe]);
-
-  if (paymentRequest) {
-    return (
-      <div style={{ height: "300px" }}>
-        <PaymentRequestButtonElement options={{ paymentRequest }} />
-      </div>
-    );
-  }
-
   return (
     <div>
       <button

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

@@ -107,11 +107,6 @@ export function AccountingPayablesTableComponent({
       dataIndex: "transactionid",
       key: "transactionid",
     },
-    {
-      title: t("payments.fields.stripeid"),
-      dataIndex: "stripeid",
-      key: "stripeid",
-    },
     {
       title: t("payments.fields.created_at"),
       dataIndex: "created_at",

client/src/components/chat-conversation/chat-conversation.container.jsx

@@ -42,6 +42,7 @@ export function ChatConversationContainer({ bodyshop, selectedConversation }) {
     MARK_MESSAGES_AS_READ_BY_CONVERSATION,
     {
       variables: { conversationId: selectedConversation },
+      refetchQueries: ["UNREAD_CONVERSATION_COUNT"],
       update(cache) {
         cache.modify({
           id: cache.identify({

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

@@ -10,7 +10,10 @@ import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { CONVERSATION_LIST_QUERY } from "../../graphql/conversations.queries";
+import {
+  CONVERSATION_LIST_QUERY,
+  UNREAD_CONVERSATION_COUNT,
+} from "../../graphql/conversations.queries";
 import { toggleChatVisible } from "../../redux/messaging/messaging.actions";
 import {
   selectChatVisible,
@@ -37,9 +40,17 @@ export function ChatPopupComponent({
 }) {
   const { t } = useTranslation();
   const [pollInterval, setpollInterval] = useState(0);
+
+  const { data: unreadData } = useQuery(UNREAD_CONVERSATION_COUNT, {
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+    ...(pollInterval > 0 ? { pollInterval } : {}),
+  });
+
   const { loading, data, refetch, called } = useQuery(CONVERSATION_LIST_QUERY, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
+    skip: !chatVisible,
     ...(pollInterval > 0 ? { pollInterval } : {}),
   });
 
@@ -57,12 +68,14 @@ export function ChatPopupComponent({
     if (called && chatVisible) refetch();
   }, [chatVisible, called, refetch]);
 
-  const unreadCount = data
-    ? data.conversations.reduce(
-        (acc, val) => val.messages_aggregate.aggregate.count + acc,
-        0
-      )
-    : 0;
+  // const unreadCount = data
+  //   ? data.conversations.reduce(
+  //       (acc, val) => val.messages_aggregate.aggregate.count + acc,
+  //       0
+  //     )
+  //   : 0;
+
+  const unreadCount = unreadData?.messages_aggregate.aggregate.count || 0;
 
   return (
     <Badge count={unreadCount}>

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

@@ -4,7 +4,7 @@ import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { DateFormatter } from "../../utils/DateFormatter";
-import ContractLicenseDecodeButton from "../contract-license-decode-button/contract-license-decode-button.component";
+//import ContractLicenseDecodeButton from "../contract-license-decode-button/contract-license-decode-button.component";
 import ContractStatusSelector from "../contract-status-select/contract-status-select.component";
 import ContractsRatesChangeButton from "../contracts-rates-change-button/contracts-rates-change-button.component";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
@@ -165,7 +165,9 @@ export default function ContractFormComponent({
               />
             </div>
           )}
-          <ContractLicenseDecodeButton form={form} />
+          {
+            //<ContractLicenseDecodeButton form={form} />
+          }
         </Space>
       </div>
       <LayoutFormRow header={t("contracts.labels.driverinformation")}>

client/src/components/data-label/data-label.component.jsx

@@ -8,6 +8,8 @@ export default function DataLabel({
   vertical,
   visible = true,
   valueStyle = {},
+  valueClassName,
+  onValueClick,
   ...props
 }) {
   if (!visible || (hideIfNull && !!!children)) return null;
@@ -28,7 +30,10 @@ export default function DataLabel({
           marginLeft: ".3rem",
           fontWeight: "bolder",
           wordWrap: "break-word",
+          cursor: onValueClick !== undefined ? "pointer" : "",
         }}
+        className={valueClassName}
+        onClick={onValueClick}
       >
         {typeof children === "string" ? (
           <Typography.Text style={valueStyle}>{children}</Typography.Text>

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

@@ -1,6 +1,5 @@
 import { useLazyQuery } from "@apollo/client";
-import { LoadingOutlined } from "@ant-design/icons";
-import { AutoComplete, Divider, Space } from "antd";
+import { AutoComplete, Divider, Input, Space } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -9,7 +8,7 @@ import { GLOBAL_SEARCH_QUERY } from "../../graphql/search.queries";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import AlertComponent from "../alert/alert.component";
 import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
+  OwnerNameDisplayFunction
 } from "../owner-name-display/owner-name-display.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 export default function GlobalSearch() {
@@ -178,13 +177,18 @@ export default function GlobalSearch() {
     <AutoComplete
       options={options}
       onSearch={handleSearch}
-      suffixIcon={loading && <LoadingOutlined spin />}
       defaultActiveFirstOption
-      placeholder={t("general.labels.globalsearch")}
-      allowClear
       onSelect={(val, opt) => {
         history.push(opt.label.props.to);
       }}
-    ></AutoComplete>
+    >
+      <Input.Search
+        size="large"
+        placeholder={t("general.labels.globalsearch")}
+        enterButton
+        allowClear
+        loading={loading}
+      />
+    </AutoComplete>
   );
 }

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

@@ -3,9 +3,11 @@ import {
   Button,
   Divider,
   Dropdown,
+  Form,
   Menu,
   notification,
   Popover,
+  Select,
   Space,
 } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
@@ -59,7 +61,10 @@ export function ScheduleEventComponent({
 
   const blockContent = (
     <div>
-      <Button onClick={() => handleCancel(event.id)} disabled={event.arrived}>
+      <Button
+        onClick={() => handleCancel({ id: event.id })}
+        disabled={event.arrived}
+      >
         {t("appointments.actions.cancel")}
       </Button>
     </div>
@@ -203,10 +208,46 @@ export function ScheduleEventComponent({
             <Button>{t("appointments.actions.sendreminder")}</Button>
           </Dropdown>
         ) : null}
-
-        <Button onClick={() => handleCancel(event.id)} disabled={event.arrived}>
-          {t("appointments.actions.cancel")}
-        </Button>
+        <Popover
+          trigger="click"
+          disabled={event.arrived}
+          content={
+            <Form
+              layout="vertical"
+              onFinish={({ lost_sale_reason }) => {
+                handleCancel({ id: event.id, lost_sale_reason });
+              }}
+            >
+              <Form.Item
+                name="lost_sale_reason"
+                label={t("jobs.fields.lost_sale_reason")}
+                rules={[
+                  {
+                    required: true,
+                    //message: t("general.validation.required"),
+                  },
+                ]}
+              >
+                <Select
+                  options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
+                    label: lsr,
+                    value: lsr,
+                  }))}
+                />
+              </Form.Item>
+              <Button htmlType="submit">
+                {t("appointments.actions.cancel")}
+              </Button>
+            </Form>
+          }
+        >
+          <Button
+            // onClick={() => handleCancel(event.id)}
+            disabled={event.arrived}
+          >
+            {t("appointments.actions.cancel")}
+          </Button>
+        </Popover>
         {event.isintake ? (
           <Button
             disabled={event.arrived}
@@ -249,7 +290,7 @@ export function ScheduleEventComponent({
   const RegularEvent = event.isintake ? (
     <Space
       wrap
-      size='small'
+      size="small"
       style={{
         backgroundColor:
           event.color && event.color.hex ? event.color.hex : event.color,

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

@@ -11,7 +11,7 @@ export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
   const { t } = useTranslation();
   const [cancelAppointment] = useMutation(CANCEL_APPOINTMENT_BY_ID);
   const [updateJob] = useMutation(UPDATE_JOB);
-  const handleCancel = async (id) => {
+  const handleCancel = async ({ id, lost_sale_reason }) => {
     logImEXEvent("schedule_cancel_appt");
 
     const cancelAppt = await cancelAppointment({
@@ -38,7 +38,8 @@ export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
           job: {
             date_scheduled: null,
             scheduled_in: null,
-            scheduled_completion:null,
+            scheduled_completion: null,
+            lost_sale_reason,
             status: bodyshop.md_ro_statuses.default_imported,
           },
         },

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

@@ -103,6 +103,12 @@ export function JobLinesComponent({
       fixed: "left",
       key: "line_desc",
       sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
+      onCell: (record) => ({
+        className: record.manual_line && "job-line-manual",
+        style: {
+          ...(record.critical ? { boxShadow: " -.5em 0 0 #FFC107" } : {}),
+        },
+      }),
       sortOrder:
         state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
       ellipsis: true,
@@ -342,7 +348,7 @@ export function JobLinesComponent({
                 onClick={() => {
                   setJobLineEditContext({
                     actions: { refetch: refetch, submit: form && form.submit },
-                    context: record,
+                    context: { ...record, jobid: job.id },
                   });
                 }}
               >

client/src/components/job-lines-preset-button/job-lines-preset-button.component.jsx

@@ -22,9 +22,20 @@ export function JoblinePresetButton({ bodyshop, form }) {
   };
 
   const menu = (
-    <Menu>
+    <Menu
+      style={{
+        columnCount: Math.max(
+          Math.floor(bodyshop.md_jobline_presets.length / 15),
+          1
+        ),
+      }}
+    >
       {bodyshop.md_jobline_presets.map((i, idx) => (
-        <Menu.Item onClick={() => handleSelect(i)}  key={idx}>
+        <Menu.Item
+          onClick={() => handleSelect(i)}
+          key={idx}
+          style={{ breakInside: "avoid" }}
+        >
           {i.label}
         </Menu.Item>
       ))}

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx

@@ -40,6 +40,11 @@ export function JobLinesUpsertModalComponent({
     {},
     bodyshop.imexshopid
   );
+  const { Autohouse_Detail_line } = useTreatments(
+    ["Autohouse_Detail_line"],
+    {},
+    bodyshop.imexshopid
+  );
 
   return (
     <Modal
@@ -155,6 +160,40 @@ export function JobLinesUpsertModalComponent({
           >
             <InputNumber precision={1} />
           </Form.Item>
+          {Autohouse_Detail_line.treatment === "on" && (
+            <Form.Item
+              label={t("joblines.fields.ah_detail_line")}
+              name="ah_detail_line"
+              valuePropName="checked"
+              dependencies={["mod_lbr_ty"]}
+              initialValue={false}
+              rules={[
+                ({ getFieldValue }) => ({
+                  validator(rule, value) {
+                    if (
+                      value === false ||
+                      value === undefined ||
+                      value === null
+                    )
+                      return Promise.resolve();
+                    if (
+                      value === true &&
+                      ["LA1", "LA2", "LA3", "LA4", "LAU"].includes(
+                        getFieldValue("mod_lbr_ty")
+                      )
+                    ) {
+                      return Promise.resolve();
+                    }
+                    return Promise.reject(
+                      t("joblines.validations.ahdetailonlyonuserdefinedtypes")
+                    );
+                  },
+                }),
+              ]}
+            >
+              <Switch />
+            </Form.Item>
+          )}
         </LayoutFormRow>
         <LayoutFormRow>
           <Form.Item label={t("joblines.fields.part_type")} name="part_type">
@@ -218,7 +257,6 @@ export function JobLinesUpsertModalComponent({
             rules={[
               ({ getFieldValue }) => ({
                 validator(rule, value) {
-                  console.log(value);
                   if (!value || getFieldValue("part_type") !== "PAE") {
                     return Promise.resolve();
                   }
@@ -229,7 +267,6 @@ export function JobLinesUpsertModalComponent({
               }),
               ({ getFieldValue }) => ({
                 validator(rule, value) {
-                  console.log(value, !!value);
                   if (
                     !!getFieldValue("part_type") === (!!value || value === 0)
                   ) {
@@ -252,7 +289,7 @@ export function JobLinesUpsertModalComponent({
             name="prt_dsmk_p"
             initialValue={0}
           >
-            <InputNumber precision={0} min={0} max={100} />
+            <InputNumber precision={0} min={-100} max={100} />
           </Form.Item>
           <Form.Item
             label={t("joblines.fields.tax_part")}

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx

@@ -13,8 +13,13 @@ import { selectJobLineEditModal } from "../../redux/modals/modals.selectors";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import JobLinesUpdsertModal from "./job-lines-upsert-modal.component";
 import Axios from "axios";
+import Dinero from "dinero.js";
+import CriticalPartsScan from "../../utils/criticalPartsScan";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTreatments } from "@splitsoftware/splitio-react";
 const mapStateToProps = createStructuredSelector({
   jobLineEditModal: selectJobLineEditModal,
+  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("jobLineEdit")),
@@ -23,7 +28,13 @@ const mapDispatchToProps = (dispatch) => ({
 function JobLinesUpsertModalContainer({
   jobLineEditModal,
   toggleModalVisible,
+  bodyshop,
 }) {
+  const { CriticalPartsScanning } = useTreatments(
+    ["CriticalPartsScanning"],
+    {},
+    bodyshop.imexshopid
+  );
   const { t } = useTranslation();
   const [insertJobLine] = useMutation(INSERT_NEW_JOB_LINE);
   const [updateJobLine] = useMutation(UPDATE_JOB_LINE);
@@ -40,7 +51,15 @@ function JobLinesUpsertModalContainer({
               manual_line: !(
                 jobLineEditModal.context && jobLineEditModal.context.id
               ),
-              ...UndefinedToNull(values),
+              ...UndefinedToNull({
+                ...values,
+                prt_dsmk_m: Dinero({
+                  amount: Math.round((values.act_price || 0) * 100),
+                })
+                  .percentage(Math.abs(values.prt_dsmk_p || 0))
+                  .multiply(values.prt_dsmk_p >= 0 ? 1 : -1)
+                  .toFormat(0.0),
+              }),
             },
           ],
         },
@@ -68,7 +87,15 @@ function JobLinesUpsertModalContainer({
       const r = await updateJobLine({
         variables: {
           lineId: jobLineEditModal.context.id,
-          line: values,
+          line: {
+            ...values,
+            prt_dsmk_m: Dinero({
+              amount: Math.round(values.act_price * 100),
+            })
+              .percentage(Math.abs(values.prt_dsmk_p || 0))
+              .multiply(values.prt_dsmk_p >= 0 ? 1 : -1)
+              .toFormat(0.0),
+          },
         },
         refetchQueries: ["GET_LINE_TICKET_BY_PK"],
       });
@@ -92,6 +119,9 @@ function JobLinesUpsertModalContainer({
       }
       toggleModalVisible();
     }
+    if (CriticalPartsScanning.treatment === "on") {
+      CriticalPartsScan(jobLineEditModal.context.jobid);
+    }
     setLoading(false);
   };
 

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

@@ -25,8 +25,6 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setModalContext({ context: context, modal: "payment" })),
 });
 
-const stripeTestEnv = process.env.REACT_APP_STRIPE_PUBLIC_KEY; //.includes("test");
-
 export function JobPayments({
   job,
   jobRO,
@@ -94,23 +92,6 @@ export function JobPayments({
         state.sortedInfo.columnKey === "transactionid" &&
         state.sortedInfo.order,
     },
-    {
-      title: t("payments.fields.stripeid"),
-      dataIndex: "stripeid",
-      key: "stripeid",
-      render: (text, record) =>
-        record.stripeid ? (
-          <a
-            href={
-              stripeTestEnv
-                ? `https://dashboard.stripe.com/${bodyshop.stripe_acct_id}/test/payments/${record.stripeid}`
-                : `https://dashboard.stripe.com/${bodyshop.stripe_acct_id}/payments/${record.stripeid}`
-            }
-          >
-            {record.stripeid}
-          </a>
-        ) : null,
-    },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",

client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx

@@ -166,6 +166,16 @@ export default function ScoreboardAddButton({
         painthrs: 0,
       }
     );
+
+    //Add Labor Adjustments
+    v.painthrs = v.painthrs + (job.lbr_adjustments.LAR || 0);
+    v.bodyhrs =
+      v.bodyhrs +
+      Object.keys(job.lbr_adjustments)
+        .filter((key) => key !== "LAR")
+        .reduce((acc, val) => {
+          return acc + job.lbr_adjustments[val];
+        }, 0);
     form.setFieldsValue({
       date: new moment(),
       bodyhrs: Math.round(v.bodyhrs * 10) / 10,

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

@@ -3,8 +3,9 @@ import {
   useApolloClient,
   useLazyQuery,
   useMutation,
-  useQuery,
+  useQuery
 } from "@apollo/client";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import { Col, notification, Row } from "antd";
 import Axios from "axios";
 import Dinero from "dinero.js";
@@ -19,7 +20,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   DELETE_AVAILABLE_JOB,
   QUERY_AVAILABLE_JOBS,
-  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK,
+  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK
 } from "../../graphql/available-jobs.queries";
 import { INSERT_NEW_JOB, UPDATE_JOB } from "../../graphql/jobs.queries";
 import { INSERT_NEW_NOTE } from "../../graphql/notes.queries";
@@ -27,10 +28,11 @@ import { SEARCH_VEHICLE_BY_VIN } from "../../graphql/vehicles.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
-  selectCurrentUser,
+  selectCurrentUser
 } from "../../redux/user/user.selectors";
 import confirmDialog from "../../utils/asyncConfirm";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import CriticalPartsScan from "../../utils/criticalPartsScan";
 import AlertComponent from "../alert/alert.component";
 import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component";
 import JobsFindModalContainer from "../jobs-find-modal/jobs-find-modal.container";
@@ -53,6 +55,11 @@ export function JobsAvailableContainer({
   currentUser,
   insertAuditTrail,
 }) {
+  const { CriticalPartsScanning } = useTreatments(
+    ["CriticalPartsScanning"],
+    {},
+    bodyshop.imexshopid
+  );
   const { loading, error, data, refetch } = useQuery(QUERY_AVAILABLE_JOBS, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
@@ -155,6 +162,9 @@ export function JobsAvailableContainer({
       },
     })
       .then((r) => {
+        if (CriticalPartsScanning.treatment === "on") {
+          CriticalPartsScan(r.data.insert_jobs.returning[0].id);
+        }
         notification["success"]({
           message: t("jobs.successes.created"),
           onClick: () => {
@@ -241,7 +251,9 @@ export function JobsAvailableContainer({
           },
         },
       });
-
+      if (CriticalPartsScanning.treatment === "on") {
+        CriticalPartsScan(updateResult.data.update_jobs.returning[0].id);
+      }
       if (updateResult.errors) {
         //error while inserting
         notification["error"]({

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

@@ -9,6 +9,7 @@ import {
   Space,
   Switch,
 } from "antd";
+import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -18,7 +19,6 @@ 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";
-import axios from "axios";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
@@ -43,14 +43,22 @@ export function JobsConvertButton({
   const { t } = useTranslation();
   const [form] = Form.useForm();
 
-  const handleConvert = async (values) => {
+  const handleConvert = async ({ employee_csr, category, ...values }) => {
     if (parentFormIsFieldsTouched()) {
       alert(t("jobs.labels.savebeforeconversion"));
       return;
     }
     setLoading(true);
     const res = await mutationConvertJob({
-      variables: { jobId: job.id, ...values },
+      variables: {
+        jobId: job.id,
+        job: {
+          converted: true,
+          ...(bodyshop.enforce_conversion_csr ? { employee_csr } : {}),
+          ...(bodyshop.enforce_conversion_category ? { category } : {}),
+          ...values,
+        },
+      },
     });
 
     if (values.ca_gst_registrant) {
@@ -83,7 +91,12 @@ export function JobsConvertButton({
         layout="vertical"
         form={form}
         onFinish={handleConvert}
-        initialValues={{ driveable: true, towin: false }}
+        initialValues={{
+          driveable: true,
+          towin: false,
+          employee_csr: job.employee_csr,
+          category: job.category,
+        }}
       >
         <Form.Item
           name={["ins_co_nm"]}
@@ -151,6 +164,61 @@ export function JobsConvertButton({
             </Form.Item>
           </>
         )}
+        {bodyshop.enforce_conversion_csr && (
+          <Form.Item
+            name={"employee_csr"}
+            label={t("jobs.fields.employee_csr")}
+            rules={[
+              {
+                required: bodyshop.enforce_conversion_csr,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <Select
+              showSearch
+              style={{ width: 200 }}
+              optionFilterProp="children"
+              filterOption={(input, option) =>
+                option.props.children
+                  .toLowerCase()
+                  .indexOf(input.toLowerCase()) >= 0
+              }
+            >
+              {bodyshop.employees
+                .filter((emp) => emp.active)
+                .map((emp) => (
+                  <Select.Option
+                    value={emp.id}
+                    key={emp.id}
+                    name={`${emp.first_name} ${emp.last_name}`}
+                  >
+                    {`${emp.first_name} ${emp.last_name}`}
+                  </Select.Option>
+                ))}
+            </Select>
+          </Form.Item>
+        )}
+        {bodyshop.enforce_conversion_category && (
+          <Form.Item
+            name={"category"}
+            label={t("jobs.fields.category")}
+            rules={[
+              {
+                required: bodyshop.enforce_conversion_category,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <Select allowClear>
+              {bodyshop.md_categories.map((s) => (
+                <Select.Option key={s} value={s}>
+                  {s}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+        )}
         <Form.Item
           label={t("jobs.fields.ca_gst_registrant")}
           name="ca_gst_registrant"
@@ -194,7 +262,14 @@ export function JobsConvertButton({
         // style={{ display: job.converted ? "none" : "" }}
         disabled={job.converted || jobRO}
         loading={loading}
-        onClick={() => setVisible(true)}
+        onClick={() => {
+          setVisible(true);
+          form.setFieldsValue({
+            driveable: true,
+            towin: false,
+            employee_csr: job.employee_csr,
+          });
+        }}
       >
         {t("jobs.actions.convert")}
       </Button>

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

@@ -9,7 +9,11 @@ const colSpan = {
   lg: { span: 12 },
 };
 
-export default function JobsCreateVehicleInfoComponent({ loading, vehicles }) {
+export default function JobsCreateVehicleInfoComponent({
+  loading,
+  vehicles,
+  form,
+}) {
   const [state, setState] = useContext(JobCreateContext);
   const { t } = useTranslation();
   return (
@@ -58,7 +62,7 @@ export default function JobsCreateVehicleInfoComponent({ loading, vehicles }) {
           />
         </Col>
         <Col {...colSpan}>
-          <JobsCreateVehicleInfoNewComponent />
+          <JobsCreateVehicleInfoNewComponent form={form}/>
         </Col>
       </Row>
     </div>

client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.container.jsx

@@ -20,6 +20,7 @@ export default function JobsCreateVehicleInfoContainer({ form }) {
     <JobsCreateVehicleInfoComponent
       loading={loading}
       vehicles={data ? data.search_vehicles : null}
+      form={form}
     />
   );
 }

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

@@ -4,8 +4,9 @@ import { useTranslation } from "react-i18next";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import JobsCreateVehicleInfoPredefined from "./jobs-create-vehicle-info.predefined.component";
 
-export default function JobsCreateVehicleInfoNewComponent() {
+export default function JobsCreateVehicleInfoNewComponent({ form }) {
   const [state] = useContext(JobCreateContext);
 
   const { t } = useTranslation();
@@ -25,7 +26,7 @@ export default function JobsCreateVehicleInfoNewComponent() {
           <Input disabled={!state.vehicle.new} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow grow>
+      <LayoutFormRow grow noDivider>
         <Form.Item
           label={t("vehicles.fields.v_color")}
           name={["vehicle", "data", "v_color"]}
@@ -52,8 +53,9 @@ export default function JobsCreateVehicleInfoNewComponent() {
         </Form.Item>
       </LayoutFormRow>
 
-      <LayoutFormRow grow>
+      <LayoutFormRow grow noDivider>
         <Form.Item
+          span={10}
           label={t("vehicles.fields.v_make_desc")}
           name={["vehicle", "data", "v_make_desc"]}
           rules={[
@@ -66,6 +68,7 @@ export default function JobsCreateVehicleInfoNewComponent() {
           <Input disabled={!state.vehicle.new} />
         </Form.Item>
         <Form.Item
+          span={11}
           label={t("vehicles.fields.v_model_desc")}
           name={["vehicle", "data", "v_model_desc"]}
           rules={[
@@ -77,6 +80,11 @@ export default function JobsCreateVehicleInfoNewComponent() {
         >
           <Input disabled={!state.vehicle.new} />
         </Form.Item>
+        <JobsCreateVehicleInfoPredefined
+          disabled={!state.vehicle.new}
+          form={form}
+          span={1}
+        />
       </LayoutFormRow>
 
       <LayoutFormRow header={t("vehicles.forms.registration")} grow>

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

@@ -0,0 +1,81 @@
+import { PlusOutlined, SearchOutlined } from "@ant-design/icons";
+import { Button, Input, Popover, Table } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import PredefinedVehicles from "./predefined-vehicles.js";
+
+export default function JobsCreateVehicleInfoPredefined({ disabled, form }) {
+  const [open, setOpen] = useState(false);
+  const [search, setSearch] = useState("");
+  const { t } = useTranslation();
+  const handleOpenChange = (newOpen) => {
+    setOpen(newOpen);
+    setSearch("");
+  };
+  const filteredPredefinedVehicles =
+    search === ""
+      ? PredefinedVehicles
+      : PredefinedVehicles.filter(
+          (v) =>
+            v.make.toLowerCase().includes(search.toLowerCase()) ||
+            v.model.toLowerCase().includes(search.toLowerCase())
+        );
+
+  const popContent = () => (
+    <div>
+      <Table
+        size="small"
+        title={() => <Input.Search onSearch={(value) => setSearch(value)} />}
+        dataSource={filteredPredefinedVehicles}
+        columns={[
+          {
+            dataIndex: "make",
+            key: "make",
+            title: t("vehicles.fields.v_make_desc"),
+          },
+          {
+            dataIndex: "model",
+            key: "model",
+            title: t("vehicles.fields.v_model_desc"),
+          },
+          {
+            dataIndex: "select",
+            key: "select",
+            title: t("general.labels.actions"),
+            render: (value, record) => (
+              <Button
+                disabled={disabled}
+                onClick={() => {
+                  form.setFieldsValue({
+                    vehicle: {
+                      data: {
+                        v_make_desc: record.make,
+                        v_model_desc: record.model,
+                      },
+                    },
+                  });
+                  setOpen(false);
+                  setSearch("");
+                }}
+              >
+                <PlusOutlined />
+              </Button>
+            ),
+          },
+        ]}
+      />
+    </div>
+  );
+  return (
+    <Popover
+      content={popContent}
+      trigger="click"
+      open={open}
+      placement="left"
+      onOpenChange={handleOpenChange}
+      destroyTooltipOnHide
+    >
+      <SearchOutlined style={{ cursor: "pointer" }} />
+    </Popover>
+  );
+}

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

@@ -256,7 +256,7 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
       </FormRow>
       <FormRow header={t("jobs.forms.other")}>
         <Form.Item label={t("jobs.fields.category")} name="category">
-          <Select disabled={jobRO}>
+          <Select disabled={jobRO} allowClear>
             {bodyshop.md_categories.map((s) => (
               <Select.Option key={s} value={s}>
                 {s}
@@ -289,6 +289,12 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
         >
           <Input disabled={jobRO} />
         </Form.Item>
+        <Form.Item
+          label={t("jobs.fields.lost_sale_reason")}
+          name="lost_sale_reason"
+        >
+          <Input disabled={jobRO} allowClear />
+        </Form.Item>
       </FormRow>
     </div>
   );

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

@@ -1,6 +1,15 @@
 import { DownCircleFilled } from "@ant-design/icons";
 import { useApolloClient, useMutation } from "@apollo/client";
-import { Button, Dropdown, Menu, notification, Popconfirm } from "antd";
+import {
+  Button,
+  Dropdown,
+  Form,
+  Menu,
+  notification,
+  Popconfirm,
+  Popover,
+  Select,
+} from "antd";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -127,35 +136,63 @@ export function JobsDetailHeaderActions({
       <Menu.Item
         disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
       >
-        <Popconfirm
-          title={t("general.labels.areyousure")}
-          okText="Yes"
-          cancelText="No"
-          onClick={(e) => e.stopPropagation()}
+        <Popover
+          trigger="click"
           disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
-          onConfirm={async () => {
-            const jobUpdate = await cancelAllAppointments({
-              variables: {
-                jobid: job.id,
-                job: {
-                  date_scheduled: null,
-                  scheduled_in: null,
-                  scheduled_completion: null,
-                  status: bodyshop.md_ro_statuses.default_imported,
-                },
-              },
-            });
-            if (!jobUpdate.errors) {
-              notification["success"]({
-                message: t("appointments.successes.canceled"),
-              });
-              return;
-            }
-          }}
-          getPopupContainer={(trigger) => trigger.parentNode}
+          content={
+            <Form
+              layout="vertical"
+              onFinish={async ({ lost_sale_reason }) => {
+                const jobUpdate = await cancelAllAppointments({
+                  variables: {
+                    jobid: job.id,
+                    job: {
+                      date_scheduled: null,
+                      scheduled_in: null,
+                      scheduled_completion: null,
+                      lost_sale_reason,
+                      status: bodyshop.md_ro_statuses.default_imported,
+                    },
+                  },
+                });
+                if (!jobUpdate.errors) {
+                  notification["success"]({
+                    message: t("appointments.successes.canceled"),
+                  });
+                  return;
+                }
+              }}
+            >
+              <Form.Item
+                name="lost_sale_reason"
+                label={t("jobs.fields.lost_sale_reason")}
+                rules={[
+                  {
+                    required: true,
+                    //message: t("general.validation.required"),
+                  },
+                ]}
+              >
+                <Select
+                  options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
+                    label: lsr,
+                    value: lsr,
+                  }))}
+                />
+              </Form.Item>
+              <Button
+                htmlType="submit"
+                disabled={
+                  job.status !== bodyshop.md_ro_statuses.default_scheduled
+                }
+              >
+                {t("appointments.actions.cancel")}
+              </Button>
+            </Form>
+          }
         >
           {t("menus.jobsactions.cancelallappointments")}
-        </Popconfirm>
+        </Popover>
       </Menu.Item>
       <Menu.Item
         disabled={

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

@@ -5,7 +5,7 @@ import {
   BranchesOutlined,
 } from "@ant-design/icons";
 import { Card, Col, Row, Space, Tag, Tooltip } from "antd";
-import React from "react";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
@@ -56,7 +56,7 @@ const colSpan = {
 
 export function JobsDetailHeader({ job, bodyshop, disabled }) {
   const { t } = useTranslation();
-
+  const [notesClamped, setNotesClamped] = useState(true);
   const vehicleTitle = `${job.v_model_yr || ""} ${job.v_color || ""}
   ${job.v_make_desc || ""} 
   ${job.v_model_desc || ""}`.trim();
@@ -229,6 +229,8 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               <DataLabel
                 label={t("vehicles.fields.notes")}
                 valueStyle={{ whiteSpace: "pre-wrap" }}
+                valueClassName={notesClamped ? "clamp" : ""}
+                onValueClick={() => setNotesClamped(!notesClamped)}
               >
                 {job.vehicle.notes}
               </DataLabel>

client/src/components/jobs-detail-header/jobs-detail-header.styles.scss

@@ -6,3 +6,12 @@
   display: flex;
   flex-wrap: wrap;
 }
+
+.clamp {
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  overflow-wrap: break-word;
+}

client/src/components/jobs-documents-gallery/jobs-document-gallery.download.component.jsx

@@ -5,7 +5,7 @@ import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import cleanAxios from "../../utils/CleanAxios";
 import formatBytes from "../../utils/formatbytes";
-import yauzl from "yauzl";
+//import yauzl from "yauzl";
 import { useTreatments } from "@splitsoftware/splitio-react";
 
 import { connect } from "react-redux";
@@ -69,44 +69,44 @@ export function JobsDocumentsDownloadButton({
     setDownload(null);
     if (Direct_Media_Download.treatment === "on") {
       try {
-        const parentDir = await window.showDirectoryPicker({
-          id: "media",
-          startIn: "downloads",
-        });
+        // const parentDir = await window.showDirectoryPicker({
+        //   id: "media",
+        //   startIn: "downloads",
+        // });
 
-        const directory = await parentDir.getDirectoryHandle(identifier, {
-          create: true,
-        });
+        // const directory = await parentDir.getDirectoryHandle(identifier, {
+        //   create: true,
+        // });
 
-        yauzl.fromBuffer(
-          Buffer.from(theDownloadedZip.data),
-          {},
-          (err, zipFile) => {
-            if (err) throw err;
-            zipFile.on("entry", (entry) => {
-              zipFile.openReadStream(entry, async (readErr, readStream) => {
-                if (readErr) {
-                  zipFile.close();
-                  throw readErr;
-                }
-                if (err) throw err;
-                let fileSystemHandle = await directory.getFileHandle(
-                  entry.fileName,
-                  {
-                    create: true,
-                  }
-                );
-                const writable = await fileSystemHandle.createWritable();
-                readStream.on("data", async function (chunk) {
-                  await writable.write(chunk);
-                });
-                readStream.on("end", async function () {
-                  await writable.close();
-                });
-              });
-            });
-          }
-        );
+        // yauzl.fromBuffer(
+        //   Buffer.from(theDownloadedZip.data),
+        //   {},
+        //   (err, zipFile) => {
+        //     if (err) throw err;
+        //     zipFile.on("entry", (entry) => {
+        //       zipFile.openReadStream(entry, async (readErr, readStream) => {
+        //         if (readErr) {
+        //           zipFile.close();
+        //           throw readErr;
+        //         }
+        //         if (err) throw err;
+        //         let fileSystemHandle = await directory.getFileHandle(
+        //           entry.fileName,
+        //           {
+        //             create: true,
+        //           }
+        //         );
+        //         const writable = await fileSystemHandle.createWritable();
+        //         readStream.on("data", async function (chunk) {
+        //           await writable.write(chunk);
+        //         });
+        //         readStream.on("end", async function () {
+        //           await writable.close();
+        //         });
+        //       });
+        //     });
+        //   }
+        // );
       } catch (e) {
         console.log(e);
         standardMediaDownload(theDownloadedZip.data);

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

@@ -1,7 +1,7 @@
 import { EditFilled, FileExcelFilled, SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Col, Row, Space } from "antd";
 import React, { useEffect, useState } from "react";
-import Gallery from "react-grid-gallery";
+import { Gallery } from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
 import DocumentsUploadComponent from "../documents-upload/documents-upload.component";
 import { DetermineFileType } from "../documents-upload/documents-upload.utility";
@@ -11,6 +11,9 @@ import JobsDocumentsGalleryReassign from "./jobs-document-gallery.reassign.compo
 import JobsDocumentsDeleteButton from "./jobs-documents-gallery.delete.component";
 import JobsDocumentsGallerySelectAllComponent from "./jobs-documents-gallery.selectall.component";
 
+import Lightbox from "react-image-lightbox";
+import "react-image-lightbox/style.css";
+
 function JobsDocumentsComponent({
   data,
   jobId,
@@ -23,11 +26,7 @@ function JobsDocumentsComponent({
 }) {
   const [galleryImages, setgalleryImages] = useState({ images: [], other: [] });
   const { t } = useTranslation();
-  const [index, setIndex] = useState(0);
-
-  const onCurrentImageChange = (index) => {
-    setIndex(index);
-  };
+  const [modalState, setModalState] = useState({ open: false, index: 0 });
 
   useEffect(() => {
     let documents = data.reduce(
@@ -37,12 +36,14 @@ function JobsDocumentsComponent({
           acc.images.push({
             src: GenerateSrcUrl(value),
             thumbnail: GenerateThumbUrl(value),
-            thumbnailHeight: 225,
-            thumbnailWidth: 225,
+            // src: GenerateSrcUrl(value),
+            // thumbnail: GenerateThumbUrl(value),
+            fullsize: GenerateSrcUrl(value),
+            height: 225,
+            width: 225,
             isSelected: false,
             key: value.key,
             extension: value.extension,
-
             id: value.id,
             type: value.type,
             size: value.size,
@@ -62,7 +63,7 @@ function JobsDocumentsComponent({
           const fileName = value.key.split("/").pop();
           acc.other.push({
             source: GenerateSrcUrl(value),
-            src: "",
+            src: thumb,
             thumbnail: thumb,
             tags: [
               {
@@ -85,10 +86,9 @@ function JobsDocumentsComponent({
                   ]
                 : []),
             ],
-            thumbnailHeight: 225,
-            thumbnailWidth: 225,
+            height: 225,
+            width: 225,
             isSelected: false,
-
             extension: value.extension,
             key: value.key,
             id: value.id,
@@ -148,35 +148,15 @@ function JobsDocumentsComponent({
           <Card title={t("jobs.labels.documents-images")}>
             <Gallery
               images={galleryImages.images}
-              backdropClosesModal={true}
-              currentImageWillChange={onCurrentImageChange}
-              customControls={[
-                <Button
-                  key="edit-button"
-                  style={{
-                    float: "right",
-                    zIndex: "5",
-                  }}
-                  onClick={() => {
-                    const newWindow = window.open(
-                      `${window.location.protocol}//${window.location.host}/edit?documentId=${galleryImages.images[index].id}`,
-                      "_blank",
-                      "noopener,noreferrer"
-                    );
-                    if (newWindow) newWindow.opener = null;
-                  }}
-                >
-                  <EditFilled />
-                </Button>,
-              ]}
-              onClickImage={(props) => {
-                window.open(
-                  props.target.src,
-                  "_blank",
-                  "toolbar=0,location=0,menubar=0"
-                );
+              onClick={(index, item) => {
+                setModalState({ open: true, index: index });
+                // window.open(
+                //   item.fullsize,
+                //   "_blank",
+                //   "toolbar=0,location=0,menubar=0"
+                // );
               }}
-              onSelectImage={(index, image) => {
+              onSelect={(index, image) => {
                 setgalleryImages({
                   ...galleryImages,
                   images: galleryImages.images.map((g, idx) =>
@@ -191,8 +171,6 @@ function JobsDocumentsComponent({
           <Card title={t("jobs.labels.documents-other")}>
             <Gallery
               images={galleryImages.other}
-              backdropClosesModal={true}
-              enableLightbox={false}
               thumbnailStyle={() => {
                 return {
                   backgroundImage: <FileExcelFilled />,
@@ -201,14 +179,14 @@ function JobsDocumentsComponent({
                   cursor: "pointer",
                 };
               }}
-              onClickThumbnail={(index) => {
+              onClick={(index) => {
                 window.open(
                   galleryImages.other[index].source,
                   "_blank",
                   "toolbar=0,location=0,menubar=0"
                 );
               }}
-              onSelectImage={(index) => {
+              onSelect={(index) => {
                 setgalleryImages({
                   ...galleryImages,
                   other: galleryImages.other.map((g, idx) =>
@@ -219,6 +197,53 @@ function JobsDocumentsComponent({
             />
           </Card>
         </Col>
+        {modalState.open && (
+          <Lightbox
+            toolbarButtons={[
+              <EditFilled
+                onClick={() => {
+                  const newWindow = window.open(
+                    `${window.location.protocol}//${
+                      window.location.host
+                    }/edit?documentId=${
+                      galleryImages.images[modalState.index].id
+                    }`,
+                    "_blank",
+                    "noopener,noreferrer"
+                  );
+                  if (newWindow) newWindow.opener = null;
+                }}
+              />,
+            ]}
+            mainSrc={galleryImages.images[modalState.index].fullsize}
+            nextSrc={
+              galleryImages.images[
+                (modalState.index + 1) % galleryImages.images.length
+              ].fullsize
+            }
+            prevSrc={
+              galleryImages.images[
+                (modalState.index + galleryImages.images.length - 1) %
+                  galleryImages.images.length
+              ].fullsize
+            }
+            onCloseRequest={() => setModalState({ open: false, index: 0 })}
+            onMovePrevRequest={() =>
+              setModalState({
+                ...modalState,
+                index:
+                  (modalState.index + galleryImages.images.length - 1) %
+                  galleryImages.images.length,
+              })
+            }
+            onMoveNextRequest={() =>
+              setModalState({
+                ...modalState,
+                index: (modalState.index + 1) % galleryImages.images.length,
+              })
+            }
+          />
+        )}
       </Row>
     </div>
   );

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

@@ -1,5 +1,5 @@
 import React, { useEffect } from "react";
-import Gallery from "react-grid-gallery";
+import { Gallery } from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
 import { GenerateSrcUrl, GenerateThumbUrl } from "./job-documents.utility";
 
@@ -39,7 +39,7 @@ function JobsDocumentGalleryExternal({
       <Gallery
         images={galleryImages}
         backdropClosesModal={true}
-        onSelectImage={(index, image) => {
+        onSelect={(index, image) => {
           setgalleryImages(
             galleryImages.map((g, idx) =>
               index === idx ? { ...g, isSelected: !g.isSelected } : g

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx

@@ -1,7 +1,7 @@
 import { SyncOutlined, FileExcelFilled } from "@ant-design/icons";
 import { Alert, Button, Card, Space } from "antd";
-import React, { useEffect } from "react";
-import Gallery from "react-grid-gallery";
+import React, { useEffect, useState } from "react";
+import { Gallery } from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -19,6 +19,9 @@ import JobsLocalGalleryDownloadButton from "./jobs-documents-local-gallery.downl
 import JobsDocumentsLocalGalleryReassign from "./jobs-documents-local-gallery.reassign.component";
 import JobsDocumentsLocalGallerySelectAllComponent from "./jobs-documents-local-gallery.selectall.component";
 
+import Lightbox from "react-image-lightbox";
+import "react-image-lightbox/style.css";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   allMedia: selectAllMedia,
@@ -49,6 +52,7 @@ export function JobsDocumentsLocalGallery({
   vendorid,
 }) {
   const { t } = useTranslation();
+  const [modalState, setModalState] = useState({ open: false, index: 0 });
   useEffect(() => {
     if (job) {
       if (invoice_number) {
@@ -70,12 +74,20 @@ export function JobsDocumentsLocalGallery({
             ) {
               acc.images.push({
                 ...val,
+                fullsize: val.src,
+                src: val.thumbnail,
+                height: val.thumbnailHeight,
+                width: val.thumbnailWidth,
                 ...(val.optimized && { src: val.optimized, fullsize: val.src }),
               });
               if (val.optimized) optimized = true;
             } else {
               acc.other.push({
                 ...val,
+                fullsize: val.src,
+                src: val.thumbnail,
+                height: val.thumbnailHeight,
+                width: val.thumbnailWidth,
                 tags: [{ value: val.filename, title: val.filename }],
               });
             }
@@ -120,8 +132,7 @@ export function JobsDocumentsLocalGallery({
       <Card title={t("jobs.labels.documents-images")}>
         <Gallery
           images={jobMedia.images}
-          backdropClosesModal={true}
-          onSelectImage={(index, image) => {
+          onSelect={(index, image) => {
             toggleMediaSelected({ jobid: job.id, filename: image.filename });
           }}
           {...(optimized && {
@@ -133,24 +144,23 @@ export function JobsDocumentsLocalGallery({
               />,
             ],
           })}
-          onClickImage={(props) => {
-            const media = allMedia[job.id].find(
-              (m) => m.optimized === props.target.src
-            );
+          onClick={(index) => {
+            setModalState({ open: true, index: index });
+            // const media = allMedia[job.id].find(
+            //   (m) => m.optimized === item.src
+            // );
 
-            window.open(
-              media ? media.src : props.target.src,
-              "_blank",
-              "toolbar=0,location=0,menubar=0"
-            );
+            // window.open(
+            //   media ? media.fullsize : item.fullsize,
+            //   "_blank",
+            //   "toolbar=0,location=0,menubar=0"
+            // );
           }}
         />
       </Card>
       <Card title={t("jobs.labels.documents-other")}>
         <Gallery
           images={jobMedia.other}
-          backdropClosesModal={true}
-          enableLightbox={false}
           thumbnailStyle={() => {
             return {
               backgroundImage: <FileExcelFilled />,
@@ -159,18 +169,48 @@ export function JobsDocumentsLocalGallery({
               cursor: "pointer",
             };
           }}
-          onClickThumbnail={(index) => {
+          onClick={(index) => {
             window.open(
-              jobMedia.other[index].src,
+              jobMedia.other[index].fullsize,
               "_blank",
               "toolbar=0,location=0,menubar=0"
             );
           }}
-          onSelectImage={(index, image) => {
+          onSelect={(index, image) => {
             toggleMediaSelected({ jobid: job.id, filename: image.filename });
           }}
         />
       </Card>
+      {modalState.open && (
+        <Lightbox
+          mainSrc={jobMedia.images[modalState.index].fullsize}
+          nextSrc={
+            jobMedia.images[(modalState.index + 1) % jobMedia.images.length]
+              .fullsize
+          }
+          prevSrc={
+            jobMedia.images[
+              (modalState.index + jobMedia.images.length - 1) %
+                jobMedia.images.length
+            ].fullsize
+          }
+          onCloseRequest={() => setModalState({ open: false, index: 0 })}
+          onMovePrevRequest={() =>
+            setModalState({
+              ...modalState,
+              index:
+                (modalState.index + jobMedia.images.length - 1) %
+                jobMedia.images.length,
+            })
+          }
+          onMoveNextRequest={() =>
+            setModalState({
+              ...modalState,
+              index: (modalState.index + 1) % jobMedia.images.length,
+            })
+          }
+        />
+      )}
     </div>
   );
 }

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

@@ -1,5 +1,5 @@
 import React, { useEffect } from "react";
-import Gallery from "react-grid-gallery";
+import { Gallery } from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -38,7 +38,7 @@ function JobDocumentsLocalGalleryExternal({
   const { t } = useTranslation();
 
   useEffect(() => {
-    if ( jobId) {
+    if (jobId) {
       getJobMedia(jobId);
     }
   }, [jobId, getJobMedia]);
@@ -65,8 +65,7 @@ function JobDocumentsLocalGalleryExternal({
     <div className="clearfix">
       <Gallery
         images={galleryImages}
-        backdropClosesModal={true}
-        onSelectImage={(index, image) => {
+        onSelect={(index, image) => {
           setgalleryImages(
             galleryImages.map((g, idx) =>
               index === idx ? { ...g, isSelected: !g.isSelected } : g

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

@@ -182,7 +182,7 @@ export function JobsExportAllButton({
 
   return (
     <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
-      {t("jobs.actions.export")}
+      {t("jobs.actions.exportselected")}
     </Button>
   );
 }

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

@@ -260,6 +260,19 @@ export function JobsList({ bodyshop }) {
       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"],
     },
     {

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

@@ -272,6 +272,19 @@ export function JobsReadyList({ bodyshop }) {
       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"],
     },
     {

client/src/components/labor-allocations-table/labor-allocations-table.utility.js

@@ -6,10 +6,6 @@ export const CalculateAllocationsTotals = (
   timetickets,
   adjustments = []
 ) => {
-  console.log(
-    "🚀  ~ file: labor-allocations-table.utility.js  ~ line 9  ~ adjustments",
-    adjustments
-  );
   const responsibilitycenters = bodyshop.md_responsibility_centers;
   const jobCodes = joblines.map((item) => item.mod_lbr_ty);
   //.filter((value, index, self) => self.indexOf(value) === index && !!value);

client/src/components/owner-detail-form/owner-detail-form.container.jsx

@@ -1,15 +1,40 @@
-import { Button, Form, notification, PageHeader } from "antd";
+import { Button, Form, notification, PageHeader, Popconfirm } from "antd";
 import React, { useState } from "react";
+import { useHistory } from "react-router-dom";
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
-import { UPDATE_OWNER } from "../../graphql/owners.queries";
+import { DELETE_OWNER, UPDATE_OWNER } from "../../graphql/owners.queries";
 import OwnerDetailFormComponent from "./owner-detail-form.component";
 
 function OwnerDetailFormContainer({ owner, refetch }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
+  const history = useHistory();
   const [loading, setLoading] = useState(false);
   const [updateOwner] = useMutation(UPDATE_OWNER);
+  const [deleteOwner] = useMutation(DELETE_OWNER);
+
+  const handleDelete = async () => {
+    setLoading(true);
+    const result = await deleteOwner({
+      variables: { id: owner.id },
+    });
+    console.log(result);
+    if (result.errors) {
+      notification["error"]({
+        message: t("owners.errors.deleting", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+      setLoading(false);
+    } else {
+      notification["success"]({
+        message: t("owners.successes.delete"),
+      });
+      setLoading(false);
+      history.push(`/manage/owners`);
+    }
+  };
 
   const handleFinish = async (values) => {
     setLoading(true);
@@ -41,15 +66,29 @@ function OwnerDetailFormContainer({ owner, refetch }) {
     <>
       <PageHeader
         title={t("menus.header.owners")}
-        extra={
+        extra={[
+          <Popconfirm
+            trigger="click"
+            onConfirm={handleDelete}
+            disabled={owner.jobs.length !== 0}
+            title={t("owners.labels.deleteconfirm")}
+          >
+            <Button
+              type="danger"
+              loading={loading}
+              disabled={owner.jobs.length !== 0}
+            >
+              {t("general.actions.delete")}
+            </Button>
+          </Popconfirm>,
           <Button
             type="primary"
             loading={loading}
             onClick={() => form.submit()}
           >
             {t("general.actions.save")}
-          </Button>
-        }
+          </Button>,
+        ]}
       />
       <Form
         form={form}

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

@@ -34,7 +34,9 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       render: (text, record) =>
         record.vehicleid ? (
           <Link to={`/manage/vehicles/${record.vehicleid}`}>
-            {`${record.v_model_yr} ${record.v_make_desc} ${record.v_model_desc}`}
+            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+              record.v_model_desc || ""
+            }`.trim()}
           </Link>
         ) : (
           t("jobs.errors.novehicle")

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

@@ -1,12 +1,10 @@
 import { useTreatments } from "@splitsoftware/splitio-react";
-import { CardElement } from "@stripe/react-stripe-js";
-import { Checkbox, Form, Input, Radio, Select } from "antd";
+import { Form, Input, Radio, Select } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import Alert from "../alert/alert.component";
 import DatePickerFormItem from "../form-date-picker/form-date-picker.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import JobSearchSelect from "../job-search-select/job-search-select.component";
@@ -19,11 +17,9 @@ const mapStateToProps = createStructuredSelector({
 
 export function PaymentFormComponent({
   form,
-  stripeStateArr,
   bodyshop,
   disabled,
 }) {
-  const [stripeState, setStripeState] = stripeStateArr;
   const { Qb_Multi_Ar } = useTreatments(
     ["Qb_Multi_Ar"],
     {},
@@ -31,9 +27,6 @@ export function PaymentFormComponent({
   );
 
   const { t } = useTranslation();
-  const handleStripeChange = (e) => {
-    setStripeState({ error: e.error, cardComplete: e.complete });
-  };
 
   return (
     <div>
@@ -150,57 +143,6 @@ export function PaymentFormComponent({
         </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow grow>
-        <div>
-          <Form.Item
-            label={t("payments.labels.electronicpayment")}
-            name="useStripe"
-            valuePropName="checked"
-          >
-            <Checkbox
-              defaultChecked={!!bodyshop.stripe_acct_id}
-              disabled={!!!bodyshop.stripe_acct_id || disabled}
-            />
-          </Form.Item>
-
-          {!bodyshop.stripe_acct_id ? (
-            <div style={{ fontStyle: "italic" }}>
-              {t("payments.labels.signup")}
-            </div>
-          ) : null}
-
-          <Form.Item shouldUpdate>
-            {() => {
-              if (form.getFieldValue("useStripe"))
-                return (
-                  <CardElement
-                    options={{
-                      style: {
-                        base: {
-                          color: "#32325d",
-                          //fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
-                          fontSmoothing: "antialiased",
-                          //fontSize: "16px",
-                          "::placeholder": {
-                            color: "#aab7c4",
-                          },
-                        },
-                        invalid: {
-                          color: "#fa755a",
-                          iconColor: "#fa755a",
-                        },
-                      },
-                    }}
-                    onChange={handleStripeChange}
-                  />
-                );
-
-              return null;
-            }}
-          </Form.Item>
-          {stripeState.error ? (
-            <Alert type="error" message={stripeState.error.message} />
-          ) : null}
-        </div>
         <Form.Item
           label={t("general.labels.sendby")}
           name="sendby"

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

@@ -1,13 +1,10 @@
-import { useApolloClient, useMutation } from "@apollo/client";
-import { CardElement, useElements, useStripe } from "@stripe/react-stripe-js";
+import { useMutation } from "@apollo/client";
+
 import { Button, Form, Modal, notification } from "antd";
-import axios from "axios";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { GET_JOB_INFO_FOR_STRIPE } from "../../graphql/jobs.queries";
 import {
   INSERT_NEW_PAYMENT,
   UPDATE_PAYMENT,
@@ -45,82 +42,23 @@ function PaymentModalContainer({
   const [enterAgain, setEnterAgain] = useState(false);
   const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
   const [updatePayment] = useMutation(UPDATE_PAYMENT);
-  const client = useApolloClient();
-  const stripe = useStripe();
-  const elements = useElements();
+
   const { t } = useTranslation();
   const { context, actions, visible } = paymentModal;
 
   const [loading, setLoading] = useState(false);
-  const stripeStateArr = useState({
-    error: null,
-    cardComplete: false,
-  });
-  const stripeState = stripeStateArr[0];
-
-  const cardValid = !!!stripeState.error && stripeState.cardComplete;
 
   const handleFinish = async (values) => {
     const { useStripe, sendby, ...paymentObj } = values;
-    if (useStripe && !cardValid) return;
-
-    if ((useStripe && !stripe) || !elements) {
-      // Stripe.js has not yet loaded.
-      // Make sure to disable form submission until Stripe.js has loaded.
-      return;
-    }
 
     setLoading(true);
 
     try {
-      let stripePayment;
-      if (useStripe && bodyshop.stripe_acct_id) {
-        logImEXEvent("payment_stripe_attempt");
-
-        const secretKey = await axios.post("/stripe/payment", {
-          amount: Math.round(values.amount * 100),
-          stripe_acct_id: bodyshop.stripe_acct_id,
-        });
-
-        const { data } = await client.query({
-          query: GET_JOB_INFO_FOR_STRIPE,
-          variables: { jobid: values.jobid },
-        });
-
-        stripePayment = await stripe.confirmCardPayment(
-          secretKey.data.clientSecret,
-          {
-            payment_method: {
-              card: elements.getElement(CardElement),
-              billing_details: {
-                name: `${data.jobs_by_pk.ownr_fn || ""} ${
-                  data.jobs_by_pk.ownr_ln || ""
-                } ${data.jobs_by_pk.ownr_co_nm || ""}`,
-                email: data.jobs_by_pk.ownr_ea,
-                phone: data.jobs_by_pk.ownr_ph1,
-              },
-            },
-          }
-        );
-
-        if (stripePayment.paymentIntent.status === "succeeded") {
-          notification["success"]({ message: t("payments.successes.stripe") });
-        } else {
-          notification["error"]({ message: t("payments.errors.stripe") });
-          throw new Error();
-        }
-      }
-      logImEXEvent("payment_insert");
-
       if (!context || (context && !context.id)) {
         const newPayment = await insertPayment({
           variables: {
             paymentInput: {
               ...paymentObj,
-              stripeid:
-                stripePayment &&
-                stripePayment.paymentIntent &&
-                stripePayment.paymentIntent.id,
             },
           },
         });
@@ -186,7 +124,11 @@ function PaymentModalContainer({
   };
 
   useEffect(() => {
-    if (visible) form.resetFields();
+    if (visible) {
+      form.resetFields();
+      form.resetFields();
+      form.setFieldsValue(context);
+    }
   }, [visible, form, context]);
 
   useEffect(() => {
@@ -201,6 +143,7 @@ function PaymentModalContainer({
           : t("payments.labels.edit")
       }
       visible={visible}
+      destroyOnClose
       okText={t("general.actions.save")}
       onOk={() => form.submit()}
       width="50%"
@@ -236,11 +179,7 @@ function PaymentModalContainer({
         layout="vertical"
         initialValues={context || {}}
       >
-        <PaymentForm
-          form={form}
-          stripeStateArr={stripeStateArr}
-          disabled={context && context.stripeid}
-        />
+        <PaymentForm form={form} />
       </Form>
     </Modal>
   );
@@ -250,15 +189,3 @@ export default connect(
   mapStateToProps,
   mapDispatchToProps
 )(PaymentModalContainer);
-
-// const pr = stripe.paymentRequest({
-//   country: "CA",
-//   currency: "CAD",
-//   total: {
-//     label: "Demo total",
-//     amount: 1099,
-//   },
-//   requestPayerName: true,
-//   requestPayerEmail: true,
-// });
-// console.log("handleFinish -> pr", pr);

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

@@ -16,8 +16,6 @@ import CaBcEtfTableModalContainer from "../ca-bc-etf-table-modal/ca-bc-etf-table
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
-const stripeTestEnv = process.env.REACT_APP_STRIPE_PUBLIC_KEY; //.includes("test");
-
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
@@ -125,23 +123,6 @@ export function PaymentsListPaginated({
       dataIndex: "transactionid",
       key: "transactionid",
     },
-    {
-      title: t("payments.fields.stripeid"),
-      dataIndex: "stripeid",
-      key: "stripeid",
-      render: (text, record) =>
-        record.stripeid ? (
-          <a
-            href={
-              stripeTestEnv
-                ? `https://dashboard.stripe.com/${bodyshop.stripe_acct_id}/test/payments/${record.stripeid}`
-                : `https://dashboard.stripe.com/${bodyshop.stripe_acct_id}/payments/${record.stripeid}`
-            }
-          >
-            {record.stripeid}
-          </a>
-        ) : null,
-    },
     {
       title: t("payments.fields.created_at"),
       dataIndex: "created_at",

client/src/components/print-center-jobs-labels/print-center-jobs-labels.component.jsx

@@ -1,4 +1,12 @@
-import { Button, Card, Form, InputNumber, Popover, Radio } from "antd";
+import {
+  Button,
+  Card,
+  Form,
+  InputNumber,
+  notification,
+  Popover,
+  Radio,
+} from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -27,7 +35,6 @@ export function PrintCenterJobsLabels({ bodyshop, jobId }) {
   const handleOk = (e) => {
     e.stopPropagation();
     form.submit();
-    setIsModalVisible(false);
   };
 
   const handleCancel = () => {
@@ -37,18 +44,24 @@ export function PrintCenterJobsLabels({ bodyshop, jobId }) {
   const handleFinish = async ({ template, ...values }) => {
     const { sendtype, ...restVals } = values;
     setLoading(true);
-    await GenerateDocument(
-      {
-        name: TemplateList("job_special")[template].key,
-        variables: { id: jobId },
-        context: restVals,
-      },
-      {},
-      "p",
-      jobId
-    );
-    setLoading(false);
-    setIsModalVisible(false);
+    try {
+      await GenerateDocument(
+        {
+          name: TemplateList("job_special")[template].key,
+          variables: { id: jobId },
+          context: restVals,
+        },
+        {},
+        "p",
+        jobId
+      );
+      setIsModalVisible(false);
+    } catch (error) {
+      notification.open({ type: "error", message: JSON.stringify(error) });
+    } finally {
+      setLoading(false);
+    }
+
     form.resetFields();
   };
 
@@ -60,7 +73,15 @@ export function PrintCenterJobsLabels({ bodyshop, jobId }) {
         layout="vertical"
         form={form}
       >
-        <Form.Item required name="template">
+        <Form.Item
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name="template"
+        >
           <Radio.Group>
             <Radio.Button value="parts_label_multiple">
               {t("printcenter.jobs.parts_label_multiple")}
@@ -71,14 +92,24 @@ export function PrintCenterJobsLabels({ bodyshop, jobId }) {
           </Radio.Group>
         </Form.Item>
         <Form.Item
-          required
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
           label={t("printcenter.jobs.labels.position")}
           name="position"
         >
           <InputNumber min={1} precision={0} />
         </Form.Item>
         <Form.Item
-          required
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
           label={t("printcenter.jobs.labels.count")}
           name="count"
         >

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

@@ -91,11 +91,13 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
           b.v_make_desc + b.v_model_desc
         ),
       sortOrder:
-        state.sortedInfo.columnKey === "ownr" && state.sortedInfo.order,
+        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
       render: (text, record) => (
-        <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-          record.v_model_desc || ""
-        } ${record.v_color || ""} ${record.plate_no || ""}`}</span>
+        <Link to={`/manage/vehicles/${record.vehicleid}`}>{`${
+          record.v_model_yr || ""
+        } ${record.v_make_desc || ""} ${record.v_model_desc || ""} ${
+          record.v_color || ""
+        } ${record.plate_no || ""}`}</Link>
       ),
     },
     {

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

@@ -55,6 +55,7 @@ export function ProductionListTable({
     const assoc = bodyshop.associations.find(
       (a) => a.useremail === currentUser.email
     );
+
     if (assoc) {
       await updateDefaultProdView({
         variables: { assocId: assoc.id, view: value },

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

@@ -81,7 +81,7 @@ export function ProductionListTable({
             state,
             activeStatuses: bodyshop.md_ro_statuses.active_statuses,
           }).find((e) => e.key === k.key),
-          width: k.width,
+          width: k.width ?? 100,
         };
       })) ||
       []
@@ -267,6 +267,8 @@ export function ProductionListTable({
               sortOrder:
                 state.sortedInfo.columnKey === c.key && state.sortedInfo.order,
               title: headerItem(c),
+              ellipsis: true,
+              width: c.width ?? 100,
               onHeaderCell: (column) => ({
                 width: column.width,
                 onResize: handleResize(index),
@@ -276,11 +278,12 @@ export function ProductionListTable({
           rowKey="id"
           loading={loading}
           dataSource={dataSource}
-          // scroll={{ x: true }}
+          scroll={{ x: 1000 }}
           onChange={handleTableChange}
         />
       </ReactDragListView.DragColumn>
     </div>
   );
 }
+
 export default connect(mapStateToProps, null)(ProductionListTable);

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

@@ -3,8 +3,26 @@ import { Resizable } from "react-resizable";
 
 export default function ResizableComponent(props) {
   const { onResize, width, ...restProps } = props;
+
+  if (!width) {
+    return <th {...restProps} />;
+  }
+
   return (
-    <Resizable width={width || 200} height={0} onResize={onResize}>
+    <Resizable
+      width={width || 200}
+      height={0}
+      onResize={onResize}
+      draggableOpts={{ enableUserSelectHack: false }}
+      handle={
+        <span
+          className="react-resizable-handle"
+          onClick={(e) => {
+            e.stopPropagation();
+          }}
+        />
+      }
+    >
       <th {...restProps} />
     </Resizable>
   );

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

@@ -1,4 +1,4 @@
-import { Button, Form, Input, notification } from "antd";
+import { Button, Card, Col, Form, Input, notification } from "antd";
 import { LockOutlined } from "@ant-design/icons";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -48,81 +48,99 @@ export default connect(
   };
 
   return (
-    <div>
-      <Form
-        onFinish={handleFinish}
-        autoComplete={"no"}
-        initialValues={currentUser}
-        layout="vertical"
-      >
-        <LayoutFormRow>
-          <Form.Item
-            label={t("user.fields.displayname")}
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-              },
-            ]}
-            name="displayName"
+    <>
+      <Col span={24}>
+        <Form
+          onFinish={handleFinish}
+          autoComplete={"no"}
+          initialValues={currentUser}
+          layout="vertical"
+        >
+          <Card
+            title={t("user.labels.profileinfo")}
+            extra={
+              <Button type="primary" key="submit" htmlType="submit">
+                {t("user.actions.updateprofile")}
+              </Button>
+            }
           >
-            <Input />
-          </Form.Item>
-          <Form.Item label={t("user.fields.photourl")} name="photoURL">
-            <Input />
-          </Form.Item>
-        </LayoutFormRow>
-
-        <Button type="primary" key="submit" htmlType="submit">
-          {t("user.actions.updateprofile")}
-        </Button>
-      </Form>
-      <Form
-        onFinish={handleChangePassword}
-        autoComplete={"no"}
-        initialValues={currentUser}
-        layout="vertical"
-      >
-        <LayoutFormRow>
-          <Form.Item label={t("general.labels.newpassword")} name="password">
-            <Input
-              prefix={<LockOutlined />}
-              type="password"
-              placeholder={t("general.labels.password")}
-            />
-          </Form.Item>
-          <Form.Item
-            label={t("general.labels.confirmpassword")}
-            name="password-confirm"
-            dependencies={["password"]}
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-              },
-              ({ getFieldValue }) => ({
-                validator(rule, value) {
-                  if (!value || getFieldValue("password") === value) {
-                    return Promise.resolve();
-                  }
-                  return Promise.reject(
-                    t("general.labels.passwordsdonotmatch")
-                  );
-                },
-              }),
-            ]}
+            <LayoutFormRow noDivider>
+              <Form.Item
+                label={t("user.fields.displayname")}
+                rules={[
+                  {
+                    required: true,
+                    //message: t("general.validation.required"),
+                  },
+                ]}
+                name="displayName"
+              >
+                <Input />
+              </Form.Item>
+              <Form.Item label={t("user.fields.photourl")} name="photoURL">
+                <Input />
+              </Form.Item>
+            </LayoutFormRow>
+          </Card>
+        </Form>
+      </Col>
+      <Col span={24}>
+        <Form
+          onFinish={handleChangePassword}
+          autoComplete={"no"}
+          initialValues={currentUser}
+          layout="vertical"
+        >
+          <Card
+            title={t("user.labels.changepassword")}
+            extra={
+              <Button type="primary" key="submit" htmlType="submit">
+                {t("user.actions.changepassword")}
+              </Button>
+            }
           >
-            <Input
-              prefix={<LockOutlined />}
-              type="password"
-              placeholder={t("general.labels.password")}
-            />
-          </Form.Item>
-        </LayoutFormRow>
-        <Button type="primary" key="submit" htmlType="submit">
-          {t("user.actions.changepassword")}
-        </Button>
-      </Form>
-    </div>
+            <LayoutFormRow>
+              <Form.Item
+                label={t("general.labels.newpassword")}
+                name="password"
+              >
+                <Input
+                  prefix={<LockOutlined />}
+                  type="password"
+                  placeholder={t("general.labels.password")}
+                />
+              </Form.Item>
+              <Form.Item
+                label={t("general.labels.confirmpassword")}
+                name="password-confirm"
+                dependencies={["password"]}
+                rules={[
+                  {
+                    required: true,
+                    //message: t("general.validation.required"),
+                  },
+                  ({ getFieldValue }) => ({
+                    validator(rule, value) {
+                      if (!value || getFieldValue("password") === value) {
+                        return Promise.resolve();
+                      }
+                      return Promise.reject(
+                        t("general.labels.passwordsdonotmatch")
+                      );
+                    },
+                  }),
+                ]}
+              >
+                <Input
+                  prefix={<LockOutlined />}
+                  type="password"
+                  placeholder={t("general.labels.password")}
+                />
+              </Form.Item>
+            </LayoutFormRow>
+          </Card>
+        </Form>
+      </Col>
+    </>
   );
 });

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

@@ -1,13 +1,13 @@
-import React from "react";
+import { Button, Card, Col, Input, Table, Typography } from "antd";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Table, Button, Typography } from "antd";
 export default function ProfileShopsComponent({
   loading,
   data,
   updateActiveShop,
 }) {
   const { t } = useTranslation();
-
+  const [search, setSearch] = useState("");
   const columns = [
     {
       title: t("associations.fields.shopname"),
@@ -40,17 +40,38 @@ export default function ProfileShopsComponent({
     },
   ];
 
+  const filteredData =
+    search === ""
+      ? data
+      : data.filter((d) =>
+          d.bodyshop.shopname.toLowerCase().includes(search.toLowerCase())
+        );
+
   return (
-    <Table
-      title={() => (
-        <Typography.Title level={4}>
-          {t("profile.labels.activeshop")}
-        </Typography.Title>
-      )}
-      loading={loading}
-      columns={columns}
-      rowKey="id"
-      dataSource={data}
-    />
+    <Col span={24}>
+      <Card
+        title={
+          <Typography.Title level={4}>
+            {t("profile.labels.activeshop")}
+          </Typography.Title>
+        }
+        extra={
+          <Input.Search
+            value={search}
+            onChange={(e) => setSearch(e.target.value)}
+            allowClear
+            placeholder={t("general.labels.search")}
+          />
+        }
+      >
+        <Table
+          pagination={false}
+          loading={loading}
+          columns={columns}
+          rowKey="id"
+          dataSource={filteredData}
+        />
+      </Card>
+    </Col>
   );
 }

client/src/components/profile-shops/profile-shops.container.jsx

@@ -3,7 +3,7 @@ import React from "react";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   QUERY_ALL_ASSOCIATIONS,
-  UPDATE_ASSOCIATION,
+  UPDATE_ACTIVE_ASSOCIATION,
 } from "../../graphql/associations.queries";
 import AlertComponent from "../alert/alert.component";
 import ProfileShopsComponent from "./profile-shops.component";
@@ -13,9 +13,13 @@ import { getToken } from "firebase/messaging";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -25,14 +29,18 @@ export default connect(
   mapDispatchToProps
 )(ProfileShopsContainer);
 
-export function ProfileShopsContainer({ bodyshop }) {
+export function ProfileShopsContainer({ bodyshop, currentUser }) {
   const { loading, error, data } = useQuery(QUERY_ALL_ASSOCIATIONS, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
+    variables: {
+      email: currentUser.email,
+    },
+    skip: !currentUser,
   });
-  const [updateAssocation] = useMutation(UPDATE_ASSOCIATION);
+  const [updateActiveAssociation] = useMutation(UPDATE_ACTIVE_ASSOCIATION);
 
-  const updateActiveShop = async (activeShopId) => {
+  const updateActiveShop = async (newActiveAssocId) => {
     logImEXEvent("profile_change_active_shop");
 
     try {
@@ -46,16 +54,12 @@ export function ProfileShopsContainer({ bodyshop }) {
     } catch (error) {
       console.log("No FCM token. Skipping unsubscribe.");
     }
-    await Promise.all(
-      data.associations.map(async (record) => {
-        await updateAssocation({
-          variables: {
-            assocId: record.id,
-            assocActive: record.id === activeShopId ? true : false,
-          },
-        });
-      })
-    );
+
+    await updateActiveAssociation({
+      variables: {
+        newActiveAssocId: newActiveAssocId,
+      },
+    });
 
     //Force window refresh.
 

client/src/components/schedule-ats-summary/schedule-ats-summary.component.jsx

@@ -0,0 +1,48 @@
+import { Space } from "antd";
+import React, { useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectScheduleLoad } from "../../redux/application/application.selectors";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  scheduleLoad: selectScheduleLoad,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export function ScheduleAtsSummary({ scheduleLoad, appointments }) {
+  const { t } = useTranslation();
+
+  const atsSummary = useMemo(() => {
+    let atsSummary = {};
+    if (!appointments || appointments.length === 0) {
+      return {};
+    }
+    appointments
+      .filter((a) => a.isintake)
+      .forEach((a) => {
+        if (!a.job.alt_transport) return;
+        if (!atsSummary[a.job.alt_transport]) {
+          atsSummary[a.job.alt_transport] = 1;
+        } else {
+          atsSummary[a.job.alt_transport] = atsSummary[a.job.alt_transport] + 1;
+        }
+      });
+    return atsSummary;
+  }, [appointments]);
+
+  if (Object.keys(atsSummary).length > 0)
+    return (
+      <Space wrap>
+        {t("schedule.labels.atssummary")}
+        {Object.keys(atsSummary).map((key) => (
+          <span key={key}>{`${key}: ${atsSummary[key]}`}</span>
+        ))}
+      </Space>
+    );
+
+  return null;
+}
+export default connect(mapStateToProps, mapDispatchToProps)(ScheduleAtsSummary);

client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.js

@@ -4,11 +4,13 @@ import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import {
-  Legend, PolarAngleAxis,
+  Legend,
+  PolarAngleAxis,
   PolarGrid,
   PolarRadiusAxis,
-  Radar, RadarChart,
-  Tooltip
+  Radar,
+  RadarChart,
+  Tooltip,
 } from "recharts";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -44,6 +46,8 @@ export function ScheduleCalendarHeaderGraph({ bodyshop, loadData }) {
       <Space>
         {t("appointments.labels.expectedprodhrs")}
         <strong>{loadData?.expectedHours?.toFixed(1)}</strong>
+        {t("appointments.labels.expectedjobs")}
+        <strong>{loadData?.expectedJobCount}</strong>
       </Space>
       <RadarChart
         // cx={300}

client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js

@@ -66,8 +66,8 @@ export function ScheduleCalendarHeaderComponent({
     <div onClick={(e) => e.stopPropagation()}>
       <table>
         <tbody>
-          {loadData && loadData.jobsOut ? (
-            loadData.jobsOut.map((j) => (
+          {loadData && loadData.allJobsOut ? (
+            loadData.allJobsOut.map((j) => (
               <tr key={j.id}>
                 <td>
                   <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
@@ -102,11 +102,12 @@ export function ScheduleCalendarHeaderComponent({
     <div onClick={(e) => e.stopPropagation()}>
       <table>
         <tbody>
-          {loadData && loadData.jobsIn ? (
-            loadData.jobsIn.map((j) => (
+          {loadData && loadData.allJobsIn ? (
+            loadData.allJobsIn.map((j) => (
               <tr key={j.id}>
                 <td>
                   <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
+                  {j.status}
                 </td>
                 <td>
                   <OwnerNameDisplay ownerObject={j} />
@@ -142,7 +143,7 @@ export function ScheduleCalendarHeaderComponent({
           title={t("appointments.labels.arrivingjobs")}
         >
           <Icon component={MdFileDownload} style={{ color: "green" }} />
-          {(loadData.hoursIn || 0) && loadData.hoursIn.toFixed(2)}
+          {(loadData.allHoursIn || 0) && loadData.allHoursIn.toFixed(2)}
         </Popover>
         <Popover
           placement={"bottom"}
@@ -151,7 +152,7 @@ export function ScheduleCalendarHeaderComponent({
           title={t("appointments.labels.completingjobs")}
         >
           <Icon component={MdFileUpload} style={{ color: "red" }} />
-          {(loadData.hoursOut || 0) && loadData.hoursOut.toFixed(2)}
+          {(loadData.allHoursOut || 0) && loadData.allHoursOut.toFixed(2)}
         </Popover>
         <ScheduleCalendarHeaderGraph loadData={loadData} />
       </div>

client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx

@@ -11,7 +11,7 @@ import HeaderComponent from "./schedule-calendar-header.component";
 import "./schedule-calendar.styles.scss";
 import JobDetailCards from "../job-detail-cards/job-detail-cards.component";
 import { selectProblemJobs } from "../../redux/application/application.selectors";
-import { Alert } from "antd";
+import { Alert, Collapse } from "antd";
 import { useTranslation } from "react-i18next";
 
 const mapStateToProps = createStructuredSelector({
@@ -53,7 +53,28 @@ export function ScheduleCalendarWrapperComponent({
   return (
     <>
       <JobDetailCards />
-      {problemJobs &&
+      {problemJobs && problemJobs.length > 2 ? (
+        <Collapse>
+          <Collapse.Panel
+            header={
+              <span style={{ color: "tomato" }}>
+                {t("appointments.labels.severalerrorsfound")}
+              </span>
+            }
+          >
+            {problemJobs.map((problem) => (
+              <Alert
+                key={problem.id}
+                type="error"
+                message={t("appointments.labels.dataconsistency", {
+                  ro_number: problem.ro_number,
+                  code: problem.code,
+                })}
+              />
+            ))}
+          </Collapse.Panel>
+        </Collapse>
+      ) : (
         problemJobs.map((problem) => (
           <Alert
             key={problem.id}
@@ -63,7 +84,8 @@ export function ScheduleCalendarWrapperComponent({
               code: problem.code,
             })}
           />
-        ))}
+        ))
+      )}
 
       <Calendar
         events={data}

client/src/components/schedule-calendar/schedule-calendar.component.jsx

@@ -1,29 +1,56 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Checkbox, Col, PageHeader, Row, Space } from "antd";
+import {
+  Button,
+  Card,
+  Checkbox,
+  Col,
+  PageHeader,
+  Row,
+  Select,
+  Space,
+} from "antd";
 import { t } from "i18next";
 import React, { useMemo } from "react";
 import useLocalStorage from "../../utils/useLocalStorage";
+import ScheduleAtsSummary from "../schedule-ats-summary/schedule-ats-summary.component";
 import ScheduleCalendarWrapperComponent from "../schedule-calendar-wrapper/scheduler-calendar-wrapper.component";
 import ScheduleModal from "../schedule-job-modal/schedule-job-modal.container";
 import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
 import ScheduleProductionList from "../schedule-production-list/schedule-production-list.component";
 import ScheduleVerifyIntegrity from "../schedule-verify-integrity/schedule-verify-integrity.component";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ScheduleCalendarComponent);
 
-export default function ScheduleCalendarComponent({ data, refetch }) {
+export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
   const [filter, setFilter] = useLocalStorage("filter_events", {
     intake: true,
     manual: true,
     employeevacation: true,
+    ins_co_nm: null,
   });
   const filteredData = useMemo(() => {
     return data.filter(
       (d) =>
-        d.block ||
-        (filter.intake && d.isintake) ||
-        (filter.manual && !d.isintake && d.block === false) ||
-        (d.__typename === "employee_vacation" &&
-          filter.employeevacation &&
-          !!d.employee)
+        (d.block ||
+          (filter.intake && d.isintake) ||
+          (filter.manual && !d.isintake && d.block === false) ||
+          (d.__typename === "employee_vacation" &&
+            filter.employeevacation &&
+            !!d.employee)) &&
+        (filter.ins_co_nm && filter.ins_co_nm.length > 0
+          ? filter.ins_co_nm.includes(d.job?.ins_co_nm)
+          : true)
     );
   }, [data, filter]);
 
@@ -35,6 +62,22 @@ export default function ScheduleCalendarComponent({ data, refetch }) {
         <PageHeader
           extra={
             <Space wrap>
+              <ScheduleAtsSummary appointments={filteredData} />
+              <Select
+                style={{ minWidth: "15rem" }}
+                mode="multiple"
+                placeholder={t("schedule.labels.ins_co_nm_filter")}
+                allowClear
+                onClear={() => setFilter({ ...filter, ins_co_nm: [] })}
+                value={filter?.ins_co_nm ? filter.ins_co_nm : []}
+                onChange={(e) => {
+                  setFilter({ ...filter, ins_co_nm: e });
+                }}
+                options={bodyshop.md_ins_cos.map((i) => ({
+                  label: i.name,
+                  value: i.name,
+                }))}
+              />
               <Checkbox
                 checked={filter?.intake}
                 onChange={(e) => {

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

@@ -15,6 +15,7 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { calculateScheduleLoad } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateFormatter } from "../../utils/DateFormatter";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
@@ -28,6 +29,7 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
+  calculateScheduleLoad: (endDate) => dispatch(calculateScheduleLoad(endDate)),
 });
 
 export function ScheduleJobModalComponent({
@@ -36,6 +38,7 @@ export function ScheduleJobModalComponent({
   existingAppointments,
   lbrHrsData,
   jobId,
+  calculateScheduleLoad,
 }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
@@ -57,6 +60,7 @@ export function ScheduleJobModalComponent({
 
   const handleDateBlur = () => {
     const values = form.getFieldsValue();
+
     if (lbrHrsData) {
       const totalHours =
         lbrHrsData.jobs_by_pk.labhrs.aggregate.sum.mod_lb_hrs +
@@ -130,7 +134,12 @@ export function ScheduleJobModalComponent({
               className="imex-flex-row__margin"
               key={idx}
               onClick={() => {
-                form.setFieldsValue({ start: new moment(d).add(8, "hours") });
+                const ssDate = moment(d);
+                if (ssDate.isBefore(moment())) {
+                  form.setFieldsValue({ start: moment() });
+                } else {
+                  form.setFieldsValue({ start: moment(d).add(8, "hours") });
+                }
                 handleDateBlur();
               }}
             >
@@ -191,6 +200,9 @@ export function ScheduleJobModalComponent({
         <Form.Item shouldUpdate={(prev, cur) => prev.start !== cur.start}>
           {() => {
             const values = form.getFieldsValue();
+            if (values.start) {
+              calculateScheduleLoad(moment(values.start).add(3, "days"));
+            }
             return (
               <div className="schedule-job-modal">
                 <ScheduleDayViewContainer day={values.start} />

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

@@ -148,6 +148,7 @@ export function ScheduleJobModalContainer({
             date_scheduled: new Date(),
             scheduled_in: values.start,
             scheduled_completion: values.scheduled_completion,
+            lost_sale_reason: null,
           },
         },
       });

client/src/components/schedule-job-modal/schedule-job-modal.scss

@@ -1,5 +1,6 @@
 .schedule-job-modal {
   height: 70vh;
+  overflow-y: auto;
   .rbc-calendar {
     .rbc-toolbar {
       .rbc-btn-group {

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

@@ -1,4 +1,4 @@
-import { Card, Statistic } from "antd";
+import { Card, Divider, Statistic } from "antd";
 import moment from "moment";
 import React from "react";
 import { connect } from "react-redux";
@@ -41,6 +41,9 @@ export function ScoreboardDayStats({ bodyshop, date, entries }) {
         label="P"
         value={paintHrs.toFixed(1)}
       />
+      <Divider style={{ margin: 0 }} />
+
+      <Statistic value={(bodyHrs + paintHrs).toFixed(1)} />
     </Card>
   );
 }

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

@@ -1,5 +1,5 @@
 import { CalendarOutlined } from "@ant-design/icons";
-import { Card, Col, Row, Statistic } from "antd";
+import { Card, Col, Divider, Row, Statistic } from "antd";
 import _ from "lodash";
 import moment from "moment";
 import React, { useMemo } from "react";
@@ -177,6 +177,9 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
               <Statistic value={values.toDatePaint.toFixed(1)} />
             </Col>
           </Row>
+          <Row>
+            <Divider style={{ margin: 5 }} />
+          </Row>
           <Row>
             <Col {...statSpans}></Col>
             <Col {...statSpans}>
@@ -184,14 +187,53 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
                 value={(values.todayPaint + values.todayBody).toFixed(1)}
               />
             </Col>
-            <Col {...statSpans}></Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={(
+                  Util.WeeklyTargetHrs(
+                    bodyshop.scoreboard_target.dailyBodyTarget,
+                    bodyshop
+                  ) +
+                  Util.WeeklyTargetHrs(
+                    bodyshop.scoreboard_target.dailyPaintTarget,
+                    bodyshop
+                  )
+                ).toFixed(1)}
+              />
+            </Col>
             <Col {...statSpans}>
               <Statistic
                 value={(values.weeklyPaint + values.weeklyBody).toFixed(1)}
               />
             </Col>
-            <Col {...statSpans}></Col>
-            <Col {...statSpans}></Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={(
+                  Util.MonthlyTargetHrs(
+                    bodyshop.scoreboard_target.dailyBodyTarget,
+                    bodyshop
+                  ) +
+                  Util.MonthlyTargetHrs(
+                    bodyshop.scoreboard_target.dailyPaintTarget,
+                    bodyshop
+                  )
+                ).toFixed(1)}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                value={(
+                  Util.AsOfTodayTargetHrs(
+                    bodyshop.scoreboard_target.dailyBodyTarget,
+                    bodyshop
+                  ) +
+                  Util.AsOfTodayTargetHrs(
+                    bodyshop.scoreboard_target.dailyPaintTarget,
+                    bodyshop
+                  )
+                ).toFixed(1)}
+              />
+            </Col>
             <Col {...statSpans}>
               <Statistic
                 value={(values.toDatePaint + values.toDateBody).toFixed(1)}

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

@@ -81,6 +81,7 @@ export default function ScoreboardTimeTickets() {
       totalLastMonth: 0,
       totalOverPeriod: 0,
       actualTotalOverPeriod: 0,
+      totalEffieciencyOverPeriod: 0,
       employees: {},
     };
     data.fixedperiod.forEach((ticket) => {
@@ -94,6 +95,7 @@ export default function ScoreboardTimeTickets() {
           totalLastMonth: 0,
           totalOverPeriod: 0,
           actualTotalOverPeriod: 0,
+          totalEffieciencyOverPeriod: 0,
         };
       }
 
@@ -221,6 +223,28 @@ export default function ScoreboardTimeTickets() {
 
       ret2.push(r);
     });
+
+    // Add total efficiency of employees
+    const totalActualAndProductive = Object.keys(ret.employees)
+      .map((key) => {
+        return { employee_number: key, ...ret.employees[key] };
+      })
+      .reduce(
+        (acc, e) => {
+          return {
+            totalOverPeriod: acc.totalOverPeriod + e.totalOverPeriod,
+            actualTotalOverPeriod:
+              acc.actualTotalOverPeriod + e.actualTotalOverPeriod,
+          };
+        },
+        { totalOverPeriod: 0, actualTotalOverPeriod: 0 }
+      );
+
+    ret.totalEffieciencyOverPeriod =
+      (totalActualAndProductive.totalOverPeriod /
+        totalActualAndProductive.actualTotalOverPeriod) *
+      100;
+
     roundObject(ret);
     roundObject(totals);
     roundObject(ret2);

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

@@ -62,7 +62,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
       key: "efficiencyoverperiod",
       render: (text, record) =>
         `${(
-          (record.totalOverPeriod / (record.actualTotalOverPeriod || .1)) *
+          (record.totalOverPeriod / (record.actualTotalOverPeriod || 0.1)) *
           100
         ).toFixed(1)} %`,
     },
@@ -113,6 +113,12 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
                 value={data.totalOverPeriod}
               />
             </Col>
+            <Col span={12}>
+              <Statistic
+                title={t("scoreboard.labels.efficiencyoverperiod")}
+                value={`${data.totalEffieciencyOverPeriod}%`}
+              />
+            </Col>
           </Row>
           <Typography.Text type="secondary">
             {t("scoreboard.labels.calendarperiod")}
@@ -121,7 +127,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
         <Col md={24} lg={20}>
           <Table
             columns={columns}
-            rowKey='employee_number'
+            rowKey="employee_number"
             dataSource={tableData}
             id="employee_number"
             scroll={{ y: "300px" }}

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

@@ -1,3 +1,4 @@
+import { useTreatments } from "@splitsoftware/splitio-react";
 import { Button, Card, Tabs } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -8,6 +9,7 @@ import ShopInfoGeneral from "./shop-info.general.component";
 import ShopInfoIntakeChecklistComponent from "./shop-info.intake.component";
 import ShopInfoLaborRates from "./shop-info.laborrates.component";
 import ShopInfoOrderStatusComponent from "./shop-info.orderstatus.component";
+import ShopInfoPartsScan from "./shop-info.parts-scan";
 import ShopInfoRbacComponent from "./shop-info.rbac.component";
 import ShopInfoResponsibilityCenterComponent from "./shop-info.responsibilitycenters.component";
 import ShopInfoROStatusComponent from "./shop-info.rostatus.component";
@@ -23,6 +25,11 @@ const mapDispatchToProps = (dispatch) => ({
 export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoComponent);
 
 export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
+  const { CriticalPartsScanning } = useTreatments(
+    ["CriticalPartsScanning"],
+    {},
+    bodyshop.imexshopid
+  );
   const { t } = useTranslation();
   return (
     <Card
@@ -71,6 +78,11 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
         <Tabs.TabPane key="laborrates" tab={t("bodyshop.labels.laborrates")}>
           <ShopInfoLaborRates form={form} />
         </Tabs.TabPane>
+        {CriticalPartsScanning.treatment === "on" && (
+          <Tabs.TabPane key="partsscan" tab={t("bodyshop.labels.partsscan")}>
+            <ShopInfoPartsScan form={form} />
+          </Tabs.TabPane>
+        )}
       </Tabs>
     </Card>
   );

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

@@ -466,6 +466,20 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Switch />
         </Form.Item>
+        <Form.Item
+          name={["enforce_conversion_csr"]}
+          label={t("bodyshop.fields.enforce_conversion_csr")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
+        <Form.Item
+          name={["enforce_conversion_category"]}
+          label={t("bodyshop.fields.enforce_conversion_category")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
         <Form.Item
           name={["target_touchtime"]}
           label={t("bodyshop.fields.target_touchtime")}
@@ -575,6 +589,13 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Switch />
         </Form.Item>
+        <Form.Item
+          name={["tt_enforce_hours_for_tech_console"]}
+          label={t("bodyshop.fields.tt_enforce_hours_for_tech_console")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
         <Form.Item
           name={["bill_allow_post_to_closed"]}
           label={t("bodyshop.fields.bill_allow_post_to_closed")}
@@ -1337,7 +1358,14 @@ export default function ShopInfoGeneral({ form }) {
                       >
                         <InputNumber precision={0} min={0} max={100} />
                       </Form.Item>
-
+                      <Form.Item
+                        label={t("joblines.fields.ah_detail_line")}
+                        key={`${index}ah_detail_line`}
+                        name={[field.name, "ah_detail_line"]}
+                        valuePropName="checked"
+                      >
+                        <Switch />
+                      </Form.Item>
                       <Space wrap>
                         <DeleteFilled
                           onClick={() => {

client/src/components/shop-info/shop-info.parts-scan.jsx

@@ -0,0 +1,81 @@
+import { DeleteFilled } from "@ant-design/icons";
+import { Button, Form, Input, Space } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+
+export default function ShopInfoPartsScan({ form }) {
+  const { t } = useTranslation();
+
+  return (
+    <div>
+      <LayoutFormRow header={t("bodyshop.labels.md_parts_scan")}>
+        <Form.List name={["md_parts_scan"]}>
+          {(fields, { add, remove, move }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider>
+                      <Form.Item
+                        label={t("bodyshop.fields.md_parts_scan.expression")}
+                        key={`${index}expression`}
+                        name={[field.name, "expression"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("bodyshop.fields.md_parts_scan.flags")}
+                        key={`${index}flags`}
+                        name={[field.name, "flags"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+
+                      <Space wrap>
+                        <DeleteFilled
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows
+                          move={move}
+                          index={index}
+                          total={fields.length}
+                        />
+                      </Space>
+                    </LayoutFormRow>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    onClick={() => {
+                      add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("bodyshop.actions.addpartsrule")}
+                  </Button>
+                </Form.Item>
+              </div>
+            );
+          }}
+        </Form.List>
+      </LayoutFormRow>
+    </div>
+  );
+}

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

@@ -217,7 +217,9 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                 {t("jobs.fields.ponumber")}
                               </Select.Option>
                               <Select.Option value="account_number">
-                                {t("jobs.fields.dms.control_type.account_number")}
+                                {t(
+                                  "jobs.fields.dms.control_type.account_number"
+                                )}
                               </Select.Option>
                             </Select>
                           </Form.Item>
@@ -423,6 +425,15 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                           <Input onBlur={handleBlur} />
                         </Form.Item>
                       )}
+                      {bodyshop.cdk_dealerid && (
+                        <Form.Item
+                          label={t("bodyshop.fields.dms.dms_control_override")}
+                          key={`${index}dms_control_override`}
+                          name={[field.name, "dms_control_override"]}
+                        >
+                          <Input onBlur={handleBlur} />
+                        </Form.Item>
+                      )}
 
                       <DeleteFilled
                         onClick={() => {
@@ -546,6 +557,15 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                           <Input onBlur={handleBlur} />
                         </Form.Item>
                       )}
+                      {bodyshop.cdk_dealerid && (
+                        <Form.Item
+                          label={t("bodyshop.fields.dms.dms_control_override")}
+                          key={`${index}dms_control_override`}
+                          name={[field.name, "dms_control_override"]}
+                        >
+                          <Input onBlur={handleBlur} />
+                        </Form.Item>
+                      )}
                       <DeleteFilled
                         onClick={() => {
                           remove(field.name);

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

@@ -76,6 +76,19 @@ export default function ShopInfoSchedulingComponent({ form }) {
         >
           <InputNumber min={0} />
         </Form.Item>
+        <Form.Item
+          name={["md_lost_sale_reasons"]}
+          label={t("bodyshop.fields.md_lost_sale_reasons")}
+          rules={[
+            {
+              // required: true,
+              //message: t("general.validation.required"),
+              type: "array",
+            },
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
       </LayoutFormRow>
       <Divider orientation="left">{t("bodyshop.labels.workingdays")}</Divider>
       <Space wrap size="large">

client/src/components/shop-users-auth-edit/shop-users-auth-edit.component.jsx

@@ -42,7 +42,9 @@ export default function ShopUsersAuthEdit({ association }) {
         </div>
       )}
       {!visible && (
-        <div style={{ cursor: "pointer" }} onClick={() => setVisible(true)}>
+        <div
+          style={{ cursor: "pointer" }} //onClick={() => setVisible(true)}
+        >
           {association.authlevel || t("general.labels.na")}
         </div>
       )}

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

@@ -26,6 +26,10 @@ export function TechClockInContainer({
   technician,
   bodyshop,
 }) {
+  console.log(
+    "🚀 ~ file: tech-job-clock-in-form.container.jsx:29 ~ technician:",
+    technician
+  );
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
   const [insertTimeTicket] = useMutation(INSERT_NEW_TIME_TICKET, {
@@ -33,6 +37,10 @@ export function TechClockInContainer({
   });
   const { t } = useTranslation();
 
+  const emps = bodyshop.employees.filter(
+    (e) => e.id === (technician && technician.id)
+  )[0];
+
   const handleFinish = async (values) => {
     setLoading(true);
     const theTime = (await axios.post("/utils/time")).data;
@@ -87,7 +95,12 @@ export function TechClockInContainer({
             onClick={() => {
               setTimeTicketContext({
                 actions: {},
-                context: { timeticket: { employeeid: technician.id } },
+                context: {
+                  timeticket: {
+                    employeeid: technician.id,
+                    flat_rate: emps.flat_rate,
+                  },
+                },
               });
             }}
           >

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

@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client";
+import { useMutation, useQuery } from "@apollo/client";
 import {
   Button,
   Card,
@@ -21,6 +21,8 @@ import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import TechJobClockoutDelete from "../tech-job-clock-out-delete/tech-job-clock-out-delete.component";
 import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component";
+import { GET_LINE_TICKET_BY_PK } from "../../graphql/jobs-lines.queries";
+import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -39,7 +41,17 @@ export function TechClockOffButton({
   const [loading, setLoading] = useState(false);
   const [updateTimeticket] = useMutation(UPDATE_TIME_TICKET);
   const [form] = Form.useForm();
-
+  const { queryLoading, data: lineTicketData } = useQuery(
+    GET_LINE_TICKET_BY_PK,
+    {
+      variables: {
+        id: jobId,
+      },
+      skip: !jobId,
+      fetchPolicy: "network-only",
+      nextFetchPolicy: "network-only",
+    }
+  );
   const { t } = useTranslation();
   const emps = bodyshop.employees.filter(
     (e) => e.id === (technician && technician.id)
@@ -59,6 +71,7 @@ export function TechClockOffButton({
             emps &&
             emps.rates.filter((r) => r.cost_center === values.cost_center)[0]
               ?.rate,
+          flat_rate: emps && emps.flat_rate,
           ciecacode:
             bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
               ? values.cost_center
@@ -128,6 +141,54 @@ export function TechClockOffButton({
                         required: true,
                         //message: t("general.validation.required"),
                       },
+                      ({ getFieldValue }) => ({
+                        validator(rule, value) {
+                          console.log(
+                            bodyshop.tt_enforce_hours_for_tech_console
+                          );
+                          if (!bodyshop.tt_enforce_hours_for_tech_console) {
+                            return Promise.resolve();
+                          }
+                          if (
+                            !value ||
+                            getFieldValue("cost_center") === null ||
+                            !lineTicketData
+                          )
+                            return Promise.resolve();
+
+                          //Check the cost center,
+                          const totals = CalculateAllocationsTotals(
+                            bodyshop,
+                            lineTicketData.joblines,
+                            lineTicketData.timetickets,
+                            lineTicketData.jobs_by_pk.lbr_adjustments
+                          );
+
+                          const fieldTypeToCheck =
+                            bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                              ? "mod_lbr_ty"
+                              : "cost_center";
+
+                          const costCenterDiff =
+                            Math.round(
+                              totals.find(
+                                (total) =>
+                                  total[fieldTypeToCheck] ===
+                                  getFieldValue("cost_center")
+                              )?.difference * 10
+                            ) / 10;
+
+                          if (value > costCenterDiff)
+                            return Promise.reject(
+                              t(
+                                "timetickets.validation.hoursenteredmorethanavailable"
+                              )
+                            );
+                          else {
+                            return Promise.resolve();
+                          }
+                        },
+                      }),
                     ]}
                   >
                     <InputNumber min={0} precision={1} />
@@ -177,7 +238,11 @@ export function TechClockOffButton({
             </Col>
             {!isShiftTicket && (
               <Col span={16}>
-                <LaborAllocationContainer jobid={jobId} />
+                <LaborAllocationContainer
+                  jobid={jobId || null}
+                  loading={queryLoading}
+                  lineTicketData={lineTicketData}
+                />
               </Col>
             )}
           </Row>

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

@@ -85,7 +85,7 @@ export function TimeTicketList({
               text: (() => {
                 const emp = bodyshop.employees.find((e) => e.id === s);
 
-                return `${emp.first_name} ${emp.last_name}`;
+                return `${emp?.first_name} ${emp?.last_name}`;
               })(), //
               value: [s],
             };

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

@@ -1,4 +1,4 @@
-import { useQuery } from "@apollo/client";
+import { useLazyQuery } from "@apollo/client";
 import { Form, Input, InputNumber, Select, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -14,6 +14,7 @@ import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import FormDateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import JobSearchSelect from "../job-search-select/job-search-select.component";
 import LaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.component";
+import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
@@ -38,7 +39,11 @@ export function TimeTicketModalComponent({
   employeeSelectDisabled,
 }) {
   const { t } = useTranslation();
-
+  const [loadLineTicketData, { called, loading, data: lineTicketData }] =
+    useLazyQuery(GET_LINE_TICKET_BY_PK, {
+      fetchPolicy: "network-only",
+      nextFetchPolicy: "network-only",
+    });
   const CostCenterSelect = ({ emps, value, ...props }) => {
     return (
       <Select
@@ -82,9 +87,10 @@ export function TimeTicketModalComponent({
               label={t("timetickets.fields.ro_number")}
               rules={[
                 {
-                  required:
-                    !form.getFieldValue("cost_center") ===
-                    "timetickets.labels.shift",
+                  required: !(
+                    form.getFieldValue("cost_center") ===
+                    "timetickets.labels.shift"
+                  ),
                   //message: t("general.validation.required"),
                 },
               ]}
@@ -175,6 +181,51 @@ export function TimeTicketModalComponent({
               label={t("timetickets.fields.productivehrs")}
               name="productivehrs"
               rules={[
+                ({ getFieldValue }) => ({
+                  validator(rule, value) {
+                    if (!bodyshop.tt_enforce_hours_for_tech_console) {
+                      return Promise.resolve();
+                    }
+                    if (
+                      !value ||
+                      getFieldValue("cost_center") === null ||
+                      !lineTicketData
+                    )
+                      return Promise.resolve();
+
+                    //Check the cost center,
+                    const totals = CalculateAllocationsTotals(
+                      bodyshop,
+                      lineTicketData.joblines,
+                      lineTicketData.timetickets,
+                      lineTicketData.jobs_by_pk.lbr_adjustments
+                    );
+
+                    const fieldTypeToCheck =
+                      bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                        ? "mod_lbr_ty"
+                        : "cost_center";
+
+                    const costCenterDiff =
+                      Math.round(
+                        totals.find(
+                          (total) =>
+                            total[fieldTypeToCheck] ===
+                            getFieldValue("cost_center")
+                        )?.difference * 10
+                      ) / 10;
+
+                    if (value > costCenterDiff)
+                      return Promise.reject(
+                        t(
+                          "timetickets.validation.hoursenteredmorethanavailable"
+                        )
+                      );
+                    else {
+                      return Promise.resolve();
+                    }
+                  },
+                }),
                 {
                   required:
                     form.getFieldValue("cost_center") !==
@@ -290,23 +341,28 @@ export function TimeTicketModalComponent({
         </Form.Item>
       </LayoutFormRow>
       <Form.Item dependencies={["jobid"]}>
-        {() => (
-          <LaborAllocationContainer
-            jobid={form.getFieldValue("jobid") || null}
-          />
-        )}
+        {() => {
+          const jobid = form.getFieldValue("jobid");
+          if (
+            (!called && jobid) ||
+            (jobid && lineTicketData?.jobs_by_pk?.id !== jobid && !loading)
+          ) {
+            loadLineTicketData({ variables: { id: jobid } });
+          }
+          return (
+            <LaborAllocationContainer
+              jobid={jobid || null}
+              loading={loading}
+              lineTicketData={lineTicketData}
+            />
+          );
+        }}
       </Form.Item>
     </div>
   );
 }
 
-export function LaborAllocationContainer({ jobid }) {
-  const { loading, data: lineTicketData } = useQuery(GET_LINE_TICKET_BY_PK, {
-    variables: { id: jobid },
-    skip: !jobid,
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-  });
+export function LaborAllocationContainer({ jobid, loading, lineTicketData }) {
   if (loading) return <LoadingSkeleton />;
   if (!lineTicketData) return null;
   return (

client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx

@@ -131,6 +131,7 @@ const JobRelatedTicketsTable = ({
 
           return {
             id: `${item.jobKey}${costCenter}`,
+            costCenter,
             item,
             actHrs: actHrs.toFixed(1),
             prodHrs: prodHrs.toFixed(1),
@@ -151,7 +152,9 @@ const JobRelatedTicketsTable = ({
       sortOrder:
         state.sortedInfo.columnKey === "empname" && state.sortedInfo.order,
       render: (text, record) =>
-        `${record.item.employee.first_name} ${record.item.employee.last_name}`,
+        `${record.item.employee.first_name} ${record.item.employee.last_name} ${
+          record.costCenter ? `(${record.costCenter})` : ""
+        }`.trim(),
     },
     {
       title: t("timetickets.fields.actualhrs"),

client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx

@@ -1,16 +1,41 @@
 import React, { useState } from "react";
-import { Button, Form, notification, PageHeader } from "antd";
+import { Button, Form, notification, PageHeader, Popconfirm } from "antd";
 import { useMutation } from "@apollo/client";
 import VehicleDetailFormComponent from "./vehicle-detail-form.component";
 import { useTranslation } from "react-i18next";
 import moment from "moment";
-import { UPDATE_VEHICLE } from "../../graphql/vehicles.queries";
+import { DELETE_VEHICLE, UPDATE_VEHICLE } from "../../graphql/vehicles.queries";
+import { useHistory } from "react-router-dom";
 
 function VehicleDetailFormContainer({ vehicle, refetch }) {
   const { t } = useTranslation();
   const [updateVehicle] = useMutation(UPDATE_VEHICLE);
+  const [deleteVehicle] = useMutation(DELETE_VEHICLE);
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
+  const history = useHistory();
+
+  const handleDelete = async () => {
+    setLoading(true);
+    const result = await deleteVehicle({
+      variables: { id: vehicle.id },
+    });
+    console.log(result);
+    if (result.errors) {
+      notification["error"]({
+        message: t("vehicles.errors.deleting", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+      setLoading(false);
+    } else {
+      notification["success"]({
+        message: t("vehicles.successes.delete"),
+      });
+      setLoading(false);
+      history.push(`/manage/vehicles`);
+    }
+  };
 
   const handleFinish = async (values) => {
     setLoading(true);
@@ -40,15 +65,29 @@ function VehicleDetailFormContainer({ vehicle, refetch }) {
     <>
       <PageHeader
         title={t("menus.header.vehicles")}
-        extra={
+        extra={[
+          <Popconfirm
+            trigger="click"
+            onConfirm={handleDelete}
+            disabled={vehicle.jobs.length !== 0}
+            title={t("vehicles.labels.deleteconfirm")}
+          >
+            <Button
+              type="danger"
+              loading={loading}
+              disabled={vehicle.jobs.length !== 0}
+            >
+              {t("general.actions.delete")}
+            </Button>
+          </Popconfirm>,
           <Button
             type="primary"
             loading={loading}
             onClick={() => form.submit()}
           >
             {t("general.actions.save")}
-          </Button>
-        }
+          </Button>,
+        ]}
       />
       <Form
         onFinish={handleFinish}

client/src/graphql/appointments.queries.js

@@ -268,6 +268,7 @@ export const CANCEL_APPOINTMENTS_BY_JOB_ID = gql`
       scheduled_in
       scheduled_completion
       status
+      lost_sale_reason
     }
   }
 `;
@@ -294,6 +295,12 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
       where: { inproduction: { _eq: true }, suspended: { _eq: false } }
     ) {
       id
+      actual_in
+      scheduled_in
+      actual_completion
+      scheduled_completion
+      inproduction
+      ro_number
       labhrs: joblines_aggregate(
         where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
       ) {
@@ -327,12 +334,15 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
       }
     ) {
       id
+      status
       ro_number
       scheduled_completion
       actual_completion
+      scheduled_in
       ownr_fn
       ownr_ln
       ownr_co_nm
+      inproduction
       labhrs: joblines_aggregate(
         where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
       ) {
@@ -360,10 +370,16 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
     ) {
       id
       scheduled_in
+      actual_in
+      scheduled_completion
       ro_number
       ownr_fn
       ownr_ln
       ownr_co_nm
+      alt_transport
+      actual_completion
+      inproduction
+      status
       labhrs: joblines_aggregate(
         where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
       ) {

client/src/graphql/associations.queries.js

@@ -1,8 +1,11 @@
 import { gql } from "@apollo/client";
 
 export const QUERY_ALL_ASSOCIATIONS = gql`
-  query QUERY_ALL_ASSOCIATIONS {
-    associations(order_by: { bodyshop: { shopname: asc } }) {
+  query QUERY_ALL_ASSOCIATIONS($email: String) {
+    associations(
+      where: { useremail: { _eq: $email } }
+      order_by: { bodyshop: { shopname: asc } }
+    ) {
       id
       active
       bodyshop {
@@ -27,6 +30,30 @@ export const UPDATE_ASSOCIATION = gql`
     }
   }
 `;
+export const UPDATE_ACTIVE_ASSOCIATION = gql`
+  mutation UPDATE_ACTIVE_ASSOCIATION($newActiveAssocId: uuid) {
+    nweActive: update_associations(
+      where: { id: { _eq: $newActiveAssocId } }
+      _set: { active: true }
+    ) {
+      returning {
+        id
+        shopid
+        active
+      }
+    }
+    inactive: update_associations(
+      where: { id: { _neq: $newActiveAssocId } }
+      _set: { active: false }
+    ) {
+      returning {
+        id
+        shopid
+        active
+      }
+    }
+  }
+`;
 
 export const UPDATE_ACTIVE_PROD_LIST_VIEW = gql`
   mutation UPDATE_ACTIVE_PROD_LIST_VIEW($assocId: uuid, $view: String) {

client/src/graphql/bodyshop.queries.js

@@ -12,6 +12,7 @@ export const QUERY_BODYSHOP = gql`
   query QUERY_BODYSHOP {
     bodyshops(where: { associations: { active: { _eq: true } } }) {
       associations {
+        id
         authlevel
         useremail
         default_prod_list_view
@@ -111,6 +112,11 @@ export const QUERY_BODYSHOP = gql`
       localmediaserverhttp
       localmediaservernetwork
       localmediatoken
+      enforce_conversion_csr
+      md_lost_sale_reasons
+      md_parts_scan
+      enforce_conversion_category
+      tt_enforce_hours_for_tech_console
       employees {
         user_email
         id
@@ -120,6 +126,7 @@ export const QUERY_BODYSHOP = gql`
         employee_number
         rates
         external_id
+        flat_rate
       }
     }
   }
@@ -220,6 +227,11 @@ export const UPDATE_SHOP = gql`
         localmediaserverhttp
         localmediaservernetwork
         localmediatoken
+        enforce_conversion_csr
+        md_lost_sale_reasons
+        md_parts_scan
+        enforce_conversion_category
+        tt_enforce_hours_for_tech_console
         employees {
           id
           first_name

client/src/graphql/conversations.queries.js

@@ -31,6 +31,18 @@ import { gql } from "@apollo/client";
 //   }
 // `;
 
+export const UNREAD_CONVERSATION_COUNT = gql`
+  query UNREAD_CONVERSATION_COUNT {
+    messages_aggregate(
+      where: { read: { _eq: false }, isoutbound: { _eq: false } }
+    ) {
+      aggregate {
+        count
+      }
+    }
+  }
+`;
+
 export const CONVERSATION_LIST_QUERY = gql`
   query CONVERSATION_LIST_QUERY {
     conversations(

client/src/graphql/jobs.queries.js

@@ -284,6 +284,7 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
       clm_no
       v_make_desc
       v_color
+      vehicleid
       plate_no
       actual_in
       scheduled_completion
@@ -501,6 +502,10 @@ export const GET_JOB_BY_PK = gql`
         first_name
         last_name
       }
+      employee_csr
+      employee_prep
+      employee_refinish
+      employee_body
       alt_transport
       intakechecklist
       invoice_final_note
@@ -532,6 +537,7 @@ export const GET_JOB_BY_PK = gql`
       driveable
       towin
       loss_of_use
+      lost_sale_reason
       vehicle {
         id
         plate_no
@@ -716,6 +722,8 @@ export const GET_JOB_BY_PK = gql`
         prt_dsmk_m
         ioucreated
         convertedtolbr
+        ah_detail_line
+        critical
         billlines(limit: 1, order_by: { bill: { date: desc } }) {
           id
           quantity
@@ -851,6 +859,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       owner_owing
       special_coverage_policy
       suspended
+      lbr_adjustments
       available_jobs {
         id
       }
@@ -1096,6 +1105,9 @@ export const UPDATE_JOB_ASSIGNMENTS = gql`
           first_name
           last_name
         }
+        employee_csr
+        employee_body
+        employee_prep
       }
     }
   }
@@ -1144,29 +1156,8 @@ export const UPDATE_JOBS = gql`
 `;
 
 export const CONVERT_JOB_TO_RO = gql`
-  mutation CONVERT_JOB_TO_RO(
-    $jobId: uuid!
-    $class: String
-    $ins_co_nm: String!
-    $ca_gst_registrant: Boolean
-    $driveable: Boolean
-    $towin: Boolean
-    $referral_source: String
-    $referral_source_extra: String
-  ) {
-    update_jobs(
-      where: { id: { _eq: $jobId } }
-      _set: {
-        converted: true
-        ins_co_nm: $ins_co_nm
-        class: $class
-        ca_gst_registrant: $ca_gst_registrant
-        towin: $towin
-        driveable: $driveable
-        referral_source: $referral_source
-        referral_source_extra: $referral_source_extra
-      }
-    ) {
+  mutation CONVERT_JOB_TO_RO($jobId: uuid!, $job: jobs_set_input!) {
+    update_jobs(where: { id: { _eq: $jobId } }, _set: $job) {
       returning {
         id
         ro_number
@@ -1175,6 +1166,10 @@ export const CONVERT_JOB_TO_RO = gql`
         ins_co_nm
         referral_source
         referral_source_extra
+        employee_csr
+        employee_csr_rel {
+          id
+        }
       }
     }
   }
@@ -1900,6 +1895,7 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
       kmin
       kmout
       qb_multiple_payers
+      lbr_adjustments
       joblines(where: { removed: { _eq: false } }, order_by: { line_no: asc }) {
         id
         removed
@@ -2067,6 +2063,7 @@ export const QUERY_JOB_EXPORT_DMS = gql`
       ownr_fn
       ownr_ln
       ownr_co_nm
+      ins_co_nm
       kmin
       kmout
       v_make_desc

client/src/graphql/owners.queries.js

@@ -94,6 +94,14 @@ export const UPDATE_OWNER = gql`
   }
 `;
 
+export const DELETE_OWNER = gql`
+  mutation DELETE_OWNER($id: uuid!) {
+    delete_owners_by_pk(id: $id) {
+      id
+    }
+  }
+`;
+
 export const QUERY_ALL_OWNERS = gql`
   query QUERY_ALL_OWNERS {
     owners {

client/src/graphql/vehicles.queries.js

@@ -55,6 +55,14 @@ export const UPDATE_VEHICLE = gql`
   }
 `;
 
+export const DELETE_VEHICLE = gql`
+  mutation DELETE_VEHICLE($id: uuid!) {
+    delete_vehicles_by_pk(id: $id) {
+      id
+    }
+  }
+`;
+
 export const QUERY_ALL_VEHICLES = gql`
   query QUERY_ALL_VEHICLES {
     vehicles {

client/src/index.js

@@ -14,7 +14,7 @@ import { persistor, store } from "./redux/store";
 import reportWebVitals from "./reportWebVitals";
 import "./translations/i18n";
 import "./utils/CleanAxios";
-require("dotenv").config();
+//import { BrowserTracing } from "@sentry/tracing";
 
 // Dinero.defaultCurrency = "CAD";
 // Dinero.globalLocale = "en-CA";
@@ -29,10 +29,18 @@ if (process.env.NODE_ENV !== "development") {
       "Module specifier, 'zlib' does not start with",
     ],
     integrations: [
-      // new Integrations.BrowserTracing(),
+      // new BrowserTracing(),
       // new Sentry.Integrations.Breadcrumbs({ console: true }),
+      //  new Sentry.Replay(),
     ],
+    // This sets the sample rate to be 10%. You may want this to be 100% while
+    // in development and sample at a lower rate in production
+    // replaysSessionSampleRate: 0.1,
+    // // If the entire session is not sampled, use the below sample rate to sample
+    // // sessions when an error occurs.
+    // replaysOnErrorSampleRate: 1.0,
     environment: process.env.NODE_ENV,
+    // tracesSampleRate: 0.2,
     // We recommend adjusting this value in production, or using tracesSampler
     // for finer control
     //  tracesSampleRate: 0.5,

client/src/pages/dms/dms.container.jsx

@@ -101,7 +101,10 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
         ];
       });
     });
-
+    socket.on("connect_error", (err) => {
+      console.log(`connect_error due to ${err}`, err);
+      notification.error({ message: err.message });
+    });
     socket.on("log-event", (payload) => {
       setLogs((logs) => {
         return [...logs, payload];

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

@@ -17,7 +17,7 @@ export default function JobsCreateComponent({ form }) {
   const steps = [
     {
       title: t("jobs.labels.create.vehicleinfo"),
-      content: <JobsCreateVehicleInfoContainer />,
+      content: <JobsCreateVehicleInfoContainer form={form} />,
       validation:
         !!state.vehicle.new ||
         !!state.vehicle.selectedid ||

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

@@ -51,6 +51,7 @@ import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.comp
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
+import UndefinedToNull from "../../utils/undefinedtonull";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -96,7 +97,7 @@ export function JobsDetailPage({
       variables: {
         jobId: job.id,
         job: {
-          ...values,
+          ...UndefinedToNull(values, ["alt_transport", "category", "referral_source"]),
           parts_tax_rates: {
             ...job.parts_tax_rates,
             ...values.parts_tax_rates,

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

@@ -1,5 +1,3 @@
-import { Elements } from "@stripe/react-stripe-js";
-import { loadStripe } from "@stripe/stripe-js";
 import { BackTop, Layout } from "antd";
 import preval from "preval.macro";
 import React, { lazy, Suspense, useEffect } from "react";
@@ -170,18 +168,6 @@ const DmsPayables = lazy(() =>
 
 const { Content, Footer } = Layout;
 
-const stripePromise = new Promise((resolve, reject) => {
-  // client.query({ query: QUERY_STRIPE_ID }).then((resp) => {
-  //   if (resp.data.bodyshops[0])
-  resolve(
-    loadStripe(process.env.REACT_APP_STRIPE_PUBLIC_KEY, {
-      stripeAccount: "No Stripe Id Resolve",
-    })
-  );
-  //   reject();
-  // });
-});
-
 const mapStateToProps = createStructuredSelector({
   conflict: selectInstanceConflict,
   bodyshop: selectBodyshop,
@@ -207,9 +193,8 @@ export function Manage({ match, conflict, bodyshop }) {
     <Suspense
       fallback={<LoadingSpinner message={t("general.labels.loadingapp")} />}
     >
-      <Elements stripe={stripePromise}>
-        <PaymentModalContainer />
-      </Elements>
+      <PaymentModalContainer />
+
       <BreadCrumbs />
       <BillEnterModalContainer />
       <JobCostingModal />

client/src/pages/mobile-payment/mobile-payment.component.jsx

@@ -1,81 +1,81 @@
-import {
-  PaymentRequestButtonElement,
-  useStripe,
-} from "@stripe/react-stripe-js";
-import React, { useEffect, useState } from "react";
+// import {
+//   PaymentRequestButtonElement,
+//   useStripe,
+// } from "@stripe/react-stripe-js";
+// import React, { useEffect, useState } from "react";
 
-export default function MobilePaymentComponent() {
-  const stripe = useStripe();
+// export default function MobilePaymentComponent() {
+//   const stripe = useStripe();
 
-  const [paymentRequest, setPaymentRequest] = useState(null);
-  useEffect(() => {
-    if (stripe) {
-      const pr = stripe.paymentRequest({
-        country: "CA",
-        displayItems: [{ label: "Deductible", amount: 1 }],
-        currency: "cad",
-        total: {
-          label: "Demo total",
-          amount: 1,
-        },
-        requestPayerName: true,
-        requestPayerEmail: true,
-      });
+//   const [paymentRequest, setPaymentRequest] = useState(null);
+//   useEffect(() => {
+//     if (stripe) {
+//       const pr = stripe.paymentRequest({
+//         country: "CA",
+//         displayItems: [{ label: "Deductible", amount: 1 }],
+//         currency: "cad",
+//         total: {
+//           label: "Demo total",
+//           amount: 1,
+//         },
+//         requestPayerName: true,
+//         requestPayerEmail: true,
+//       });
 
-      // Check the availability of the Payment Request API.
-      pr.canMakePayment().then((result) => {
-        if (result) {
-          setPaymentRequest(pr);
-        } else {
-          // var details = {
-          //   total: { label: "", amount: { currency: "CAD", value: "0.00" } },
-          // };
-          // new PaymentRequest(
-          //   [{ supportedMethods: ["basic-card"] }],
-          //   {}
-          //   //  details
-          // ).show();
-        }
-      });
-    }
-  }, [stripe]);
+//       // Check the availability of the Payment Request API.
+//       pr.canMakePayment().then((result) => {
+//         if (result) {
+//           setPaymentRequest(pr);
+//         } else {
+//           // var details = {
+//           //   total: { label: "", amount: { currency: "CAD", value: "0.00" } },
+//           // };
+//           // new PaymentRequest(
+//           //   [{ supportedMethods: ["basic-card"] }],
+//           //   {}
+//           //   //  details
+//           // ).show();
+//         }
+//       });
+//     }
+//   }, [stripe]);
 
-  if (paymentRequest) {
-    paymentRequest.on("paymentmethod", async (ev) => {
-      //Call server side to get the client secret
-      // Confirm the PaymentIntent without handling potential next actions (yet).
-      const { error: confirmError } = await stripe.confirmCardPayment(
-        "clientSecret",
-        { payment_method: ev.paymentMethod.id },
-        { handleActions: false }
-      );
+//   if (paymentRequest) {
+//     paymentRequest.on("paymentmethod", async (ev) => {
+//       //Call server side to get the client secret
+//       // Confirm the PaymentIntent without handling potential next actions (yet).
+//       const { error: confirmError } = await stripe.confirmCardPayment(
+//         "clientSecret",
+//         { payment_method: ev.paymentMethod.id },
+//         { handleActions: false }
+//       );
 
-      if (confirmError) {
-        // Report to the browser that the payment failed, prompting it to
-        // re-show the payment interface, or show an error message and close
-        // the payment interface.
-        ev.complete("fail");
-      } else {
-        // Report to the browser that the confirmation was successful, prompting
-        // it to close the browser payment method collection interface.
-        ev.complete("success");
-        // Let Stripe.js handle the rest of the payment flow.
-        const {
-          error, //paymentIntent
-        } = await stripe.confirmCardPayment("clientSecret");
-        if (error) {
-          // The payment failed -- ask your customer for a new payment method.
-        } else {
-          // The payment has succeeded.
-        }
-      }
-    });
-    return (
-      <div style={{ height: "300px" }}>
-        <PaymentRequestButtonElement options={{ paymentRequest }} />
-      </div>
-    );
-  }
+//       if (confirmError) {
+//         // Report to the browser that the payment failed, prompting it to
+//         // re-show the payment interface, or show an error message and close
+//         // the payment interface.
+//         ev.complete("fail");
+//       } else {
+//         // Report to the browser that the confirmation was successful, prompting
+//         // it to close the browser payment method collection interface.
+//         ev.complete("success");
+//         // Let Stripe.js handle the rest of the payment flow.
+//         const {
+//           error, //paymentIntent
+//         } = await stripe.confirmCardPayment("clientSecret");
+//         if (error) {
+//           // The payment failed -- ask your customer for a new payment method.
+//         } else {
+//           // The payment has succeeded.
+//         }
+//       }
+//     });
+//     return (
+//       <div style={{ height: "300px" }}>
+//         <PaymentRequestButtonElement options={{ paymentRequest }} />
+//       </div>
+//     );
+//   }
 
-  return <div></div>;
-}
+//   return <div></div>;
+// }

client/src/pages/mobile-payment/mobile-payment.container.jsx

@@ -1,23 +1,23 @@
-import { Elements } from "@stripe/react-stripe-js";
-import { loadStripe } from "@stripe/stripe-js";
-import React from "react";
-import MobilePaymentComponent from "./mobile-payment.component";
+// import { Elements } from "@stripe/react-stripe-js";
+// import { loadStripe } from "@stripe/stripe-js";
+// import React from "react";
+// import MobilePaymentComponent from "./mobile-payment.component";
 
-const stripePromise = new Promise((resolve, reject) => {
-  resolve(
-    loadStripe(process.env.REACT_APP_STRIPE_PUBLIC_KEY, {
-      stripeAccount: "acct_1Fa7lFIEahEZW8b4",
-    })
-  );
-});
+// const stripePromise = new Promise((resolve, reject) => {
+//   resolve(
+//     loadStripe(process.env.REACT_APP_STRIPE_PUBLIC_KEY, {
+//       stripeAccount: "acct_1Fa7lFIEahEZW8b4",
+//     })
+//   );
+// });
 
-export default function MobilePaymentContainer() {
-  return (
-    <div>
-      The mobile payment container.
-      <Elements stripe={stripePromise}>
-        <MobilePaymentComponent />
-      </Elements>
-    </div>
-  );
-}
+// export default function MobilePaymentContainer() {
+//   return (
+//     <div>
+//       The mobile payment container.
+//       <Elements stripe={stripePromise}>
+//         <MobilePaymentComponent />
+//       </Elements>
+//     </div>
+//   );
+// }

client/src/pages/profile/profile.page.jsx

@@ -1,3 +1,4 @@
+import { Row } from "antd";
 import React from "react";
 import ProfileMyComponent from "../../components/profile-my/profile-my.component";
 import ProfileShopsContainer from "../../components/profile-shops/profile-shops.container";
@@ -5,8 +6,10 @@ import ProfileShopsContainer from "../../components/profile-shops/profile-shops.
 export default function ProfilePage() {
   return (
     <div>
-      <ProfileMyComponent />
-      <ProfileShopsContainer />
+      <Row gutter={[16, 16]}>
+        <ProfileMyComponent />
+        <ProfileShopsContainer />
+      </Row>
     </div>
   );
 }

client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx

@@ -39,9 +39,11 @@ export function VehicleDetailContainer({
     document.title = t("titles.vehicledetail", {
       vehicle:
         data && data.vehicles_by_pk
-          ? `${data.vehicles_by_pk && data.vehicles_by_pk.v_model_yr} ${
-              data.vehicles_by_pk && data.vehicles_by_pk.v_make_desc
-            } ${data.vehicles_by_pk && data.vehicles_by_pk.v_model_desc}`
+          ? `${(data.vehicles_by_pk && data.vehicles_by_pk.v_model_yr) || ""} ${
+              (data.vehicles_by_pk && data.vehicles_by_pk.v_make_desc) || ""
+            } ${
+              (data.vehicles_by_pk && data.vehicles_by_pk.v_model_desc) || ""
+            }`
           : "",
     });
     setSelectedHeader("vehicles");
@@ -53,7 +55,14 @@ export function VehicleDetailContainer({
         label: t("titles.bc.vehicle-details", {
           vehicle:
             data && data.vehicles_by_pk
-              ? `${data.vehicles_by_pk.v_model_yr} ${data.vehicles_by_pk.v_make_desc} ${data.vehicles_by_pk.v_model_desc}`
+              ? `${
+                  (data.vehicles_by_pk && data.vehicles_by_pk.v_model_yr) || ""
+                } ${
+                  (data.vehicles_by_pk && data.vehicles_by_pk.v_make_desc) || ""
+                } ${
+                  (data.vehicles_by_pk && data.vehicles_by_pk.v_model_desc) ||
+                  ""
+                }`
               : "",
         }),
       },
@@ -64,7 +73,11 @@ export function VehicleDetailContainer({
         CreateRecentItem(
           vehId,
           "vehicle",
-          `${data.vehicles_by_pk.v_vin} | ${data.vehicles_by_pk.v_model_yr} ${data.vehicles_by_pk.v_make_desc} ${data.vehicles_by_pk.v_model_desc}`,
+          `${data.vehicles_by_pk.v_vin || "N/A"} | ${
+            data.vehicles_by_pk.v_model_yr || ""
+          } ${data.vehicles_by_pk.v_make_desc || ""} ${
+            data.vehicles_by_pk.v_model_desc || ""
+          }`.trim(),
           `/manage/vehicles/${vehId}`
         )
       );

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

@@ -37,7 +37,7 @@ export function* calculateScheduleLoad({ payload: end }) {
       productionTotal: {},
       productionHours: 0,
     };
-
+    let problemJobs = [];
     //Set the current load.
     buckets.forEach((bucket) => {
       load.productionTotal[bucket.id] = { count: 0, label: bucket.label };
@@ -45,6 +45,32 @@ export function* calculateScheduleLoad({ payload: end }) {
 
     prodJobs.forEach((item) => {
       //Add all of the jobs currently in production to the buckets so that we have a starting point.
+      if (
+        !item.actual_completion &&
+        moment(item.scheduled_completion).isBefore(moment().startOf("day"))
+      ) {
+        problemJobs.push({
+          ...item,
+          code: "Job was scheduled to go, but it has not been completed. Update the scheduled completion date to correct projections",
+        });
+      }
+
+      if (
+        item.actual_completion &&
+        moment(item.actual_completion).isBefore(moment().startOf("day"))
+      ) {
+        problemJobs.push({
+          ...item,
+          code: "Job is already marked as completed, but it is still in production. This job should be removed from production",
+        });
+      }
+      if (!(item.actual_completion || item.scheduled_completion)) {
+        problemJobs.push({
+          ...item,
+          code: "Job does not have a scheduled or actual completion date. Update the scheduled or actual completion dates to correct projections",
+        });
+      }
+
       const bucketId = CheckJobBucket(buckets, item);
       load.productionHours =
         load.productionHours +
@@ -59,89 +85,129 @@ export function* calculateScheduleLoad({ payload: end }) {
     });
 
     arrJobs.forEach((item) => {
-      if (!item.scheduled_in)
+      if (!item.scheduled_in) {
         console.log("JOB HAS NO SCHEDULED IN DATE.", item);
-      const itemDate = moment(item.scheduled_in).format("yyyy-MM-DD");
+        problemJobs.push({
+          ...item,
+          code: "Job has no scheduled in date",
+        });
+      }
+      if (!item.actual_completion && item.actual_in && !item.inproduction) {
+        problemJobs.push({
+          ...item,
+          code: "Job has an actual in date, but no actual completion date and is not marked as in production",
+        });
+      }
+      if (item.actual_in && moment(item.actual_in).isAfter(moment())) {
+        problemJobs.push({
+          ...item,
+          code: "Job has an actual in date set in the future",
+        });
+      }
+      if (
+        item.actual_completion &&
+        moment(item.actual_completion).isAfter(moment())
+      ) {
+        problemJobs.push({
+          ...item,
+          code: "Job has an actual completion date set in the future",
+        });
+      }
+      if (item.actual_completion && item.inproduction) {
+        problemJobs.push({
+          ...item,
+          code: "Job has an actual completion date but it is still marked in production",
+        });
+      }
+
+      const itemDate = moment(item.actual_in || item.scheduled_in).format(
+        "yyyy-MM-DD"
+      );
+
+      const AddJobForSchedulingCalc = !item.inproduction;
+
       if (!!load[itemDate]) {
-        load[itemDate].hoursIn =
-          (load[itemDate].hoursIn || 0) +
+        load[itemDate].allHoursIn =
+          (load[itemDate].allHoursIn || 0) +
           item.labhrs.aggregate.sum.mod_lb_hrs +
           item.larhrs.aggregate.sum.mod_lb_hrs;
-        load[itemDate].jobsIn.push(item);
+
+        //If the job hasn't already arrived, add it to the jobs in list.
+        // Make sure it also hasn't already been completed, or isn't an in and out job.
+        //This prevents the duplicate counting.
+        load[itemDate].allJobsIn.push(item);
+        if (AddJobForSchedulingCalc) {
+          load[itemDate].jobsIn.push(item);
+          load[itemDate].hoursIn =
+            (load[itemDate].hoursIn || 0) +
+            item.labhrs.aggregate.sum.mod_lb_hrs +
+            item.larhrs.aggregate.sum.mod_lb_hrs;
+        }
       } else {
         load[itemDate] = {
-          jobsIn: [item],
+          allJobsIn: [item],
+          jobsIn: AddJobForSchedulingCalc ? [item] : [], //Same as above, only add it if it isn't already in production.
           jobsOut: [],
-          hoursIn:
+          allJobsOut: [],
+          allHoursIn:
             item.labhrs.aggregate.sum.mod_lb_hrs +
             item.larhrs.aggregate.sum.mod_lb_hrs,
+          hoursIn: AddJobForSchedulingCalc
+            ? item.labhrs.aggregate.sum.mod_lb_hrs +
+              item.larhrs.aggregate.sum.mod_lb_hrs
+            : 0,
         };
       }
     });
 
-    let problemJobs = [];
     compJobs.forEach((item) => {
       if (!(item.actual_completion || item.scheduled_completion))
-        console.log("JOB HAS NO COMPLETION DATE.", item);
+        console.warn("JOB HAS NO COMPLETION DATE.", item);
 
       const inProdJobs = prodJobs.find((p) => p.id === item.id);
       const inArrJobs = arrJobs.find((p) => p.id === item.id);
 
-      if (!(inProdJobs || inArrJobs)) {
-        //Job isn't found in production or coming in.
-        //is it going today or scheduled to go today?
-        if (
-          moment(item.actual_completion || item.scheduled_completion).isSame(
-            moment(),
-            "day"
-          )
-        ) {
-          console.log("Job is going today anyways, ignore it.", item);
-          return;
-        }
-
-        if (
-          moment(item.actual_completion || item.scheduled_completion).isBefore(
-            moment(),
-            "day"
-          )
-        ) {
-          console.log("Job should have already gone. Ignoring it.", item);
-          return;
-        }
-
-        problemJobs.push({
-          ...item,
-          code: "Job is scheduled for completion, but it is not marked in production nor is it an arriving job in this period. Check the scheduled in and completion dates",
-        });
-        return;
-      }
+      const AddJobForSchedulingCalc = inProdJobs || inArrJobs;
 
       const itemDate = moment(
         item.actual_completion || item.scheduled_completion
       ).format("yyyy-MM-DD");
+      //Skip it, it's already completed.
+
       if (!!load[itemDate]) {
-        load[itemDate].hoursOut =
-          (load[itemDate].hoursOut || 0) +
+        load[itemDate].allHoursOut =
+          (load[itemDate].allHoursOut || 0) +
           item.labhrs.aggregate.sum.mod_lb_hrs +
           item.larhrs.aggregate.sum.mod_lb_hrs;
-        load[itemDate].jobsOut.push(item);
+        //Add only the jobs that are still in production to get rid of.
+        //If it's not in production, we'd subtract unnecessarily.
+        load[itemDate].allJobsOut.push(item);
+
+        if (AddJobForSchedulingCalc) {
+          load[itemDate].jobsOut.push(item);
+          load[itemDate].hoursOut =
+            (load[itemDate].hoursOut || 0) +
+            item.labhrs.aggregate.sum.mod_lb_hrs +
+            item.larhrs.aggregate.sum.mod_lb_hrs;
+        }
       } else {
         load[itemDate] = {
-          jobsOut: [item],
-          hoursOut:
+          allJobsOut: [item],
+          jobsOut: AddJobForSchedulingCalc ? [item] : [], //Same as above.
+          hoursOut: AddJobForSchedulingCalc
+            ? item.labhrs.aggregate.sum.mod_lb_hrs +
+              item.larhrs.aggregate.sum.mod_lb_hrs
+            : 0,
+          allHoursOut:
             item.labhrs.aggregate.sum.mod_lb_hrs +
             item.larhrs.aggregate.sum.mod_lb_hrs,
         };
       }
     });
 
-    console.log(
-      "🚀 ~ file: application.sagas.js:160 ~ function*calculateScheduleLoad ~ load.productionTotal",
-      load.productionTotal
-    );
     //Propagate the expected load to each day.
-    const range = Math.round(moment.duration(end.diff(today)).asDays());
+
+    const range = Math.round(moment.duration(end.diff(today)).asDays()) + 1;
     for (var day = 0; day < range; day++) {
       const current = moment(today).add(day, "days").format("yyyy-MM-DD");
       const prev = moment(today)
@@ -150,6 +216,7 @@ export function* calculateScheduleLoad({ payload: end }) {
       if (!!!load[current]) {
         load[current] = {};
       }
+
       if (day === 0) {
         //Starting on day 1. The load is current.
         load[current].expectedLoad = CalculateLoad(
@@ -158,6 +225,10 @@ export function* calculateScheduleLoad({ payload: end }) {
           load[current].jobsIn || [],
           load[current].jobsOut || []
         );
+        load[current].expectedJobCount =
+          prodJobs.length +
+          (load[current].jobsIn || []).length -
+          (load[current].jobsOut || []).length;
         load[current].expectedHours =
           load.productionHours +
           (load[current].hoursIn || 0) -
@@ -169,12 +240,17 @@ export function* calculateScheduleLoad({ payload: end }) {
           load[current].jobsIn || [],
           load[current].jobsOut || []
         );
+        load[current].expectedJobCount =
+          load[prev].expectedJobCount +
+          (load[current].jobsIn || []).length -
+          (load[current].jobsOut || []).length;
         load[current].expectedHours =
           load[prev].expectedHours +
           (load[current].hoursIn || 0) -
           (load[current].hoursOut || 0);
       }
     }
+
     yield put(setProblemJobs(problemJobs));
     yield put(scheduleLoadSuccess(load));
   } catch (error) {

client/src/translations/en_us/common.json

@@ -49,7 +49,8 @@
 				"blocked": "Blocked",
 				"cancelledappointment": "Canceled appointment for: ",
 				"completingjobs": "Completing Jobs",
-				"dataconsistency": "{{ro_number}} has a data consistency issue. It has been excluded for scheduling purposes. CODE: {{code}}.",
+				"dataconsistency": "{{ro_number}} has a data consistency issue. It may have been excluded for scheduling purposes. CODE: {{code}}.",
+				"expectedjobs": "Expected Jobs in Production: ",
 				"expectedprodhrs": "Expected Production Hours:",
 				"history": "History",
 				"inproduction": "Jobs In Production",
@@ -60,6 +61,7 @@
 				"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.",
 				"smartscheduling": "Smart Scheduling",
 				"suggesteddates": "Suggested Dates"
 			},
@@ -228,6 +230,7 @@
 				"addapptcolor": "Add Appointment Color",
 				"addbucket": "Add Definition",
 				"addpartslocation": "Add Parts Location",
+				"addpartsrule": "Add Parts Scan Rule",
 				"addspeedprint": "Add Speed Print",
 				"addtemplate": "Add Template",
 				"newlaborrate": "New Labor Rate",
@@ -268,6 +271,7 @@
 					"disablebillwip": "Disable bill WIP for A/P Posting",
 					"disablecontactvehiclecreation": "Disable Contact & Vehicle Updates/Creation",
 					"dms_acctnumber": "DMS Account #",
+					"dms_control_override": "Static Control # Override",
 					"dms_wip_acctnumber": "DMS W.I.P.  Account #",
 					"generic_customer_number": "Generic Customer Number",
 					"itc_federal": "Federal Tax is ITC?",
@@ -279,6 +283,8 @@
 				},
 				"email": "General Shop Email",
 				"enforce_class": "Enforce Class on Conversion?",
+				"enforce_conversion_category": "Enforce Category on Conversion?",
+				"enforce_conversion_csr": "Enforce CSR on Conversion?",
 				"enforce_referral": "Enforce Referrals",
 				"federal_tax_id": "Federal Tax ID (GST/HST)",
 				"ignoreblockeddays": "Scoreboard - Ignore Blocked Days",
@@ -325,7 +331,12 @@
 					"zip": "Zip/Postal Code"
 				},
 				"md_jobline_presets": "Jobline Presets",
+				"md_lost_sale_reasons": "Lost Sale Reasons",
 				"md_parts_order_comment": "Parts Orders Comments",
+				"md_parts_scan": {
+					"expression": "RegEX Expression",
+					"flags": "Flags"
+				},
 				"md_payment_types": "Payment Types",
 				"md_referral_sources": "Referral Sources",
 				"messaginglabel": "Messaging Preset Label",
@@ -530,6 +541,7 @@
 				"target_touchtime": "Target Touch Time",
 				"timezone": "Timezone",
 				"tt_allow_post_to_invoiced": "Allow Time Tickets to be posted to Invoiced & Exported Jobs",
+				"tt_enforce_hours_for_tech_console": "Restrict Claimable hours from Tech Console",
 				"use_fippa": "Use FIPPA for Names on Generated Documents?",
 				"uselocalmediaserver": "Use Local Media Server?",
 				"website": "Website",
@@ -576,6 +588,7 @@
 				"notespresets": "Notes Presets",
 				"orderstatuses": "Order Statuses",
 				"partslocations": "Parts Locations",
+				"partsscan": "Critical Parts Scanning",
 				"printlater": "Print Later",
 				"qbo": "Use QuickBooks Online?",
 				"qbo_departmentid": "QBO Department ID",
@@ -1051,6 +1064,7 @@
 				"sunday": "Sunday",
 				"text": "Text",
 				"thursday": "Thursday",
+				"total": "Total",
 				"totals": "Totals",
 				"tuesday": "Tuesday",
 				"unknown": "Unknown",
@@ -1141,6 +1155,7 @@
 			},
 			"fields": {
 				"act_price": "Retail Price",
+				"ah_detail_line": "Mark as Detail Labor Line (Autohouse Only)",
 				"db_price": "List Price",
 				"lbr_types": {
 					"LA1": "LA1",
@@ -1213,6 +1228,7 @@
 				"updated": "Job line updated successfully."
 			},
 			"validations": {
+				"ahdetailonlyonuserdefinedtypes": "Detail line indicator can only be set for LA1, LA2, LA3, LA4, and LAU labor types.",
 				"hrsrequirediflbrtyp": "Labor hours are required if a labor type is selected. Clear the labor type if there are no labor hours.",
 				"requiredifparttype": "Required if a part type has been specified.",
 				"zeropriceexistingpart": "This line cannot have any price since it uses an existing part."
@@ -1267,6 +1283,7 @@
 				"removefromproduction": "Remove from Production",
 				"schedule": "Schedule",
 				"sendcsi": "Send CSI",
+				"sendpartspricechange": "",
 				"sendtodms": "Send to DMS",
 				"sync": "Sync",
 				"uninvoice": "Uninvoice",
@@ -1290,6 +1307,7 @@
 				"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.",
@@ -1441,6 +1459,7 @@
 				"loss_date": "Loss Date",
 				"loss_desc": "Loss Description",
 				"loss_of_use": "Loss of Use",
+				"lost_sale_reason": "Lost Sale Reason",
 				"ma2s": "2 Stage Paint",
 				"ma3s": "3 Stage Pain",
 				"mabl": "MABL?",
@@ -1693,6 +1712,7 @@
 					"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."
 				},
+				"profileadjustments": "",
 				"prt_dsmk_total": "Line Item Adjustment",
 				"rates": "Rates",
 				"rates_subtotal": "All Rates Subtotal",
@@ -1975,6 +1995,7 @@
 				"update": "Update Selected Records"
 			},
 			"errors": {
+				"deleting": "Error deleting owner. {{error}}.",
 				"noaccess": "The record does not exist or you do not have access to it.  ",
 				"saving": "Error saving owner. {{error}}.",
 				"selectexistingornew": "Select an existing owner record or create a new one. "
@@ -2007,6 +2028,7 @@
 			},
 			"labels": {
 				"create_new": "Create a new owner record.",
+				"deleteconfirm": "Are you sure you want to delete this owner? This cannot be undone.",
 				"existing_owners": "Existing Owners",
 				"fromclaim": "Current Claim",
 				"fromowner": "Historical Owner Record",
@@ -2014,6 +2036,7 @@
 				"updateowner": "Update Owner"
 			},
 			"successes": {
+				"delete": "Owner deleted successfully.",
 				"save": "Owner saved successfully."
 			}
 		},
@@ -2413,6 +2436,7 @@
 				"credits_not_received_date": "Credits not Received by Date",
 				"credits_not_received_date_vendorid": "Credits not Received by Vendor",
 				"csi": "CSI Responses",
+				"customer_list": "Customer List",
 				"cycle_time_analysis": "Cycle Time Analysis",
 				"estimates_written_converted": "Estimates Written/Converted",
 				"estimator_detail": "Jobs by Estimator (Detail)",
@@ -2420,6 +2444,9 @@
 				"export_payables": "Export Log - Payables",
 				"export_payments": "Export Log - Payments",
 				"export_receivables": "Export Log - Receivables",
+				"gsr_by_atp": "",
+				"gsr_by_ats": "Gross Sales by ATS",
+				"gsr_by_category": "Gross Sales by Category",
 				"gsr_by_csr": "Gross Sales by CSR",
 				"gsr_by_delivery_date": "Gross Sales by Delivery Date",
 				"gsr_by_estimator": "Gross Sales by Estimator",
@@ -2450,12 +2477,15 @@
 				"job_costing_ro_date_summary": "Job Costing by RO - Summary",
 				"job_costing_ro_estimator": "Job Costing by Estimator",
 				"job_costing_ro_ins_co": "Job Costing by RO Source",
+				"jobs_completed_not_invoiced": "Jobs Completed not Invoiced",
+				"jobs_invoiced_not_exported": "Jobs Invoiced not Exported",
 				"jobs_reconcile": "Parts/Sublet/Labor Reconciliation",
 				"lag_time": "Lag Time",
 				"open_orders": "Open Orders by Date",
 				"open_orders_csr": "Open Orders by CSR",
 				"open_orders_estimator": "Open Orders by Estimator",
 				"open_orders_ins_co": "Open Orders by Insurance Company",
+				"open_orders_specific_csr": "Open Orders filtered by CSR",
 				"open_orders_status": "Open Orders by Status",
 				"parts_backorder": "IOU Parts List",
 				"parts_not_recieved": "Parts Not Received",
@@ -2473,7 +2503,10 @@
 				"production_by_target_date": "Production by Target Date",
 				"production_by_technician": "Production by Technician",
 				"production_by_technician_one": "Production filtered by Technician",
+				"production_over_time": "Production Level over Time",
 				"psr_by_make": "Percent of Sales by Vehicle Make",
+				"purchase_return_ratio_grouped_by_vendor_detail": "Purchase & Return Ratio by Vendor (Detail)",
+				"purchase_return_ratio_grouped_by_vendor_summary": "Purchase & Return Ratio by Vendor (Summary)",
 				"purchases_by_cost_center_detail": "Purchases by Cost Center (Detail)",
 				"purchases_by_cost_center_summary": "Purchases by Cost Center (Summary)",
 				"purchases_by_date_range_detail": "Purchases by Date - Detail",
@@ -2482,7 +2515,10 @@
 				"purchases_by_vendor_summary_date_range": "Purchases by Vendor - Summary",
 				"purchases_grouped_by_vendor_detailed": "Purchases Grouped by Vendor - Detailed",
 				"purchases_grouped_by_vendor_summary": "Purchases Grouped by Vendor - Summary",
+				"returns_grouped_by_vendor_detailed": "Returns Grouped by Vendor - Detailed",
+				"returns_grouped_by_vendor_summary": "Returns Grouped by Vendor - Summary",
 				"schedule": "Appointment Schedule",
+				"scheduled_parts_list": "Parts for Jobs Scheduled In",
 				"scoreboard_detail": "Scoreboard Detail",
 				"scoreboard_summary": "Scoreboard Summary",
 				"supplement_ratio_ins_co": "Supplement Ratio by Source",
@@ -2498,7 +2534,9 @@
 		},
 		"schedule": {
 			"labels": {
+				"atssummary": "ATS Summary",
 				"employeevacation": "Employee Vacations",
+				"ins_co_nm_filter": "Filter by Insurance Company",
 				"intake": "Intake Events",
 				"manual": "Manual Events",
 				"manualevent": "Add Manual Event"
@@ -2625,7 +2663,8 @@
 			},
 			"validation": {
 				"clockoffmustbeafterclockon": "Clock off time must be the same or after clock in time.",
-				"clockoffwithoutclockon": "Clock off time cannot be set without a clock in time."
+				"clockoffwithoutclockon": "Clock off time cannot be set without a clock in time.",
+				"hoursenteredmorethanavailable": "The number of hours entered is more than what is available for this cost center."
 			}
 		},
 		"titles": {
@@ -2740,7 +2779,9 @@
 				"photourl": "Avatar URL"
 			},
 			"labels": {
-				"actions": "Actions"
+				"actions": "Actions",
+				"changepassword": "Change Password",
+				"profileinfo": "Profile Info"
 			},
 			"successess": {
 				"passwordchanged": "Password changed successfully. "
@@ -2757,6 +2798,7 @@
 		},
 		"vehicles": {
 			"errors": {
+				"deleting": "Error deleting vehicle. {{error}}.",
 				"noaccess": "The vehicle does not exist or you do not have access to it.",
 				"selectexistingornew": "Select an existing vehicle record or create a new one. ",
 				"validation": "Please ensure all fields are entered correctly.",
@@ -2792,12 +2834,14 @@
 				"registration": "Registration"
 			},
 			"labels": {
+				"deleteconfirm": "Are you sure you want to delete this vehicle? This cannot be undone.",
 				"fromvehicle": "Historical Vehicle Record",
 				"novehinfo": "No Vehicle Information",
 				"relatedjobs": "Related Jobs",
 				"updatevehicle": "Update Vehicle Information"
 			},
 			"successes": {
+				"delete": "Vehicle deleted successfully.",
 				"save": "Vehicle saved successfully."
 			}
 		},

client/src/translations/es/common.json

@@ -50,6 +50,7 @@
 				"cancelledappointment": "Cita cancelada para:",
 				"completingjobs": "",
 				"dataconsistency": "",
+				"expectedjobs": "",
 				"expectedprodhrs": "",
 				"history": "",
 				"inproduction": "",
@@ -60,6 +61,7 @@
 				"priorappointments": "Nombramientos previos",
 				"reminder": "",
 				"scheduledfor": "Cita programada para:",
+				"severalerrorsfound": "",
 				"smartscheduling": "",
 				"suggesteddates": ""
 			},
@@ -228,6 +230,7 @@
 				"addapptcolor": "",
 				"addbucket": "",
 				"addpartslocation": "",
+				"addpartsrule": "",
 				"addspeedprint": "",
 				"addtemplate": "",
 				"newlaborrate": "",
@@ -268,6 +271,7 @@
 					"disablebillwip": "",
 					"disablecontactvehiclecreation": "",
 					"dms_acctnumber": "",
+					"dms_control_override": "",
 					"dms_wip_acctnumber": "",
 					"generic_customer_number": "",
 					"itc_federal": "",
@@ -279,6 +283,8 @@
 				},
 				"email": "",
 				"enforce_class": "",
+				"enforce_conversion_category": "",
+				"enforce_conversion_csr": "",
 				"enforce_referral": "",
 				"federal_tax_id": "",
 				"ignoreblockeddays": "",
@@ -325,7 +331,12 @@
 					"zip": ""
 				},
 				"md_jobline_presets": "",
+				"md_lost_sale_reasons": "",
 				"md_parts_order_comment": "",
+				"md_parts_scan": {
+					"expression": "",
+					"flags": ""
+				},
 				"md_payment_types": "",
 				"md_referral_sources": "",
 				"messaginglabel": "",
@@ -530,6 +541,7 @@
 				"target_touchtime": "",
 				"timezone": "",
 				"tt_allow_post_to_invoiced": "",
+				"tt_enforce_hours_for_tech_console": "",
 				"use_fippa": "",
 				"uselocalmediaserver": "",
 				"website": "",
@@ -576,6 +588,7 @@
 				"notespresets": "",
 				"orderstatuses": "",
 				"partslocations": "",
+				"partsscan": "",
 				"printlater": "",
 				"qbo": "",
 				"qbo_departmentid": "",
@@ -1051,6 +1064,7 @@
 				"sunday": "",
 				"text": "",
 				"thursday": "",
+				"total": "",
 				"totals": "",
 				"tuesday": "",
 				"unknown": "Desconocido",
@@ -1141,6 +1155,7 @@
 			},
 			"fields": {
 				"act_price": "Precio actual",
+				"ah_detail_line": "",
 				"db_price": "Precio de base de datos",
 				"lbr_types": {
 					"LA1": "",
@@ -1213,6 +1228,7 @@
 				"updated": ""
 			},
 			"validations": {
+				"ahdetailonlyonuserdefinedtypes": "",
 				"hrsrequirediflbrtyp": "",
 				"requiredifparttype": "",
 				"zeropriceexistingpart": ""
@@ -1267,6 +1283,7 @@
 				"removefromproduction": "",
 				"schedule": "Programar",
 				"sendcsi": "",
+				"sendpartspricechange": "",
 				"sendtodms": "",
 				"sync": "",
 				"uninvoice": "",
@@ -1290,6 +1307,7 @@
 				"nojobselected": "No hay trabajo seleccionado.",
 				"noowner": "Ningún propietario asociado.",
 				"novehicle": "No hay vehículo asociado.",
+				"partspricechange": "",
 				"saving": "Se encontró un error al guardar el registro.",
 				"scanimport": "",
 				"totalscalc": "",
@@ -1441,6 +1459,7 @@
 				"loss_date": "Fecha de pérdida",
 				"loss_desc": "",
 				"loss_of_use": "",
+				"lost_sale_reason": "",
 				"ma2s": "",
 				"ma3s": "",
 				"mabl": "",
@@ -1693,6 +1712,7 @@
 					"partstotal": "",
 					"totalreturns": ""
 				},
+				"profileadjustments": "",
 				"prt_dsmk_total": "",
 				"rates": "Tarifas",
 				"rates_subtotal": "",
@@ -1975,6 +1995,7 @@
 				"update": ""
 			},
 			"errors": {
+				"deleting": "",
 				"noaccess": "El registro no existe o no tiene acceso a él.",
 				"saving": "",
 				"selectexistingornew": ""
@@ -2007,6 +2028,7 @@
 			},
 			"labels": {
 				"create_new": "Crea un nuevo registro de propietario.",
+				"deleteconfirm": "",
 				"existing_owners": "Propietarios existentes",
 				"fromclaim": "",
 				"fromowner": "",
@@ -2014,6 +2036,7 @@
 				"updateowner": ""
 			},
 			"successes": {
+				"delete": "",
 				"save": "Propietario guardado con éxito."
 			}
 		},
@@ -2413,6 +2436,7 @@
 				"credits_not_received_date": "",
 				"credits_not_received_date_vendorid": "",
 				"csi": "",
+				"customer_list": "",
 				"cycle_time_analysis": "",
 				"estimates_written_converted": "",
 				"estimator_detail": "",
@@ -2420,6 +2444,9 @@
 				"export_payables": "",
 				"export_payments": "",
 				"export_receivables": "",
+				"gsr_by_atp": "",
+				"gsr_by_ats": "",
+				"gsr_by_category": "",
 				"gsr_by_csr": "",
 				"gsr_by_delivery_date": "",
 				"gsr_by_estimator": "",
@@ -2450,12 +2477,15 @@
 				"job_costing_ro_date_summary": "",
 				"job_costing_ro_estimator": "",
 				"job_costing_ro_ins_co": "",
+				"jobs_completed_not_invoiced": "",
+				"jobs_invoiced_not_exported": "",
 				"jobs_reconcile": "",
 				"lag_time": "",
 				"open_orders": "",
 				"open_orders_csr": "",
 				"open_orders_estimator": "",
 				"open_orders_ins_co": "",
+				"open_orders_specific_csr": "",
 				"open_orders_status": "",
 				"parts_backorder": "",
 				"parts_not_recieved": "",
@@ -2473,7 +2503,10 @@
 				"production_by_target_date": "",
 				"production_by_technician": "",
 				"production_by_technician_one": "",
+				"production_over_time": "",
 				"psr_by_make": "",
+				"purchase_return_ratio_grouped_by_vendor_detail": "",
+				"purchase_return_ratio_grouped_by_vendor_summary": "",
 				"purchases_by_cost_center_detail": "",
 				"purchases_by_cost_center_summary": "",
 				"purchases_by_date_range_detail": "",
@@ -2482,7 +2515,10 @@
 				"purchases_by_vendor_summary_date_range": "",
 				"purchases_grouped_by_vendor_detailed": "",
 				"purchases_grouped_by_vendor_summary": "",
+				"returns_grouped_by_vendor_detailed": "",
+				"returns_grouped_by_vendor_summary": "",
 				"schedule": "",
+				"scheduled_parts_list": "",
 				"scoreboard_detail": "",
 				"scoreboard_summary": "",
 				"supplement_ratio_ins_co": "",
@@ -2498,7 +2534,9 @@
 		},
 		"schedule": {
 			"labels": {
+				"atssummary": "",
 				"employeevacation": "",
+				"ins_co_nm_filter": "",
 				"intake": "",
 				"manual": "",
 				"manualevent": ""
@@ -2625,7 +2663,8 @@
 			},
 			"validation": {
 				"clockoffmustbeafterclockon": "",
-				"clockoffwithoutclockon": ""
+				"clockoffwithoutclockon": "",
+				"hoursenteredmorethanavailable": ""
 			}
 		},
 		"titles": {
@@ -2740,7 +2779,9 @@
 				"photourl": "URL de avatar"
 			},
 			"labels": {
-				"actions": ""
+				"actions": "",
+				"changepassword": "",
+				"profileinfo": ""
 			},
 			"successess": {
 				"passwordchanged": ""
@@ -2757,6 +2798,7 @@
 		},
 		"vehicles": {
 			"errors": {
+				"deleting": "",
 				"noaccess": "El vehículo no existe o usted no tiene acceso a él.",
 				"selectexistingornew": "",
 				"validation": "Asegúrese de que todos los campos se ingresen correctamente.",
@@ -2792,12 +2834,14 @@
 				"registration": ""
 			},
 			"labels": {
+				"deleteconfirm": "",
 				"fromvehicle": "",
 				"novehinfo": "",
 				"relatedjobs": "",
 				"updatevehicle": ""
 			},
 			"successes": {
+				"delete": "",
 				"save": "Vehículo guardado con éxito."
 			}
 		},

client/src/translations/fr/common.json

@@ -50,6 +50,7 @@
 				"cancelledappointment": "Rendez-vous annulé pour:",
 				"completingjobs": "",
 				"dataconsistency": "",
+				"expectedjobs": "",
 				"expectedprodhrs": "",
 				"history": "",
 				"inproduction": "",
@@ -60,6 +61,7 @@
 				"priorappointments": "Rendez-vous précédents",
 				"reminder": "",
 				"scheduledfor": "Rendez-vous prévu pour:",
+				"severalerrorsfound": "",
 				"smartscheduling": "",
 				"suggesteddates": ""
 			},
@@ -228,6 +230,7 @@
 				"addapptcolor": "",
 				"addbucket": "",
 				"addpartslocation": "",
+				"addpartsrule": "",
 				"addspeedprint": "",
 				"addtemplate": "",
 				"newlaborrate": "",
@@ -268,6 +271,7 @@
 					"disablebillwip": "",
 					"disablecontactvehiclecreation": "",
 					"dms_acctnumber": "",
+					"dms_control_override": "",
 					"dms_wip_acctnumber": "",
 					"generic_customer_number": "",
 					"itc_federal": "",
@@ -279,6 +283,8 @@
 				},
 				"email": "",
 				"enforce_class": "",
+				"enforce_conversion_category": "",
+				"enforce_conversion_csr": "",
 				"enforce_referral": "",
 				"federal_tax_id": "",
 				"ignoreblockeddays": "",
@@ -325,7 +331,12 @@
 					"zip": ""
 				},
 				"md_jobline_presets": "",
+				"md_lost_sale_reasons": "",
 				"md_parts_order_comment": "",
+				"md_parts_scan": {
+					"expression": "",
+					"flags": ""
+				},
 				"md_payment_types": "",
 				"md_referral_sources": "",
 				"messaginglabel": "",
@@ -530,6 +541,7 @@
 				"target_touchtime": "",
 				"timezone": "",
 				"tt_allow_post_to_invoiced": "",
+				"tt_enforce_hours_for_tech_console": "",
 				"use_fippa": "",
 				"uselocalmediaserver": "",
 				"website": "",
@@ -576,6 +588,7 @@
 				"notespresets": "",
 				"orderstatuses": "",
 				"partslocations": "",
+				"partsscan": "",
 				"printlater": "",
 				"qbo": "",
 				"qbo_departmentid": "",
@@ -1051,6 +1064,7 @@
 				"sunday": "",
 				"text": "",
 				"thursday": "",
+				"total": "",
 				"totals": "",
 				"tuesday": "",
 				"unknown": "Inconnu",
@@ -1141,6 +1155,7 @@
 			},
 			"fields": {
 				"act_price": "Prix actuel",
+				"ah_detail_line": "",
 				"db_price": "Prix de la base de données",
 				"lbr_types": {
 					"LA1": "",
@@ -1213,6 +1228,7 @@
 				"updated": ""
 			},
 			"validations": {
+				"ahdetailonlyonuserdefinedtypes": "",
 				"hrsrequirediflbrtyp": "",
 				"requiredifparttype": "",
 				"zeropriceexistingpart": ""
@@ -1267,6 +1283,7 @@
 				"removefromproduction": "",
 				"schedule": "Programme",
 				"sendcsi": "",
+				"sendpartspricechange": "",
 				"sendtodms": "",
 				"sync": "",
 				"uninvoice": "",
@@ -1290,6 +1307,7 @@
 				"nojobselected": "Aucun travail n'est sélectionné.",
 				"noowner": "Aucun propriétaire associé.",
 				"novehicle": "Aucun véhicule associé.",
+				"partspricechange": "",
 				"saving": "Erreur rencontrée lors de la sauvegarde de l'enregistrement.",
 				"scanimport": "",
 				"totalscalc": "",
@@ -1441,6 +1459,7 @@
 				"loss_date": "Date de perte",
 				"loss_desc": "",
 				"loss_of_use": "",
+				"lost_sale_reason": "",
 				"ma2s": "",
 				"ma3s": "",
 				"mabl": "",
@@ -1693,6 +1712,7 @@
 					"partstotal": "",
 					"totalreturns": ""
 				},
+				"profileadjustments": "",
 				"prt_dsmk_total": "",
 				"rates": "Les taux",
 				"rates_subtotal": "",
@@ -1975,6 +1995,7 @@
 				"update": ""
 			},
 			"errors": {
+				"deleting": "",
 				"noaccess": "L'enregistrement n'existe pas ou vous n'y avez pas accès.",
 				"saving": "",
 				"selectexistingornew": ""
@@ -2007,6 +2028,7 @@
 			},
 			"labels": {
 				"create_new": "Créez un nouvel enregistrement de propriétaire.",
+				"deleteconfirm": "",
 				"existing_owners": "Propriétaires existants",
 				"fromclaim": "",
 				"fromowner": "",
@@ -2014,6 +2036,7 @@
 				"updateowner": ""
 			},
 			"successes": {
+				"delete": "",
 				"save": "Le propriétaire a bien enregistré."
 			}
 		},
@@ -2413,6 +2436,7 @@
 				"credits_not_received_date": "",
 				"credits_not_received_date_vendorid": "",
 				"csi": "",
+				"customer_list": "",
 				"cycle_time_analysis": "",
 				"estimates_written_converted": "",
 				"estimator_detail": "",
@@ -2420,6 +2444,9 @@
 				"export_payables": "",
 				"export_payments": "",
 				"export_receivables": "",
+				"gsr_by_atp": "",
+				"gsr_by_ats": "",
+				"gsr_by_category": "",
 				"gsr_by_csr": "",
 				"gsr_by_delivery_date": "",
 				"gsr_by_estimator": "",
@@ -2450,12 +2477,15 @@
 				"job_costing_ro_date_summary": "",
 				"job_costing_ro_estimator": "",
 				"job_costing_ro_ins_co": "",
+				"jobs_completed_not_invoiced": "",
+				"jobs_invoiced_not_exported": "",
 				"jobs_reconcile": "",
 				"lag_time": "",
 				"open_orders": "",
 				"open_orders_csr": "",
 				"open_orders_estimator": "",
 				"open_orders_ins_co": "",
+				"open_orders_specific_csr": "",
 				"open_orders_status": "",
 				"parts_backorder": "",
 				"parts_not_recieved": "",
@@ -2473,7 +2503,10 @@
 				"production_by_target_date": "",
 				"production_by_technician": "",
 				"production_by_technician_one": "",
+				"production_over_time": "",
 				"psr_by_make": "",
+				"purchase_return_ratio_grouped_by_vendor_detail": "",
+				"purchase_return_ratio_grouped_by_vendor_summary": "",
 				"purchases_by_cost_center_detail": "",
 				"purchases_by_cost_center_summary": "",
 				"purchases_by_date_range_detail": "",
@@ -2482,7 +2515,10 @@
 				"purchases_by_vendor_summary_date_range": "",
 				"purchases_grouped_by_vendor_detailed": "",
 				"purchases_grouped_by_vendor_summary": "",
+				"returns_grouped_by_vendor_detailed": "",
+				"returns_grouped_by_vendor_summary": "",
 				"schedule": "",
+				"scheduled_parts_list": "",
 				"scoreboard_detail": "",
 				"scoreboard_summary": "",
 				"supplement_ratio_ins_co": "",
@@ -2498,7 +2534,9 @@
 		},
 		"schedule": {
 			"labels": {
+				"atssummary": "",
 				"employeevacation": "",
+				"ins_co_nm_filter": "",
 				"intake": "",
 				"manual": "",
 				"manualevent": ""
@@ -2625,7 +2663,8 @@
 			},
 			"validation": {
 				"clockoffmustbeafterclockon": "",
-				"clockoffwithoutclockon": ""
+				"clockoffwithoutclockon": "",
+				"hoursenteredmorethanavailable": ""
 			}
 		},
 		"titles": {
@@ -2740,7 +2779,9 @@
 				"photourl": "URL de l'avatar"
 			},
 			"labels": {
-				"actions": ""
+				"actions": "",
+				"changepassword": "",
+				"profileinfo": ""
 			},
 			"successess": {
 				"passwordchanged": ""
@@ -2757,6 +2798,7 @@
 		},
 		"vehicles": {
 			"errors": {
+				"deleting": "",
 				"noaccess": "Le véhicule n'existe pas ou vous n'y avez pas accès.",
 				"selectexistingornew": "",
 				"validation": "Veuillez vous assurer que tous les champs sont correctement entrés.",
@@ -2792,12 +2834,14 @@
 				"registration": ""
 			},
 			"labels": {
+				"deleteconfirm": "",
 				"fromvehicle": "",
 				"novehinfo": "",
 				"relatedjobs": "",
 				"updatevehicle": ""
 			},
 			"successes": {
+				"delete": "",
 				"save": "Le véhicule a été enregistré avec succès."
 			}
 		},

client/src/utils/CurrencyFormatter.jsx

@@ -1,9 +1,9 @@
 import React from "react";
-import NumberFormat from "react-number-format";
+import { NumericFormat } from "react-number-format";
 
 export default function CurrencyFormatter(props) {
   return (
-    <NumberFormat
+    <NumericFormat
       thousandSeparator={true}
       decimalScale={2}
       fixedDecimalScale={true}

client/src/utils/GraphQLClient.js

@@ -142,7 +142,7 @@ middlewares.push(
 
 const cache = new InMemoryCache({});
 
-export default new ApolloClient({
+const client = new ApolloClient({
   link: ApolloLink.from(middlewares),
   cache,
   connectToDevTools: process.env.NODE_ENV !== "production",
@@ -161,3 +161,4 @@ export default new ApolloClient({
     },
   },
 });
+export default client;

client/src/utils/TemplateConstants.js

@@ -1343,6 +1343,32 @@ export const TemplateList = (type, context) => {
             },
             group: "sales",
           },
+          gsr_by_category: {
+            title: i18n.t("reportcenter.templates.gsr_by_category"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.gsr_by_category"),
+            key: "gsr_by_category",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          gsr_by_ats: {
+            title: i18n.t("reportcenter.templates.gsr_by_ats"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.gsr_by_ats"),
+            key: "gsr_by_ats",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
           gsr_labor_only: {
             title: i18n.t("reportcenter.templates.gsr_labor_only"),
             description: "",
@@ -1421,6 +1447,19 @@ export const TemplateList = (type, context) => {
             },
             group: "jobs",
           },
+          open_orders_specific_csr: {
+            title: i18n.t("reportcenter.templates.open_orders_specific_csr"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.open_orders_specific_csr"),
+            key: "open_orders_specific_csr",
+            idtype: "employee",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+            group: "jobs",
+          },
           export_payables: {
             title: i18n.t("reportcenter.templates.export_payables"),
             description: "",
@@ -1702,6 +1741,134 @@ export const TemplateList = (type, context) => {
             },
             group: "jobs",
           },
+          returns_grouped_by_vendor_summary: {
+            title: i18n.t(
+              "reportcenter.templates.returns_grouped_by_vendor_summary"
+            ),
+            subject: i18n.t(
+              "reportcenter.templates.returns_grouped_by_vendor_summary"
+            ),
+            key: "returns_grouped_by_vendor_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.parts_orders"),
+              field: i18n.t("parts_orders.fields.order_date"),
+            },
+            group: "jobs",
+          },
+          returns_grouped_by_vendor_detailed: {
+            title: i18n.t(
+              "reportcenter.templates.returns_grouped_by_vendor_detailed"
+            ),
+            subject: i18n.t(
+              "reportcenter.templates.returns_grouped_by_vendor_detailed"
+            ),
+            key: "returns_grouped_by_vendor_detailed",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.parts_orders"),
+              field: i18n.t("parts_orders.fields.order_date"),
+            },
+            group: "jobs",
+          },
+          scheduled_parts_list: {
+            title: i18n.t("reportcenter.templates.scheduled_parts_list"),
+            subject: i18n.t("reportcenter.templates.scheduled_parts_list"),
+            key: "scheduled_parts_list",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.scheduled_in"),
+            },
+            group: "jobs",
+          },
+          jobs_completed_not_invoiced: {
+            title: i18n.t("reportcenter.templates.jobs_completed_not_invoiced"),
+            subject: i18n.t(
+              "reportcenter.templates.jobs_completed_not_invoiced"
+            ),
+            key: "jobs_completed_not_invoiced",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "jobs",
+          },
+          jobs_invoiced_not_exported: {
+            title: i18n.t("reportcenter.templates.jobs_invoiced_not_exported"),
+            subject: i18n.t(
+              "reportcenter.templates.jobs_invoiced_not_exported"
+            ),
+            key: "jobs_invoiced_not_exported",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "jobs",
+          },
+          purchase_return_ratio_grouped_by_vendor_detail: {
+            title: i18n.t("reportcenter.templates.purchase_return_ratio_grouped_by_vendor_detail"),
+            subject: i18n.t(
+              "reportcenter.templates.purchase_return_ratio_grouped_by_vendor_detail"
+            ),
+            key: "purchase_return_ratio_grouped_by_vendor_detail",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.bills"),
+              field: i18n.t("bills.fields.date"),
+            },
+            group: "purchases",
+          },
+          purchase_return_ratio_grouped_by_vendor_summary: {
+            title: i18n.t("reportcenter.templates.purchase_return_ratio_grouped_by_vendor_summary"),
+            subject: i18n.t(
+              "reportcenter.templates.purchase_return_ratio_grouped_by_vendor_summary"
+            ),
+            key: "purchase_return_ratio_grouped_by_vendor_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.bills"),
+              field: i18n.t("bills.fields.date"),
+            },
+            group: "purchases",
+          },
+          production_over_time: {
+            title: i18n.t("reportcenter.templates.production_over_time"),
+            subject: i18n.t(
+              "reportcenter.templates.production_over_time"
+            ),
+            key: "production_over_time",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.actual_in"),
+            },
+            group: "jobs",
+          },
+          customer_list: {
+            title: i18n.t("reportcenter.templates.customer_list"),
+            subject: i18n.t(
+              "reportcenter.templates.customer_list"
+            ),
+            key: "customer_list",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "customers",
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"