Add user definted rates to labor misc for autohouse.

README.MD

@@ -1,3 +1,14 @@
+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"
 
@@ -10,4 +21,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=http://localhost:4000
+REACT_APP_AXIOS_BASE_API_URL=https://api.imex.online/
 REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc

client/.env.production

@@ -1,4 +1,3 @@
-GENERATE_SOURCEMAP=false
 REACT_APP_GRAPHQL_ENDPOINT=https://db.imex.online/v1/graphql
 REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.imex.online/v1/graphql
 REACT_APP_GA_CODE=231103507

client/package.json

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

client/src/App/App.styles.scss

@@ -143,28 +143,8 @@
   }
 }
 
-//Update row highlighting on production board.
+
+//Update row highlighting on production board. 
 .ant-table-tbody > tr.ant-table-row:hover > td {
-  background: #e7f3ff !important;
+  background: #eaeaea !important;
-}
+}
-
-.ant-table-tbody > tr.ant-table-row-selected > td {
-  background: #e6f7ff !important;
-}
-
-.job-line-manual {
-  color: tomato;
-  font-style: italic;
-}
-
-td.ant-table-column-sort {
-  background-color: transparent;
-}
-
-.ant-table-tbody > tr.ant-table-row:nth-child(2n) > td {
-  background-color: #f4f4f4;
-}
-
-.rowWithColor > td {
-  background-color: var(--bgColor) !important;
-}

client/src/components/_test/paymentMethod.jsx

@@ -1,4 +1,8 @@
-import React from "react";
+import {
+  PaymentRequestButtonElement,
+  useStripe,
+} from "@stripe/react-stripe-js";
+import React, { useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
@@ -15,6 +19,49 @@ 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,6 +107,11 @@ 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/bill-delete-button/bill-delete-button.component.jsx

@@ -6,7 +6,7 @@ import { useTranslation } from "react-i18next";
 import { DELETE_BILL } from "../../graphql/bills.queries";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 
-export default function BillDeleteButton({ bill, callback }) {
+export default function BillDeleteButton({ bill }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [deleteBill] = useMutation(DELETE_BILL);
@@ -36,8 +36,6 @@ export default function BillDeleteButton({ bill, callback }) {
 
     if (!!!result.errors) {
       notification["success"]({ message: t("bills.successes.deleted") });
-
-      if (callback && typeof callback === "function") callback(bill.id);
     } else {
       //Check if it's an fkey violation.
       const error = JSON.stringify(result.errors);

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

@@ -1,18 +1,18 @@
 import { useApolloClient, useMutation } from "@apollo/client";
-import { Button, Checkbox, Form, Modal, Space, notification } from "antd";
+import { Button, Checkbox, Form, Modal, notification, Space } from "antd";
 import _ from "lodash";
-import React, { useEffect, useMemo, useState } from "react";
+import React, { useEffect, useState, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_NEW_BILL } from "../../graphql/bills.queries";
-import { UPDATE_INVENTORY_LINES } from "../../graphql/inventory.queries";
 import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
 import {
   QUERY_JOB_LBR_ADJUSTMENTS,
   UPDATE_JOB,
 } from "../../graphql/jobs.queries";
 import { MUTATION_MARK_RETURN_RECEIVED } from "../../graphql/parts-orders.queries";
+import { UPDATE_INVENTORY_LINES } from "../../graphql/inventory.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectBillEnterModal } from "../../redux/modals/modals.selectors";
@@ -20,15 +20,15 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import { GenerateDocument } from "../../utils/RenderTemplate";
-import { TemplateList } from "../../utils/TemplateConstants";
 import confirmDialog from "../../utils/asyncConfirm";
-import useLocalStorage from "../../utils/useLocalStorage";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import BillFormContainer from "../bill-form/bill-form.container";
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
-import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
+import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
+import useLocalStorage from "../../utils/useLocalStorage";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -126,17 +126,6 @@ function BillEnterModalContainer({
                     deductedfromlbr: deductedfromlbr,
                     lbr_adjustment,
                     joblineid: i.joblineid === "noline" ? null : i.joblineid,
-                    applicable_taxes: {
-                      federal:
-                        (i.applicable_taxes && i.applicable_taxes.federal) ||
-                        false,
-                      state:
-                        (i.applicable_taxes && i.applicable_taxes.state) ||
-                        false,
-                      local:
-                        (i.applicable_taxes && i.applicable_taxes.local) ||
-                        false,
-                    },
                   };
                 }),
             },

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

@@ -1,6 +1,6 @@
 import Icon, { UploadOutlined } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
-import { useTreatments } from "@splitsoftware/splitio-react";
+import { MdOpenInNew } from "react-icons/md";
 import {
   Alert,
   Divider,
@@ -12,17 +12,14 @@ import {
   Switch,
   Upload,
 } from "antd";
-import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { MdOpenInNew } from "react-icons/md";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { CHECK_BILL_INVOICE_NUMBER } from "../../graphql/bills.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
-import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
@@ -31,6 +28,8 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import BillFormLines from "./bill-form.lines.component";
 import { CalculateBillTotal } from "./bill-form.totals.utility";
+import { useTreatments } from "@splitsoftware/splitio-react";
+import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -59,11 +58,6 @@ export function BillFormComponent({
     {},
     bodyshop.imexshopid
   );
-  const { ClosingPeriod } = useTreatments(
-    ["ClosingPeriod"],
-    {},
-    bodyshop.imexshopid
-  );
 
   const handleVendorSelect = (props, opt) => {
     setDiscount(opt.discount);
@@ -265,37 +259,6 @@ export function BillFormComponent({
               required: true,
               //message: t("general.validation.required"),
             },
-            ({ getFieldValue }) => ({
-              validator(rule, value) {
-                if (
-                  ClosingPeriod.treatment === "on" &&
-                  bodyshop.accountingconfig.ClosingPeriod
-                ) {
-                  if (
-                    moment(value)
-                      .startOf("day")
-                      .isSameOrAfter(
-                        moment(
-                          bodyshop.accountingconfig.ClosingPeriod[0]
-                        ).startOf("day")
-                      ) &&
-                    moment(value)
-                      .startOf("day")
-                      .isSameOrBefore(
-                        moment(
-                          bodyshop.accountingconfig.ClosingPeriod[1]
-                        ).endOf("day")
-                      )
-                  ) {
-                    return Promise.resolve();
-                  } else {
-                    return Promise.reject(t("bills.validation.closingperiod"));
-                  }
-                } else {
-                  return Promise.resolve();
-                }
-              },
-            }),
           ]}
         >
           <FormDatePicker disabled={disabled} />

client/src/components/breadcrumbs/breadcrumbs.component.jsx

@@ -7,9 +7,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBreadcrumbs } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import GlobalSearch from "../global-search/global-search.component";
-import GlobalSearchOs from "../global-search/global-search-os.component";
 import "./breadcrumbs.styles.scss";
-import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   breadcrumbs: selectBreadcrumbs,
@@ -17,12 +15,6 @@ const mapStateToProps = createStructuredSelector({
 });
 
 export function BreadCrumbs({ breadcrumbs, bodyshop }) {
-  const { OpenSearch } = useTreatments(
-    ["OpenSearch"],
-    {},
-    bodyshop && bodyshop.imexshopid
-  );
-
   return (
     <Row className="breadcrumb-container">
       <Col xs={24} sm={24} md={16}>
@@ -46,7 +38,7 @@ export function BreadCrumbs({ breadcrumbs, bodyshop }) {
         </Breadcrumb>
       </Col>
       <Col xs={24} sm={24} md={8}>
-        {OpenSearch.treatment === "on" ? <GlobalSearchOs /> : <GlobalSearch />}
+        <GlobalSearch />
       </Col>
     </Row>
   );

client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx

@@ -10,10 +10,7 @@ export default function CABCpvrtCalculator({ disabled, form }) {
 
   const handleFinish = async (values) => {
     logImEXEvent("job_ca_bc_pvrt_calculate");
-    form.setFieldsValue({
+    form.setFieldsValue({ ca_bc_pvrt: ((values.rate||0) * (values.days||0)).toFixed(2) });
-      ca_bc_pvrt: ((values.rate || 0) * (values.days || 0)).toFixed(2),
-    });
-    form.setFields([{ name: "ca_bc_pvrt", touched: true }]);
     setVisibility(false);
   };
 

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

@@ -1,19 +1,12 @@
 import { Badge, List, Tag } from "antd";
 import React from "react";
 import { connect } from "react-redux";
-import {
-  AutoSizer,
-  CellMeasurer,
-  CellMeasurerCache,
-  List as VirtualizedList,
-} from "react-virtualized";
 import { createStructuredSelector } from "reselect";
 import { setSelectedConversation } from "../../redux/messaging/messaging.actions";
 import { selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
 import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-
 import "./chat-conversation-list.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
@@ -25,95 +18,59 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setSelectedConversation(conversationId)),
 });
 
-function ChatConversationListComponent({
+export function ChatConversationListComponent({
   conversationList,
   selectedConversation,
   setSelectedConversation,
-  loadMoreConversations,
 }) {
-  const cache = new CellMeasurerCache({
-    fixedWidth: true,
-    defaultHeight: 60,
-  });
-
-  const rowRenderer = ({ index, key, style, parent }) => {
-    const item = conversationList[index];
-
-    return (
-      <CellMeasurer
-        key={key}
-        cache={cache}
-        parent={parent}
-        columnIndex={0}
-        rowIndex={index}
-      >
-        <List.Item
-          onClick={() => setSelectedConversation(item.id)}
-          className={`chat-list-item ${
-            item.id === selectedConversation
-              ? "chat-list-selected-conversation"
-              : null
-          }`}
-          style={style}
-        >
-          <div
-            style={{
-              display: "inline-block",
-            }}
-          >
-            {item.label && <div className="chat-name">{item.label}</div>}
-            {item.job_conversations.length > 0 ? (
-              <div className="chat-name">
-                {item.job_conversations.map((j, idx) => (
-                  <div key={idx}>
-                    <OwnerNameDisplay ownerObject={j.job} />
-                  </div>
-                ))}
-              </div>
-            ) : (
-              <PhoneFormatter>{item.phone_num}</PhoneFormatter>
-            )}
-          </div>
-          <div style={{ display: "inline-block" }}>
-            <div>
-              {item.job_conversations.length > 0
-                ? item.job_conversations.map((j, idx) => (
-                    <Tag key={idx} className="ro-number-tag">
-                      {j.job.ro_number}
-                    </Tag>
-                  ))
-                : null}
-            </div>
-            <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>
-          </div>
-          <Badge count={item.messages_aggregate.aggregate.count || 0} />
-        </List.Item>
-      </CellMeasurer>
-    );
-  };
-
   return (
     <div className="chat-list-container">
-      <AutoSizer>
+      <List
-        {({ height, width }) => (
+        bordered
-          <VirtualizedList
+        dataSource={conversationList}
-            height={height}
+        renderItem={(item) => (
-            width={width}
+          <List.Item
-            rowCount={conversationList.length}
+            key={item.id}
-            rowHeight={cache.rowHeight}
+            onClick={() => setSelectedConversation(item.id)}
-            rowRenderer={rowRenderer}
+            className={`chat-list-item ${
-            onScroll={({ scrollTop, scrollHeight, clientHeight }) => {
+              item.id === selectedConversation
-              if (scrollTop + clientHeight === scrollHeight) {
+                ? "chat-list-selected-conversation"
-                loadMoreConversations();
+                : null
-              }
+            }`}
-            }}
+          >
-          />
+            <div sryle={{ display: "inline-block" }}>
+              {item.label && <div className="chat-name">{item.label}</div>}
+              {item.job_conversations.length > 0 ? (
+                <div className="chat-name">
+                  {item.job_conversations.map((j, idx) => (
+                    <div key={idx}>
+                      <OwnerNameDisplay ownerObject={j.job} />
+                    </div>
+                  ))}
+                </div>
+              ) : (
+                <PhoneFormatter>{item.phone_num}</PhoneFormatter>
+              )}
+            </div>
+            <div sryle={{ display: "inline-block" }}>
+              <div>
+                {item.job_conversations.length > 0
+                  ? item.job_conversations.map((j, idx) => (
+                      <Tag key={idx} className="ro-number-tag">
+                        {j.job.ro_number}
+                      </Tag>
+                    ))
+                  : null}
+              </div>
+              <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>
+            </div>
+            <Badge count={item.messages_aggregate.aggregate.count || 0} />
+          </List.Item>
         )}
-      </AutoSizer>
+      />
     </div>
   );
 }
-
 export default connect(
   mapStateToProps,
   mapDispatchToProps

client/src/components/chat-conversation-list/chat-conversation-list.styles.scss

@@ -3,9 +3,8 @@
 }
 .chat-list-container {
   flex: 1;
-  overflow: hidden;
+  overflow: auto;
   height: 100%;
-  border: 1px solid gainsboro;
 }
 
 .chat-list-item {
@@ -22,6 +21,4 @@
   .ro-number-tag {
     align-self: baseline;
   }
-  padding: 12px 24px;
-  border-bottom: 1px solid gainsboro;
 }

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

@@ -42,7 +42,6 @@ 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

@@ -4,16 +4,13 @@ import {
   ShrinkOutlined,
   SyncOutlined,
 } from "@ant-design/icons";
-import { useLazyQuery, useQuery } from "@apollo/client";
+import { useQuery } from "@apollo/client";
 import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
-import React, { useCallback, useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import {
+import { CONVERSATION_LIST_QUERY } from "../../graphql/conversations.queries";
-  CONVERSATION_LIST_QUERY,
-  UNREAD_CONVERSATION_COUNT,
-} from "../../graphql/conversations.queries";
 import { toggleChatVisible } from "../../redux/messaging/messaging.actions";
 import {
   selectChatVisible,
@@ -40,21 +37,12 @@ export function ChatPopupComponent({
 }) {
   const { t } = useTranslation();
   const [pollInterval, setpollInterval] = useState(0);
-
+  const { loading, data, refetch, called } = useQuery(CONVERSATION_LIST_QUERY, {
-  const { data: unreadData } = useQuery(UNREAD_CONVERSATION_COUNT, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
     ...(pollInterval > 0 ? { pollInterval } : {}),
   });
 
-  const [getConversations, { loading, data, refetch, fetchMore }] =
-    useLazyQuery(CONVERSATION_LIST_QUERY, {
-      fetchPolicy: "network-only",
-      nextFetchPolicy: "network-only",
-      skip: !chatVisible,
-      ...(pollInterval > 0 ? { pollInterval } : {}),
-    });
-
   const fcmToken = sessionStorage.getItem("fcmtoken");
 
   useEffect(() => {
@@ -66,24 +54,15 @@ export function ChatPopupComponent({
   }, [fcmToken]);
 
   useEffect(() => {
-    if (chatVisible)
+    if (called && chatVisible) refetch();
-      getConversations({
+  }, [chatVisible, called, refetch]);
-        variables: {
-          offset: 0,
-        },
-      });
-  }, [chatVisible, getConversations]);
 
-  const loadMoreConversations = useCallback(() => {
+  const unreadCount = data
-    if (data)
+    ? data.conversations.reduce(
-      fetchMore({
+        (acc, val) => val.messages_aggregate.aggregate.count + acc,
-        variables: {
+        0
-          offset: data.conversations.length,
+      )
-        },
+    : 0;
-      });
-  }, [data, fetchMore]);
-
-  const unreadCount = unreadData?.messages_aggregate.aggregate.count || 0;
 
   return (
     <Badge count={unreadCount}>
@@ -118,7 +97,6 @@ export function ChatPopupComponent({
                 ) : (
                   <ChatConversationListComponent
                     conversationList={data ? data.conversations : []}
-                    loadMoreConversations={loadMoreConversations}
                   />
                 )}
               </Col>

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

@@ -59,14 +59,6 @@ export default function ContractsCarsComponent({
       sortOrder:
         state.sortedInfo.columnKey === "model" && state.sortedInfo.order,
     },
-    {
-      title: t("courtesycars.fields.color"),
-      dataIndex: "color",
-      key: "color",
-      sorter: (a, b) => alphaSort(a.color, b.color),
-      sortOrder:
-        state.sortedInfo.columnKey === "color" && state.sortedInfo.order,
-    },
     {
       title: t("courtesycars.fields.plate"),
       dataIndex: "plate",
@@ -101,9 +93,6 @@ export default function ContractsCarsComponent({
             (cc.model || "")
               .toLowerCase()
               .includes(state.search.toLowerCase()) ||
-            (cc.color || "")
-              .toLowerCase()
-              .includes(state.search.toLowerCase()) ||
             (cc.plate || "").toLowerCase().includes(state.search.toLowerCase())
         );
 

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,9 +165,7 @@ export default function ContractFormComponent({
               />
             </div>
           )}
-          {
+          <ContractLicenseDecodeButton form={form} />
-            //<ContractLicenseDecodeButton form={form} />
-          }
         </Space>
       </div>
       <LayoutFormRow header={t("contracts.labels.driverinformation")}>

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

@@ -1,235 +0,0 @@
-import {
-  BranchesOutlined,
-  ExclamationCircleFilled,
-  PauseCircleOutlined,
-} from "@ant-design/icons";
-import { Card, Space, Table, Tooltip } from "antd";
-import moment from "moment";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
-import ChatOpenButton from "../../chat-open-button/chat-open-button.component";
-import OwnerNameDisplay from "../../owner-name-display/owner-name-display.component";
-import DashboardRefreshRequired from "../refresh-required.component";
-
-export default function DashboardScheduledInToday({ data, ...cardProps }) {
-  const { t } = useTranslation();
-  const [state, setState] = useState({
-    sortedInfo: {},
-  });
-  if (!data) return null;
-  if (!data.scheduled_in_today)
-    return <DashboardRefreshRequired {...cardProps} />;
-
-  const appt = []; // Flatten Data
-  data.scheduled_in_today.forEach((item) => {
-    var i = {
-      canceled: item.canceled,
-      id: item.id,
-      alt_transport: item.job.alt_transport,
-      clm_no: item.job.clm_no,
-      jobid: item.job.jobid,
-      ins_co_nm: item.job.ins_co_nm,
-      iouparent: item.job.iouparent,
-      ownerid: item.job.ownerid,
-      ownr_co_nm: item.job.ownr_co_nm,
-      ownr_ea: item.job.ownr_ea,
-      ownr_fn: item.job.ownr_fn,
-      ownr_ln: item.job.ownr_ln,
-      ownr_ph1: item.job.ownr_ph1,
-      ownr_ph2: item.job.ownr_ph2,
-      production_vars: item.job.production_vars,
-      ro_number: item.job.ro_number,
-      suspended: item.job.suspended,
-      v_make_desc: item.job.v_make_desc,
-      v_model_desc: item.job.v_model_desc,
-      v_model_yr: item.job.v_model_yr,
-      v_vin: item.job.v_vin,
-      vehicleid: item.job.vehicleid,
-      note: item.note,
-      start: moment(item.start).format("hh:mm a"),
-      title: item.title,
-    };
-    appt.push(i);
-  });
-  appt.sort ( function (a, b) { return new Date(a.start) - new Date(b.start); });
-
-  const columns = [
-    {
-      title: t("jobs.fields.ro_number"),
-      dataIndex: "ro_number",
-      key: "ro_number",
-      render: (text, record) => (
-        <Link
-          to={"/manage/jobs/" + record.jobid}
-          onClick={(e) => e.stopPropagation()}
-        >
-          <Space>
-            {record.ro_number || t("general.labels.na")}
-            {record.production_vars && record.production_vars.alert ? (
-              <ExclamationCircleFilled className="production-alert" />
-            ) : null}
-            {record.suspended && (
-              <PauseCircleOutlined style={{ color: "orangered" }} />
-            )}
-            {record.iouparent && (
-              <Tooltip title={t("jobs.labels.iou")}>
-                <BranchesOutlined style={{ color: "orangered" }} />
-              </Tooltip>
-            )}
-          </Space>
-        </Link>
-      ),
-    },
-    {
-      title: t("jobs.fields.owner"),
-      dataIndex: "owner",
-      key: "owner",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => {
-        return record.ownerid ? (
-          <Link
-            to={"/manage/owners/" + record.ownerid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            <OwnerNameDisplay ownerObject={record} />
-          </Link>
-        ) : (
-          <span>
-            <OwnerNameDisplay ownerObject={record} />
-          </span>
-        );
-      },
-    },
-    {
-      title: t("jobs.fields.ownr_ph1"),
-      dataIndex: "ownr_ph1",
-      key: "ownr_ph1",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
-      ),
-    },
-    {
-      title: t("jobs.fields.ownr_ph2"),
-      dataIndex: "ownr_ph2",
-      key: "ownr_ph2",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
-      ),
-    },
-    {
-      title: t("jobs.fields.ownr_ea"),
-      dataIndex: "ownr_ea",
-      key: "ownr_ea",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <ChatOpenButton phone={record.ownr_ea} jobid={record.jobid} />
-      ),
-    },
-    {
-      title: t("jobs.fields.vehicle"),
-      dataIndex: "vehicle",
-      key: "vehicle",
-      ellipsis: true,
-      render: (text, record) => {
-        return record.vehicleid ? (
-          <Link
-            to={"/manage/vehicles/" + record.vehicleid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-              record.v_model_desc || ""
-            }`}
-          </Link>
-        ) : (
-          <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-            record.v_model_desc || ""
-          }`}</span>
-        );
-      },
-    },
-    {
-      title: t("jobs.fields.ins_co_nm"),
-      dataIndex: "ins_co_nm",
-      key: "ins_co_nm",
-      ellipsis: true,
-      responsive: ["md"],
-    },
-    {
-      title: t("appointments.fields.time"),
-      dataIndex: "start",
-      key: "start",
-      ellipsis: true,
-      responsive: ["md"],
-    },
-    {
-      title: t("appointments.fields.alt_transport"),
-      dataIndex: "alt_transport",
-      key: "alt_transport",
-      ellipsis: true,
-      responsive: ["md"],
-    },
-  ];
-
-  const handleTableChange = (sorter) => {
-    setState({ ...state, sortedInfo: sorter });
-  };
-
-  return (
-    <Card title={t("dashboard.titles.scheduledintoday", {date: moment().startOf("day").format("MM/DD/YYYY")})} {...cardProps}>
-      <div style={{ height: "100%" }}>
-        <Table
-          onChange={handleTableChange}
-          pagination={{ position: "top", defaultPageSize: 50 }}
-          columns={columns}
-          scroll={{ x: true, y: "calc(100% - 2em)" }}
-          rowKey="id"
-          style={{ height: "85%" }}
-          dataSource={appt}
-        />
-      </div>
-    </Card>
-  );
-}
-
-export const DashboardScheduledInTodayGql = `
-  scheduled_in_today: appointments(where: {start: {_gte: "${moment()
-    .startOf("day")
-    .toISOString()}", _lte: "${moment()
-  .endOf("day")
-  .toISOString()}"}, canceled: {_eq: false}, block: {_neq: true}}) {
-    canceled
-    id
-    job {
-      alt_transport
-      clm_no
-      jobid: id
-      ins_co_nm
-      iouparent
-      ownerid
-      ownr_co_nm
-      ownr_ea
-      ownr_fn
-      ownr_ln
-      ownr_ph1
-      ownr_ph2
-      production_vars
-      ro_number
-      suspended
-      v_make_desc
-      v_model_desc
-      v_model_yr
-      v_vin
-      vehicleid
-    }
-    note
-    start
-    title
-  }
-`;

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

@@ -1,210 +0,0 @@
-import {
-  BranchesOutlined,
-  ExclamationCircleFilled,
-  PauseCircleOutlined,
-} from "@ant-design/icons";
-import { Card, Space, Table, Tooltip } from "antd";
-import moment from "moment";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
-import ChatOpenButton from "../../chat-open-button/chat-open-button.component";
-import OwnerNameDisplay from "../../owner-name-display/owner-name-display.component";
-import DashboardRefreshRequired from "../refresh-required.component";
-
-export default function DashboardScheduledOutToday({ data, ...cardProps }) {
-  const { t } = useTranslation();
-  const [state, setState] = useState({
-    sortedInfo: {},
-  });
-  if (!data) return null;
-  if (!data.scheduled_out_today)
-    return <DashboardRefreshRequired {...cardProps} />;
-
-  data.scheduled_out_today.forEach((item) => {
-    item.scheduled_completion= moment(item.scheduled_completion).format("hh:mm a")
-  });
-  data.scheduled_out_today.sort(function (a, b) {
-    return new Date(a.scheduled_completion) - new Date(b.scheduled_completion);
-  });
-
-  const columns = [
-    {
-      title: t("jobs.fields.ro_number"),
-      dataIndex: "ro_number",
-      key: "ro_number",
-      render: (text, record) => (
-        <Link
-          to={"/manage/jobs/" + record.jobid}
-          onClick={(e) => e.stopPropagation()}
-        >
-          <Space>
-            {record.ro_number || t("general.labels.na")}
-            {record.production_vars && record.production_vars.alert ? (
-              <ExclamationCircleFilled className="production-alert" />
-            ) : null}
-            {record.suspended && (
-              <PauseCircleOutlined style={{ color: "orangered" }} />
-            )}
-            {record.iouparent && (
-              <Tooltip title={t("jobs.labels.iou")}>
-                <BranchesOutlined style={{ color: "orangered" }} />
-              </Tooltip>
-            )}
-          </Space>
-        </Link>
-      ),
-    },
-    {
-      title: t("jobs.fields.owner"),
-      dataIndex: "owner",
-      key: "owner",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => {
-        return record.ownerid ? (
-          <Link
-            to={"/manage/owners/" + record.ownerid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            <OwnerNameDisplay ownerObject={record} />
-          </Link>
-        ) : (
-          <span>
-            <OwnerNameDisplay ownerObject={record} />
-          </span>
-        );
-      },
-    },
-    {
-      title: t("jobs.fields.ownr_ph1"),
-      dataIndex: "ownr_ph1",
-      key: "ownr_ph1",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
-      ),
-    },
-    {
-      title: t("jobs.fields.ownr_ph2"),
-      dataIndex: "ownr_ph2",
-      key: "ownr_ph2",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
-      ),
-    },
-    {
-      title: t("jobs.fields.ownr_ea"),
-      dataIndex: "ownr_ea",
-      key: "ownr_ea",
-      ellipsis: true,
-      responsive: ["md"],
-      render: (text, record) => (
-        <ChatOpenButton phone={record.ownr_ea} jobid={record.jobid} />
-      ),
-    },
-    {
-      title: t("jobs.fields.vehicle"),
-      dataIndex: "vehicle",
-      key: "vehicle",
-      ellipsis: true,
-      render: (text, record) => {
-        return record.vehicleid ? (
-          <Link
-            to={"/manage/vehicles/" + record.vehicleid}
-            onClick={(e) => e.stopPropagation()}
-          >
-            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-              record.v_model_desc || ""
-            }`}
-          </Link>
-        ) : (
-          <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-            record.v_model_desc || ""
-          }`}</span>
-        );
-      },
-    },
-    {
-      title: t("jobs.fields.ins_co_nm"),
-      dataIndex: "ins_co_nm",
-      key: "ins_co_nm",
-      ellipsis: true,
-      responsive: ["md"],
-    },
-    {
-      title: t("jobs.fields.scheduled_completion"),
-      dataIndex: "scheduled_completion",
-      key: "scheduled_completion",
-      ellipsis: true,
-      responsive: ["md"],
-    },
-    {
-      title: t("appointments.fields.alt_transport"),
-      dataIndex: "alt_transport",
-      key: "alt_transport",
-      ellipsis: true,
-      responsive: ["md"],
-    },
-  ];
-
-  const handleTableChange = (sorter) => {
-    setState({ ...state, sortedInfo: sorter });
-  };
-
-  return (
-    <Card
-      title={t("dashboard.titles.scheduledouttoday", {
-        date: moment().startOf("day").format("MM/DD/YYYY"),
-      })}
-      {...cardProps}
-    >
-      <div style={{ height: "100%" }}>
-        <Table
-          onChange={handleTableChange}
-          pagination={{ position: "top", defaultPageSize: 50 }}
-          columns={columns}
-          scroll={{ x: true, y: "calc(100% - 2em)" }}
-          rowKey="id"
-          style={{ height: "85%" }}
-          dataSource={data.scheduled_out_today}
-        />
-      </div>
-    </Card>
-  );
-}
-
-export const DashboardScheduledOutTodayGql = `
-  scheduled_out_today: jobs(where: {
-    date_invoiced: {_is_null: true}, 
-    ro_number: {_is_null: false}, 
-    voided: {_eq: false}, 
-    scheduled_completion: {_gte: "${moment().startOf("day").toISOString()}", 
-    _lte: "${moment().endOf("day").toISOString()}"}}) {
-      alt_transport
-      clm_no
-      jobid: id
-      ins_co_nm
-      iouparent
-      ownerid
-      ownr_co_nm
-      ownr_ea
-      ownr_fn
-      ownr_ln
-      ownr_ph1
-      ownr_ph2
-      production_vars
-      ro_number
-      scheduled_completion
-      suspended
-      v_make_desc
-      v_model_desc
-      v_model_yr
-      v_vin
-      vehicleid
-
-  }
-`;

client/src/components/dashboard-grid/dashboard-grid.component.jsx

@@ -1,6 +1,6 @@
 import Icon, { SyncOutlined } from "@ant-design/icons";
 import { gql, useMutation, useQuery } from "@apollo/client";
-import { Button, Dropdown, Menu, PageHeader, Space, notification } from "antd";
+import { Button, Dropdown, Menu, notification, PageHeader, Space } from "antd";
 import i18next from "i18next";
 import _ from "lodash";
 import moment from "moment";
@@ -37,12 +37,6 @@ import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 //Combination of the following:
 // /node_modules/react-grid-layout/css/styles.css
 // /node_modules/react-resizable/css/styles.css
-import DashboardScheduledInToday, {
-  DashboardScheduledInTodayGql,
-} from "../dashboard-components/scheduled-in-today/scheduled-in-today.component";
-import DashboardScheduledOutToday, {
-  DashboardScheduledOutTodayGql,
-} from "../dashboard-components/scheduled-out-today/scheduled-out-today.component";
 import "./dashboard-grid.styles.scss";
 import { GenerateDashboardData } from "./dashboard-grid.utils";
 
@@ -274,28 +268,6 @@ const componentList = {
     w: 2,
     h: 2,
   },
-  ScheduleInToday: {
-    label: i18next.t("dashboard.titles.scheduledintoday", {
-      date: moment().startOf("day").format("MM/DD/YYYY"),
-    }),
-    component: DashboardScheduledInToday,
-    gqlFragment: DashboardScheduledInTodayGql,
-    minW: 10,
-    minH: 2,
-    w: 10,
-    h: 2,
-  },
-  ScheduleOutToday: {
-    label: i18next.t("dashboard.titles.scheduledouttoday", {
-      date: moment().startOf("day").format("MM/DD/YYYY"),
-    }),
-    component: DashboardScheduledOutToday,
-    gqlFragment: DashboardScheduledOutTodayGql,
-    minW: 10,
-    minH: 2,
-    w: 10,
-    h: 2,
-  },
 };
 
 const createDashboardQuery = (state) => {
@@ -311,12 +283,8 @@ const createDashboardQuery = (state) => {
       monthly_sales: jobs(where: {_and: [
         { voided: {_eq: false}},
         {date_invoiced: {_gte: "${moment()
-          .startOf("month")
+        .startOf("month").startOf('day').toISOString()}"}}, {date_invoiced: {_lte: "${moment()
-          .startOf("day")
+    .endOf("month").endOf('day').toISOString()}"}}]}) {
-          .toISOString()}"}}, {date_invoiced: {_lte: "${moment()
-    .endOf("month")
-    .endOf("day")
-    .toISOString()}"}}]}) {
     id
     ro_number
     date_invoiced

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

@@ -8,8 +8,6 @@ export default function DataLabel({
   vertical,
   visible = true,
   valueStyle = {},
-  valueClassName,
-  onValueClick,
   ...props
 }) {
   if (!visible || (hideIfNull && !!!children)) return null;
@@ -30,10 +28,7 @@ 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/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx

@@ -66,7 +66,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
       key: "status",
     },
     {
-      title: t("bills.fields.invoice_number"),
+      title: t("jobs.fields.ro_number"),
       dataIndex: ["Posting", "Reference"],
       key: "reference",
     },

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

@@ -11,7 +11,6 @@ import {
   Select,
   Space,
   Statistic,
-  Switch,
   Typography,
 } from "antd";
 import Dinero from "dinero.js";
@@ -184,13 +183,6 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
             <Space>
               <DmsCdkMakes form={form} socket={socket} job={job} />
               <DmsCdkMakesRefetch />
-              <Form.Item
-                name="dms_unsold"
-                label={t("jobs.fields.dms.dms_unsold")}
-                initialValue={false}
-              >
-                <Switch />
-              </Form.Item>
             </Space>
           </div>
         )}

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

@@ -1,28 +1,28 @@
 import { UploadOutlined, UserAddOutlined } from "@ant-design/icons";
 import {
-  Button,
   Divider,
-  Dropdown,
   Form,
   Input,
-  Menu,
   Select,
-  Space,
   Tabs,
   Upload,
+  Space,
+  Menu,
+  Dropdown,
+  Button,
 } from "antd";
-import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import EmailDocumentsComponent from "../email-documents/email-documents.component";
+import _ from "lodash";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectEmailConfig } from "../../redux/email/email.selectors";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import { CreateExplorerLinkForJob } from "../../utils/localmedia";
-import EmailDocumentsComponent from "../email-documents/email-documents.component";
+import { selectEmailConfig } from "../../redux/email/email.selectors";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -54,15 +54,6 @@ export function EmailOverlayComponent({
       ]),
     });
   };
-  const handle_CC_Click = ({ item, key, keyPath }) => {
-    const email = item.props.value;
-    form.setFieldsValue({
-      cc: _.uniq([
-        ...(form.getFieldValue("cc") || ""),
-        ...(typeof email === "string" ? [email] : email),
-      ]),
-    });
-  };
 
   const menu = (
     <div>
@@ -83,25 +74,6 @@ export function EmailOverlayComponent({
     </div>
   );
 
-  const menuCC = (
-    <div>
-      <Menu onClick={handle_CC_Click}>
-        {bodyshop.employees
-          .filter((e) => e.user_email)
-          .map((e, idx) => (
-            <Menu.Item value={e.user_email} key={idx}>
-              {`${e.first_name} ${e.last_name}`}
-            </Menu.Item>
-          ))}
-        {bodyshop.md_to_emails.map((e, idx) => (
-          <Menu.Item value={e.emails} key={idx + "group"}>
-            {e.label}
-          </Menu.Item>
-        ))}
-      </Menu>
-    </div>
-  );
-
   return (
     <div>
       <Form.Item
@@ -150,23 +122,7 @@ export function EmailOverlayComponent({
       >
         <Select mode="tags" tokenSeparators={[",", ";"]} />
       </Form.Item>
-      <Form.Item
+      <Form.Item label={t("emails.fields.cc")} name="cc">
-        label={
-          <Space>
-            {t("emails.fields.cc")}
-            <Dropdown overlay={menuCC}>
-              <a
-                className="ant-dropdown-link"
-                href=" #"
-                onClick={(e) => e.preventDefault()}
-              >
-                <UserAddOutlined />
-              </a>
-            </Dropdown>
-          </Space>
-        }
-        name="cc"
-      >
         <Select mode="tags" tokenSeparators={[",", ";"]} />
       </Form.Item>
       <Form.Item

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

@@ -1,216 +0,0 @@
-import { AutoComplete, Divider, Input, Space } from "antd";
-import axios from "axios";
-import _ from "lodash";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { Link, useHistory } from "react-router-dom";
-import PhoneNumberFormatter from "../../utils/PhoneFormatter";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
-import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
-
-export default function GlobalSearchOs() {
-  const { t } = useTranslation();
-  const history = useHistory();
-  const [loading, setLoading] = useState(false);
-  const [data, setData] = useState(false);
-
-  const executeSearch = async (v) => {
-    if (v && v && v !== "" && v.length >= 3) {
-      try {
-        setLoading(true);
-        const searchData = await axios.post("/search", {
-          search: v,
-        });
-
-        const resultsByType = {
-          payments: [],
-          jobs: [],
-          bills: [],
-          owners: [],
-          vehicles: [],
-        };
-
-        searchData.data.hits.hits.forEach((hit) => {
-          resultsByType[hit._index].push(hit._source);
-        });
-        setData([
-          {
-            label: renderTitle(t("menus.header.search.jobs")),
-            options: resultsByType.jobs.map((job) => {
-              return {
-                key: job.id,
-                value: job.ro_number || "N/A",
-                label: (
-                  <Link to={`/manage/jobs/${job.id}`}>
-                    <Space size="small" split={<Divider type="vertical" />}>
-                      <strong>{job.ro_number || t("general.labels.na")}</strong>
-                      <span>{`${job.status || ""}`}</span>
-                      <span>
-                        <OwnerNameDisplay ownerObject={job} />
-                      </span>
-                      <span>{`${job.v_model_yr || ""} ${
-                        job.v_make_desc || ""
-                      } ${job.v_model_desc || ""}`}</span>
-                      <span>{`${job.clm_no || ""}`}</span>
-                    </Space>
-                  </Link>
-                ),
-              };
-            }),
-          },
-          {
-            label: renderTitle(t("menus.header.search.owners")),
-            options: resultsByType.owners.map((owner) => {
-              return {
-                key: owner.id,
-                value: OwnerNameDisplayFunction(owner),
-                label: (
-                  <Link to={`/manage/owners/${owner.id}`}>
-                    <Space
-                      size="small"
-                      split={<Divider type="vertical" />}
-                      wrap
-                    >
-                      <span>
-                        <OwnerNameDisplay ownerObject={owner} />
-                      </span>
-                      <PhoneNumberFormatter>
-                        {owner.ownr_ph1}
-                      </PhoneNumberFormatter>
-                      <PhoneNumberFormatter>
-                        {owner.ownr_ph2}
-                      </PhoneNumberFormatter>
-                    </Space>
-                  </Link>
-                ),
-              };
-            }),
-          },
-          {
-            label: renderTitle(t("menus.header.search.vehicles")),
-            options: resultsByType.vehicles.map((vehicle) => {
-              return {
-                key: vehicle.id,
-                value: `${vehicle.v_model_yr || ""} ${
-                  vehicle.v_make_desc || ""
-                } ${vehicle.v_model_desc || ""}`,
-                label: (
-                  <Link to={`/manage/vehicles/${vehicle.id}`}>
-                    <Space size="small" split={<Divider type="vertical" />}>
-                      <span>
-                        {`${vehicle.v_model_yr || ""} ${
-                          vehicle.v_make_desc || ""
-                        } ${vehicle.v_model_desc || ""}`}
-                      </span>
-                      <span>{vehicle.plate_no || ""}</span>
-                      <span>
-                        <VehicleVinDisplay>
-                          {vehicle.v_vin || ""}
-                        </VehicleVinDisplay>
-                      </span>
-                    </Space>
-                  </Link>
-                ),
-              };
-            }),
-          },
-          {
-            label: renderTitle(t("menus.header.search.payments")),
-            options: resultsByType.payments.map((payment) => {
-              return {
-                key: payment.id,
-                value: `${payment.job?.ro_number} ${payment.amount}`,
-                label: (
-                  <Link to={`/manage/jobs/${payment.job?.id}`}>
-                    <Space size="small" split={<Divider type="vertical" />}>
-                      <span>{payment.paymentnum}</span>
-                      <span>{payment.job?.ro_number}</span>
-                      <span>{payment.memo || ""}</span>
-                      <span>{payment.amount || ""}</span>
-                      <span>{payment.transactionid || ""}</span>
-                    </Space>
-                  </Link>
-                ),
-              };
-            }),
-          },
-          {
-            label: renderTitle(t("menus.header.search.bills")),
-            options: resultsByType.bills.map((bill) => {
-              return {
-                key: bill.id,
-                value: `${bill.invoice_number} - ${bill.vendor.name}`,
-                label: (
-                  <Link to={`/manage/bills?billid=${bill.id}`}>
-                    <Space size="small" split={<Divider type="vertical" />}>
-                      <span>{bill.invoice_number}</span>
-                      <span>{bill.vendor.name}</span>
-                      <span>{bill.date}</span>
-                    </Space>
-                  </Link>
-                ),
-              };
-            }),
-          },
-          // {
-          //   label: renderTitle(t("menus.header.search.phonebook")),
-          //   options: resultsByType.search_phonebook.map((pb) => {
-          //     return {
-          //       key: pb.id,
-          //       value: `${pb.firstname || ""} ${pb.lastname || ""} ${
-          //         pb.company || ""
-          //       }`,
-          //       label: (
-          //         <Link to={`/manage/phonebook?phonebookentry=${pb.id}`}>
-          //           <Space size="small" split={<Divider type="vertical" />}>
-          //             <span>{`${pb.firstname || ""} ${pb.lastname || ""} ${
-          //               pb.company || ""
-          //             }`}</span>
-          //             <PhoneNumberFormatter>{pb.phone1}</PhoneNumberFormatter>
-          //             <span>{pb.email}</span>
-          //           </Space>
-          //         </Link>
-          //       ),
-          //     };
-          //   }),
-          // },
-        ]);
-      } catch (error) {
-        console.log("Error while fetching search results", error);
-      } finally {
-        setLoading(false);
-      }
-    }
-  };
-  const debouncedExecuteSearch = _.debounce(executeSearch, 750);
-
-  const handleSearch = (value) => {
-    debouncedExecuteSearch(value);
-  };
-
-  const renderTitle = (title) => {
-    return <span>{title}</span>;
-  };
-
-  return (
-    <AutoComplete
-      options={data}
-      onSearch={handleSearch}
-      defaultActiveFirstOption
-      onSelect={(val, opt) => {
-        history.push(opt.label.props.to);
-      }}
-      onClear={() => setData([])}
-    >
-      <Input.Search
-        size="large"
-        placeholder={t("general.labels.globalsearch")}
-        enterButton
-        allowClear
-        loading={loading}
-      />
-    </AutoComplete>
-  );
-}

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

@@ -1,5 +1,6 @@
 import { useLazyQuery } from "@apollo/client";
-import { AutoComplete, Divider, Input, Space } from "antd";
+import { LoadingOutlined } from "@ant-design/icons";
+import { AutoComplete, Divider, Space } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -18,18 +19,11 @@ export default function GlobalSearch() {
     useLazyQuery(GLOBAL_SEARCH_QUERY);
 
   const executeSearch = (v) => {
-    if (
+    if (v && v.variables.search && v.variables.search !== "") callSearch(v);
-      v &&
-      v.variables.search &&
-      v.variables.search !== "" &&
-      v.variables.search.length >= 3
-    )
-      callSearch(v);
   };
   const debouncedExecuteSearch = _.debounce(executeSearch, 750);
 
   const handleSearch = (value) => {
-    console.log("Handle Search");
     debouncedExecuteSearch({ variables: { search: value } });
   };
 
@@ -44,7 +38,7 @@ export default function GlobalSearch() {
           options: data.search_jobs.map((job) => {
             return {
               key: job.id,
-              value: job.ro_number || "N/A",
+              value: job.ro_number,
               label: (
                 <Link to={`/manage/jobs/${job.id}`}>
                   <Space size="small" split={<Divider type="vertical" />}>
@@ -184,18 +178,13 @@ 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/header/header.component.jsx

@@ -311,9 +311,7 @@ function Header({
           icon={<SettingOutlined />}
         >
           <Menu.Item key="shop" icon={<Icon component={GiSettingsKnobs} />}>
-            <Link to="/manage/shop?tab=info">
+            <Link to="/manage/shop">{t("menus.header.shop_config")}</Link>
-              {t("menus.header.shop_config")}
-            </Link>
           </Menu.Item>
           <Menu.Item key="dashboard" icon={<DashboardFilled />}>
             <Link to="/manage/dashboard">{t("menus.header.dashboard")}</Link>

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

@@ -3,11 +3,9 @@ import {
   Button,
   Divider,
   Dropdown,
-  Form,
   Menu,
   notification,
   Popover,
-  Select,
   Space,
 } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
@@ -61,10 +59,7 @@ export function ScheduleEventComponent({
 
   const blockContent = (
     <div>
-      <Button
+      <Button onClick={() => handleCancel(event.id)} disabled={event.arrived}>
-        onClick={() => handleCancel({ id: event.id })}
-        disabled={event.arrived}
-      >
         {t("appointments.actions.cancel")}
       </Button>
     </div>
@@ -208,46 +203,10 @@ export function ScheduleEventComponent({
             <Button>{t("appointments.actions.sendreminder")}</Button>
           </Dropdown>
         ) : null}
-        <Popover
+
-          trigger="click"
+        <Button onClick={() => handleCancel(event.id)} disabled={event.arrived}>
-          disabled={event.arrived}
+          {t("appointments.actions.cancel")}
-          content={
+        </Button>
-            <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}
@@ -290,7 +249,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, lost_sale_reason }) => {
+  const handleCancel = async (id) => {
     logImEXEvent("schedule_cancel_appt");
 
     const cancelAppt = await cancelAppointment({
@@ -38,8 +38,7 @@ 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,12 +103,6 @@ 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,
@@ -348,7 +342,7 @@ export function JobLinesComponent({
                 onClick={() => {
                   setJobLineEditContext({
                     actions: { refetch: refetch, submit: form && form.submit },
-                    context: { ...record, jobid: job.id },
+                    context: record,
                   });
                 }}
               >

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

@@ -22,20 +22,9 @@ 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
+        <Menu.Item onClick={() => handleSelect(i)}  key={idx}>
-          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,11 +40,6 @@ export function JobLinesUpsertModalComponent({
     {},
     bodyshop.imexshopid
   );
-  const { Autohouse_Detail_line } = useTreatments(
-    ["Autohouse_Detail_line"],
-    {},
-    bodyshop.imexshopid
-  );
 
   return (
     <Modal
@@ -160,40 +155,6 @@ 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">
@@ -257,6 +218,7 @@ export function JobLinesUpsertModalComponent({
             rules={[
               ({ getFieldValue }) => ({
                 validator(rule, value) {
+                  console.log(value);
                   if (!value || getFieldValue("part_type") !== "PAE") {
                     return Promise.resolve();
                   }
@@ -267,6 +229,7 @@ export function JobLinesUpsertModalComponent({
               }),
               ({ getFieldValue }) => ({
                 validator(rule, value) {
+                  console.log(value, !!value);
                   if (
                     !!getFieldValue("part_type") === (!!value || value === 0)
                   ) {
@@ -289,7 +252,7 @@ export function JobLinesUpsertModalComponent({
             name="prt_dsmk_p"
             initialValue={0}
           >
-            <InputNumber precision={0} min={-100} max={100} />
+            <InputNumber precision={0} min={0} 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,13 +13,8 @@ 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")),
@@ -28,13 +23,7 @@ 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);
@@ -51,15 +40,7 @@ function JobLinesUpsertModalContainer({
               manual_line: !(
                 jobLineEditModal.context && jobLineEditModal.context.id
               ),
-              ...UndefinedToNull({
+              ...UndefinedToNull(values),
-                ...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),
-              }),
             },
           ],
         },
@@ -87,15 +68,7 @@ function JobLinesUpsertModalContainer({
       const r = await updateJobLine({
         variables: {
           lineId: jobLineEditModal.context.id,
-          line: {
+          line: values,
-            ...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"],
       });
@@ -119,9 +92,6 @@ function JobLinesUpsertModalContainer({
       }
       toggleModalVisible();
     }
-    if (CriticalPartsScanning.treatment === "on") {
-      CriticalPartsScan(jobLineEditModal.context.jobid);
-    }
     setLoading(false);
   };
 

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

@@ -25,6 +25,8 @@ 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,
@@ -92,6 +94,23 @@ 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",
@@ -99,7 +118,7 @@ export function JobPayments({
       render: (text, record) => (
         <Space wrap>
           <Button
-            // disabled={record.exportedat}
+            disabled={record.exportedat}
             onClick={() => {
               setPaymentContext({
                 actions: { refetch: refetch },

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

@@ -166,16 +166,6 @@ 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-admin-dates/jobs-admin-dates.component.jsx

@@ -1,14 +1,14 @@
+import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import { useMutation } from "@apollo/client";
 import { Button, Form, notification } from "antd";
-import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
-import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import moment from "moment";
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -38,8 +38,8 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
     setLoading(true);
     const result = await updateJob({
       variables: { jobId: job.id, job: values },
-      refetchQueries: ["GET_JOB_BY_PK"],
+      refetchQueries: ['GET_JOB_BY_PK'],
-      awaitRefetchQueries: true,
+      awaitRefetchQueries:true
     });
 
     const changedAuditFields = form.getFieldsValue(
@@ -126,10 +126,7 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
           <Form.Item label={t("jobs.fields.actual_in")} name="actual_in">
             <DateTimePicker />
           </Form.Item>
-          <Form.Item
+          <Form.Item label={t("jobs.fields.date_repairstarted")} name="date_repairstarted">
-            label={t("jobs.fields.date_repairstarted")}
-            name="date_repairstarted"
-          >
             <DateTimePicker />
           </Form.Item>
           <Form.Item
@@ -176,9 +173,6 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
           >
             <DateTimePicker />
           </Form.Item>
-          <Form.Item label={t("jobs.fields.date_void")} name="date_void">
-            <DateTimePicker />
-          </Form.Item>
         </LayoutFormRow>
       </Form>
 

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

@@ -1,18 +1,19 @@
-import { gql, useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client";
 import { Button, notification } from "antd";
+import { gql } from "@apollo/client";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import moment from "moment";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import moment from "moment";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
@@ -149,10 +150,6 @@ export function JobAdminMarkReexport({
 
     if (!result.errors) {
       notification["success"]({ message: t("jobs.successes.save") });
-      insertAuditTrail({
-        jobid: job.id,
-        operation: AuditTrailMapping.admin_jobuninvoice(),
-      });
     } else {
       notification["error"]({
         message: t("jobs.errors.saving", {

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

@@ -33,9 +33,8 @@ export function JobsAdminUnvoid({
 mutation UNVOID_JOB($jobId: uuid!) {
   update_jobs_by_pk(pk_columns: {id: $jobId}, _set: {voided: false, status: "${
     bodyshop.md_ro_statuses.default_imported
-  }", date_void: null}) {
+  }"}) {
     id
-    date_void
     voided
     status
   }

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

@@ -3,9 +3,8 @@ 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";
@@ -20,7 +19,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   DELETE_AVAILABLE_JOB,
   QUERY_AVAILABLE_JOBS,
-  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK
+  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK,
 } from "../../graphql/available-jobs.queries";
 import { INSERT_NEW_JOB, UPDATE_JOB } from "../../graphql/jobs.queries";
 import { INSERT_NEW_NOTE } from "../../graphql/notes.queries";
@@ -28,11 +27,10 @@ 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";
@@ -55,11 +53,6 @@ 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",
@@ -162,9 +155,6 @@ 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: () => {
@@ -251,9 +241,7 @@ 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,7 +9,6 @@ import {
   Space,
   Switch,
 } from "antd";
-import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -19,6 +18,7 @@ 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,22 +43,14 @@ export function JobsConvertButton({
   const { t } = useTranslation();
   const [form] = Form.useForm();
 
-  const handleConvert = async ({ employee_csr, category, ...values }) => {
+  const handleConvert = async (values) => {
     if (parentFormIsFieldsTouched()) {
       alert(t("jobs.labels.savebeforeconversion"));
       return;
     }
     setLoading(true);
     const res = await mutationConvertJob({
-      variables: {
+      variables: { jobId: job.id, ...values },
-        jobId: job.id,
-        job: {
-          converted: true,
-          ...(bodyshop.enforce_conversion_csr ? { employee_csr } : {}),
-          ...(bodyshop.enforce_conversion_category ? { category } : {}),
-          ...values,
-        },
-      },
     });
 
     if (values.ca_gst_registrant) {
@@ -91,12 +83,7 @@ export function JobsConvertButton({
         layout="vertical"
         form={form}
         onFinish={handleConvert}
-        initialValues={{
+        initialValues={{ driveable: true, towin: false }}
-          driveable: true,
-          towin: false,
-          employee_csr: job.employee_csr,
-          category: job.category,
-        }}
       >
         <Form.Item
           name={["ins_co_nm"]}
@@ -109,8 +96,8 @@ export function JobsConvertButton({
           ]}
         >
           <Select>
-            {bodyshop.md_ins_cos.map((s, i) => (
+            {bodyshop.md_ins_cos.map((s) => (
-              <Select.Option key={i} value={s.name}>
+              <Select.Option key={s.name} value={s.name}>
                 {s.name}
               </Select.Option>
             ))}
@@ -164,70 +151,13 @@ export function JobsConvertButton({
             </Form.Item>
           </>
         )}
-        {bodyshop.enforce_conversion_csr && (
+        <Form.Item
-          <Form.Item
+          label={t("jobs.fields.ca_gst_registrant")}
-            name={"employee_csr"}
+          name="ca_gst_registrant"
-            label={t("jobs.fields.employee_csr")}
+          valuePropName="checked"
-            rules={[
+        >
-              {
+          <Switch />
-                required: bodyshop.enforce_conversion_csr,
+        </Form.Item>
-                //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>
-        )}
-        {bodyshop.region_config.toLowerCase().startsWith("ca") && (
-          <Form.Item
-            label={t("jobs.fields.ca_gst_registrant")}
-            name="ca_gst_registrant"
-            valuePropName="checked"
-          >
-            <Switch />
-          </Form.Item>
-        )}
         <Form.Item
           label={t("jobs.fields.driveable")}
           name="driveable"
@@ -264,14 +194,7 @@ export function JobsConvertButton({
         // style={{ display: job.converted ? "none" : "" }}
         disabled={job.converted || jobRO}
         loading={loading}
-        onClick={() => {
+        onClick={() => setVisible(true)}
-          setVisible(true);
-          form.setFieldsValue({
-            driveable: true,
-            towin: false,
-            employee_csr: job.employee_csr,
-          });
-        }}
       >
         {t("jobs.actions.convert")}
       </Button>

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

@@ -224,15 +224,13 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
             >
               <CurrencyInput />
             </Form.Item>
-            {bodyshop.region_config.toLowerCase().startsWith("ca") && (
+            <Form.Item
-              <Form.Item
+              label={t("jobs.fields.ca_gst_registrant")}
-                label={t("jobs.fields.ca_gst_registrant")}
+              name="ca_gst_registrant"
-                name="ca_gst_registrant"
+              valuePropName="checked"
-                valuePropName="checked"
+            >
-              >
+              <Switch />
-                <Switch />
+            </Form.Item>
-              </Form.Item>
-            )}
             <Form.Item
               label={t("jobs.fields.other_amount_payable")}
               name="other_amount_payable"

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

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

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

@@ -20,7 +20,6 @@ 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,9 +4,8 @@ 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({ form }) {
+export default function JobsCreateVehicleInfoNewComponent() {
   const [state] = useContext(JobCreateContext);
 
   const { t } = useTranslation();
@@ -26,7 +25,7 @@ export default function JobsCreateVehicleInfoNewComponent({ form }) {
           <Input disabled={!state.vehicle.new} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow grow noDivider>
+      <LayoutFormRow grow>
         <Form.Item
           label={t("vehicles.fields.v_color")}
           name={["vehicle", "data", "v_color"]}
@@ -53,9 +52,8 @@ export default function JobsCreateVehicleInfoNewComponent({ form }) {
         </Form.Item>
       </LayoutFormRow>
 
-      <LayoutFormRow grow noDivider>
+      <LayoutFormRow grow>
         <Form.Item
-          span={10}
           label={t("vehicles.fields.v_make_desc")}
           name={["vehicle", "data", "v_make_desc"]}
           rules={[
@@ -68,7 +66,6 @@ export default function JobsCreateVehicleInfoNewComponent({ form }) {
           <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={[
@@ -80,11 +77,6 @@ export default function JobsCreateVehicleInfoNewComponent({ form }) {
         >
           <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

@@ -1,81 +0,0 @@
-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-dates/jobs-detail-dates.component.jsx

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

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} allowClear>
+          <Select disabled={jobRO}>
             {bodyshop.md_categories.map((s) => (
               <Select.Option key={s} value={s}>
                 {s}
@@ -289,12 +289,6 @@ 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,15 +1,6 @@
 import { DownCircleFilled } from "@ant-design/icons";
 import { useApolloClient, useMutation } from "@apollo/client";
-import {
+import { Button, Dropdown, Menu, notification, Popconfirm } from "antd";
-  Button,
-  Dropdown,
-  Form,
-  Menu,
-  Popconfirm,
-  Popover,
-  Select,
-  notification,
-} from "antd";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -24,7 +15,6 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import JobsDetailHeaderActionsAddevent from "./jobs-detail-header-actions.addevent";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import JobsDetaiLheaderCsi from "./jobs-detail-header-actions.csi.component";
@@ -137,63 +127,35 @@ export function JobsDetailHeaderActions({
       <Menu.Item
         disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
       >
-        <Popover
+        <Popconfirm
-          trigger="click"
+          title={t("general.labels.areyousure")}
+          okText="Yes"
+          cancelText="No"
+          onClick={(e) => e.stopPropagation()}
           disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
-          content={
+          onConfirm={async () => {
-            <Form
+            const jobUpdate = await cancelAllAppointments({
-              layout="vertical"
+              variables: {
-              onFinish={async ({ lost_sale_reason }) => {
+                jobid: job.id,
-                const jobUpdate = await cancelAllAppointments({
+                job: {
-                  variables: {
+                  date_scheduled: null,
-                    jobid: job.id,
+                  scheduled_in: null,
-                    job: {
+                  scheduled_completion: null,
-                      date_scheduled: null,
+                  status: bodyshop.md_ro_statuses.default_imported,
-                      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"),
-                });
+              });
-                if (!jobUpdate.errors) {
+              return;
-                  notification["success"]({
+            }
-                    message: t("appointments.successes.canceled"),
+          }}
-                  });
+          getPopupContainer={(trigger) => trigger.parentNode}
-                  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")}
-        </Popover>
+        </Popconfirm>
       </Menu.Item>
       <Menu.Item
         disabled={
@@ -462,57 +424,54 @@ export function JobsDetailHeaderActions({
       )}
       <JobsDetailHeaderActionsAddevent jobid={job.id} />
       {!jobRO && job.converted && (
-        <RbacWrapper action="jobs:void" noauth>
+        <Menu.Item>
-          <Menu.Item>
+          <Popconfirm
-            <Popconfirm
+            title={t("jobs.labels.voidjob")}
-              title={t("jobs.labels.voidjob")}
+            okText="Yes"
-              okText="Yes"
+            cancelText="No"
-              cancelText="No"
+            onClick={(e) => e.stopPropagation()}
-              onClick={(e) => e.stopPropagation()}
+            onConfirm={async () => {
-              onConfirm={async () => {
+              //delete the job.
-                //delete the job.
+              const result = await voidJob({
-                const result = await voidJob({
+                variables: {
-                  variables: {
+                  jobId: job.id,
-                    jobId: job.id,
+                  job: {
-                    job: {
+                    status: bodyshop.md_ro_statuses.default_void,
-                      status: bodyshop.md_ro_statuses.default_void,
+                    voided: true,
-                      voided: true,
+                    scheduled_in: null,
-                      scheduled_in: null,
+                    scheduled_completion: null,
-                      scheduled_completion: null,
+                    inproduction: false,
-                      inproduction: false,
-                      date_void: new Date(),
-                    },
-                    note: [
-                      {
-                        jobid: job.id,
-                        created_by: currentUser.email,
-                        audit: true,
-                        text: t("jobs.labels.voidnote"),
-                      },
-                    ],
                   },
-                });
+                  note: [
+                    {
+                      jobid: job.id,
+                      created_by: currentUser.email,
+                      audit: true,
+                      text: t("jobs.labels.voidnote"),
+                    },
+                  ],
+                },
+              });
 
-                if (!!!result.errors) {
+              if (!!!result.errors) {
-                  notification["success"]({
+                notification["success"]({
-                    message: t("jobs.successes.voided"),
+                  message: t("jobs.successes.voided"),
-                  });
+                });
-                  //go back to jobs list.
+                //go back to jobs list.
-                  history.push(`/manage/`);
+                history.push(`/manage/`);
-                } else {
+              } else {
-                  notification["error"]({
+                notification["error"]({
-                    message: t("jobs.errors.voiding", {
+                  message: t("jobs.errors.voiding", {
-                      error: JSON.stringify(result.errors),
+                    error: JSON.stringify(result.errors),
-                    }),
+                  }),
-                  });
+                });
-                }
+              }
-              }}
+            }}
-              getPopupContainer={(trigger) => trigger.parentNode}
+            getPopupContainer={(trigger) => trigger.parentNode}
-            >
+          >
-              {t("menus.jobsactions.void")}
+            {t("menus.jobsactions.void")}
-            </Popconfirm>
+          </Popconfirm>
-          </Menu.Item>
+        </Menu.Item>
-        </RbacWrapper>
       )}
     </Menu>
   );

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, { useState } from "react";
+import React 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,8 +229,6 @@ 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,12 +6,3 @@
   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-detail-rates/jobs-detail-rates.component.jsx

@@ -40,26 +40,24 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
         >
           <CurrencyInput disabled={jobRO} min={0} />
         </Form.Item>
-        {bodyshop.region_config.toLowerCase().startsWith("ca") && (
+        <Tooltip title={t("jobs.labels.ca_gst_all_if_null")}>
-          <Tooltip title={t("jobs.labels.ca_gst_all_if_null")}>
+          <Form.Item
-            <Form.Item
+            label={t("jobs.fields.ca_customer_gst")}
-              label={t("jobs.fields.ca_customer_gst")}
+            name="ca_customer_gst"
-              name="ca_customer_gst"
+          >
-            >
+            <CurrencyInput
-              <CurrencyInput
+              disabled={jobRO}
-                disabled={jobRO}
+              min={0}
-                min={0}
+              max={
-                max={
+                Math.round(
-                  Math.round(
+                  (job.job_totals &&
-                    (job.job_totals &&
+                    job.job_totals.totals.federal_tax.amount) ||
-                      job.job_totals.totals.federal_tax.amount) ||
+                    0
-                      0
+                ) / 100
-                  ) / 100
+              }
-                }
+            />
-              />
+          </Form.Item>
-            </Form.Item>
+        </Tooltip>
-          </Tooltip>
-        )}
         <Form.Item
           label={t("jobs.fields.other_amount_payable")}
           name="other_amount_payable"
@@ -84,14 +82,12 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
         >
           <CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} />
         </Form.Item>
-        {bodyshop.region_config === "CA_BC" && (
+        <Space align="end">
-          <Space align="center">
+          <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
-            <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
+            <CurrencyInput disabled={jobRO} min={0} />
-              <CurrencyInput disabled={jobRO} min={0} />
+          </Form.Item>
-            </Form.Item>
+          <CABCpvrtCalculator form={form} disabled={jobRO} />
-            <CABCpvrtCalculator form={form} disabled={jobRO} />
+        </Space>
-          </Space>
-        )}
         <Form.Item
           label={t("jobs.fields.auto_add_ats")}
           name="auto_add_ats"
@@ -145,15 +141,13 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
         >
           <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
         </Form.Item>
-        {bodyshop.region_config.toLowerCase().startsWith("ca") && (
+        <Form.Item
-          <Form.Item
+          label={t("jobs.fields.ca_gst_registrant")}
-            label={t("jobs.fields.ca_gst_registrant")}
+          name="ca_gst_registrant"
-            name="ca_gst_registrant"
+          valuePropName="checked"
-            valuePropName="checked"
+        >
-          >
+          <Switch disabled={jobRO} />
-            <Switch disabled={jobRO} />
+        </Form.Item>
-          </Form.Item>
-        )}
       </FormRow>
       <Divider
         orientation="left"

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({
+        const parentDir = await window.showDirectoryPicker({
-        //   id: "media",
+          id: "media",
-        //   startIn: "downloads",
+          startIn: "downloads",
-        // });
+        });
 
-        // const directory = await parentDir.getDirectoryHandle(identifier, {
+        const directory = await parentDir.getDirectoryHandle(identifier, {
-        //   create: true,
+          create: true,
-        // });
+        });
 
-        // yauzl.fromBuffer(
+        yauzl.fromBuffer(
-        //   Buffer.from(theDownloadedZip.data),
+          Buffer.from(theDownloadedZip.data),
-        //   {},
+          {},
-        //   (err, zipFile) => {
+          (err, zipFile) => {
-        //     if (err) throw err;
+            if (err) throw err;
-        //     zipFile.on("entry", (entry) => {
+            zipFile.on("entry", (entry) => {
-        //       zipFile.openReadStream(entry, async (readErr, readStream) => {
+              zipFile.openReadStream(entry, async (readErr, readStream) => {
-        //         if (readErr) {
+                if (readErr) {
-        //           zipFile.close();
+                  zipFile.close();
-        //           throw readErr;
+                  throw readErr;
-        //         }
+                }
-        //         if (err) throw err;
+                if (err) throw err;
-        //         let fileSystemHandle = await directory.getFileHandle(
+                let fileSystemHandle = await directory.getFileHandle(
-        //           entry.fileName,
+                  entry.fileName,
-        //           {
+                  {
-        //             create: true,
+                    create: true,
-        //           }
+                  }
-        //         );
+                );
-        //         const writable = await fileSystemHandle.createWritable();
+                const writable = await fileSystemHandle.createWritable();
-        //         readStream.on("data", async function (chunk) {
+                readStream.on("data", async function (chunk) {
-        //           await writable.write(chunk);
+                  await writable.write(chunk);
-        //         });
+                });
-        //         readStream.on("end", async function () {
+                readStream.on("end", async function () {
-        //           await writable.close();
+                  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,9 +11,6 @@ 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,
@@ -26,7 +23,11 @@ function JobsDocumentsComponent({
 }) {
   const [galleryImages, setgalleryImages] = useState({ images: [], other: [] });
   const { t } = useTranslation();
-  const [modalState, setModalState] = useState({ open: false, index: 0 });
+  const [index, setIndex] = useState(0);
+
+  const onCurrentImageChange = (index) => {
+    setIndex(index);
+  };
 
   useEffect(() => {
     let documents = data.reduce(
@@ -34,16 +35,14 @@ function JobsDocumentsComponent({
         const fileType = DetermineFileType(value.type);
         if (value.type.startsWith("image")) {
           acc.images.push({
-            // src: GenerateSrcUrl(value),
+            src: GenerateSrcUrl(value),
-            src: GenerateThumbUrl(value),
+            thumbnail: GenerateThumbUrl(value),
-            // src: GenerateSrcUrl(value),
+            thumbnailHeight: 225,
-            // thumbnail: GenerateThumbUrl(value),
+            thumbnailWidth: 225,
-            fullsize: GenerateSrcUrl(value),
-            height: 225,
-            width: 225,
             isSelected: false,
             key: value.key,
             extension: value.extension,
+
             id: value.id,
             type: value.type,
             size: value.size,
@@ -63,7 +62,7 @@ function JobsDocumentsComponent({
           const fileName = value.key.split("/").pop();
           acc.other.push({
             source: GenerateSrcUrl(value),
-            src: thumb,
+            src: "",
             thumbnail: thumb,
             tags: [
               {
@@ -86,9 +85,10 @@ function JobsDocumentsComponent({
                   ]
                 : []),
             ],
-            height: 225,
+            thumbnailHeight: 225,
-            width: 225,
+            thumbnailWidth: 225,
             isSelected: false,
+
             extension: value.extension,
             key: value.key,
             id: value.id,
@@ -148,15 +148,35 @@ function JobsDocumentsComponent({
           <Card title={t("jobs.labels.documents-images")}>
             <Gallery
               images={galleryImages.images}
-              onClick={(index, item) => {
+              backdropClosesModal={true}
-                setModalState({ open: true, index: index });
+              currentImageWillChange={onCurrentImageChange}
-                // window.open(
+              customControls={[
-                //   item.fullsize,
+                <Button
-                //   "_blank",
+                  key="edit-button"
-                //   "toolbar=0,location=0,menubar=0"
+                  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"
+                );
               }}
-              onSelect={(index, image) => {
+              onSelectImage={(index, image) => {
                 setgalleryImages({
                   ...galleryImages,
                   images: galleryImages.images.map((g, idx) =>
@@ -171,6 +191,8 @@ function JobsDocumentsComponent({
           <Card title={t("jobs.labels.documents-other")}>
             <Gallery
               images={galleryImages.other}
+              backdropClosesModal={true}
+              enableLightbox={false}
               thumbnailStyle={() => {
                 return {
                   backgroundImage: <FileExcelFilled />,
@@ -179,14 +201,14 @@ function JobsDocumentsComponent({
                   cursor: "pointer",
                 };
               }}
-              onClick={(index) => {
+              onClickThumbnail={(index) => {
                 window.open(
                   galleryImages.other[index].source,
                   "_blank",
                   "toolbar=0,location=0,menubar=0"
                 );
               }}
-              onSelect={(index) => {
+              onSelectImage={(index) => {
                 setgalleryImages({
                   ...galleryImages,
                   other: galleryImages.other.map((g, idx) =>
@@ -197,53 +219,6 @@ 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,7 +1,7 @@
 import React, { useEffect } from "react";
-import { Gallery } from "react-grid-gallery";
+import Gallery from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
-import { GenerateThumbUrl } from "./job-documents.utility";
+import { GenerateSrcUrl, GenerateThumbUrl } from "./job-documents.utility";
 
 function JobsDocumentGalleryExternal({
   data,
@@ -15,8 +15,8 @@ function JobsDocumentGalleryExternal({
     let documents = data.reduce((acc, value) => {
       if (value.type.startsWith("image")) {
         acc.push({
-          //src: GenerateSrcUrl(value),
+          src: GenerateSrcUrl(value),
-          src: GenerateThumbUrl(value),
+          thumbnail: GenerateThumbUrl(value),
           thumbnailHeight: 225,
           thumbnailWidth: 225,
           isSelected: false,
@@ -39,7 +39,7 @@ function JobsDocumentGalleryExternal({
       <Gallery
         images={galleryImages}
         backdropClosesModal={true}
-        onSelect={(index, image) => {
+        onSelectImage={(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, useState } from "react";
+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";
@@ -19,9 +19,6 @@ 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,
@@ -52,7 +49,6 @@ export function JobsDocumentsLocalGallery({
   vendorid,
 }) {
   const { t } = useTranslation();
-  const [modalState, setModalState] = useState({ open: false, index: 0 });
   useEffect(() => {
     if (job) {
       if (invoice_number) {
@@ -74,20 +70,12 @@ 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 }],
               });
             }
@@ -132,7 +120,8 @@ export function JobsDocumentsLocalGallery({
       <Card title={t("jobs.labels.documents-images")}>
         <Gallery
           images={jobMedia.images}
-          onSelect={(index, image) => {
+          backdropClosesModal={true}
+          onSelectImage={(index, image) => {
             toggleMediaSelected({ jobid: job.id, filename: image.filename });
           }}
           {...(optimized && {
@@ -144,23 +133,24 @@ export function JobsDocumentsLocalGallery({
               />,
             ],
           })}
-          onClick={(index) => {
+          onClickImage={(props) => {
-            setModalState({ open: true, index: index });
+            const media = allMedia[job.id].find(
-            // const media = allMedia[job.id].find(
+              (m) => m.optimized === props.target.src
-            //   (m) => m.optimized === item.src
+            );
-            // );
 
-            // window.open(
+            window.open(
-            //   media ? media.fullsize : item.fullsize,
+              media ? media.src : props.target.src,
-            //   "_blank",
+              "_blank",
-            //   "toolbar=0,location=0,menubar=0"
+              "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 />,
@@ -169,48 +159,18 @@ export function JobsDocumentsLocalGallery({
               cursor: "pointer",
             };
           }}
-          onClick={(index) => {
+          onClickThumbnail={(index) => {
             window.open(
-              jobMedia.other[index].fullsize,
+              jobMedia.other[index].src,
               "_blank",
               "toolbar=0,location=0,menubar=0"
             );
           }}
-          onSelect={(index, image) => {
+          onSelectImage={(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]);
@@ -52,15 +52,11 @@ function JobDocumentsLocalGalleryExternal({
               val.type.mime &&
               val.type.mime.startsWith("image")
             ) {
-              acc.push({ ...val, src: val.thumbnail });
+              acc.push(val);
             }
             return acc;
           }, [])
         : [];
-    console.log(
-      "🚀 ~ file: jobs-documents-local-gallery.external.component.jsx:48 ~ useEffect ~ documents:",
-      documents
-    );
 
     setgalleryImages(documents);
   }, [allMedia, jobId, setgalleryImages, t]);
@@ -69,7 +65,8 @@ function JobDocumentsLocalGalleryExternal({
     <div className="clearfix">
       <Gallery
         images={galleryImages}
-        onSelect={(index, image) => {
+        backdropClosesModal={true}
+        onSelectImage={(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.exportselected")}
+      {t("jobs.actions.export")}
     </Button>
   );
 }

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

@@ -1,9 +1,8 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Input, Space, Table, Typography } from "antd";
-import axios from "axios";
 import _ from "lodash";
 import queryString from "query-string";
-import React, { useEffect, useState } from "react";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useHistory, useLocation } from "react-router-dom";
@@ -22,8 +21,6 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
   const search = queryString.parse(useLocation().search);
-  const [openSearchResults, setOpenSearchResults] = useState([]);
-  const [searchLoading, setSearchLoading] = useState(false);
   const { page, sortcolumn, sortorder } = search;
   const history = useHistory();
 
@@ -196,28 +193,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
     history.push({ search: queryString.stringify(search) });
   };
 
-  useEffect(() => {
-    if (search.search && search.search.trim() !== "") {
-      searchJobs();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  async function searchJobs(value) {
-    try {
-      setSearchLoading(true);
-      const searchData = await axios.post("/search", {
-        search: value || search.search,
-        index: "jobs",
-      });
-      setOpenSearchResults(searchData.data.hits.hits.map((s) => s._source));
-    } catch (error) {
-      console.log("Error while fetching search results", error);
-    } finally {
-      setSearchLoading(false);
-    }
-  }
-
   return (
     <Card
       extra={
@@ -230,7 +205,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
               <Button
                 onClick={() => {
                   delete search.search;
-                  delete search.page;
                   history.push({ search: queryString.stringify(search) });
                 }}
               >
@@ -246,32 +220,24 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
             onSearch={(value) => {
               search.search = value;
               history.push({ search: queryString.stringify(search) });
-              searchJobs(value);
             }}
-            loading={loading || searchLoading}
             enterButton
           />
         </Space>
       }
     >
       <Table
-        loading={loading || searchLoading}
+        loading={loading}
-        pagination={
+        pagination={{
-          search?.search
+          position: "top",
-            ? {
+          pageSize: 25,
-                pageSize: 25,
+          current: parseInt(page || 1),
-                showSizeChanger: false,
+          total: total,
-              }
+          showSizeChanger: false,
-            : {
+        }}
-                pageSize: 25,
-                current: parseInt(page || 1),
-                total: total,
-                showSizeChanger: false,
-              }
-        }
         columns={columns}
         rowKey="id"
-        dataSource={search?.search ? openSearchResults : jobs}
+        dataSource={jobs}
         onChange={handleTableChange}
       />
     </Card>

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

@@ -112,9 +112,7 @@ export function JobsList({ bodyshop }) {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      sorter: (a, b) =>
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
-        parseInt((a.ro_number || "0").replace(/\D/g, "")) -
-        parseInt((b.ro_number || "0").replace(/\D/g, "")),
       sortOrder:
         state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
 
@@ -262,19 +260,6 @@ 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-notes/jobs.notes.component.jsx

@@ -75,27 +75,6 @@ export function JobNotesComponent({
         </span>
       ),
     },
-    {
-      title: t("notes.fields.type"),
-      dataIndex: "type",
-      key: "type",
-      width: 120,
-      filteredValue: filter?.type || null,
-      filters: [
-        { value: "general", text: t("notes.fields.types.general") },
-        { value: "customer", text: t("notes.fields.types.customer") },
-        { value: "shop", text: t("notes.fields.types.shop") },
-        { value: "office", text: t("notes.fields.types.office") },
-        { value: "parts", text: t("notes.fields.types.parts") },
-        { value: "paint", text: t("notes.fields.types.paint") },
-        {
-          value: "supplement",
-          text: t("notes.fields.types.supplement"),
-        },
-      ],
-      onFilter: (value, record) => value.includes(record.type),
-      render: (text, record) => t(`notes.fields.types.${record.type}`),
-    },
     {
       title: t("notes.fields.text"),
       dataIndex: "text",
@@ -127,7 +106,7 @@ export function JobNotesComponent({
       title: t("notes.actions.actions"),
       dataIndex: "actions",
       key: "actions",
-      width: 200,
+      width: 150,
       render: (text, record) => (
         <Space wrap>
           <Button

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

@@ -272,19 +272,6 @@ 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.component.jsx

@@ -207,7 +207,7 @@ export function LaborAllocationsTable({
         <Card title={t("jobs.labels.laborallocations")}>
           <Table
             columns={columns}
-            rowKey={(record) => `${record.cost_center} ${record.mod_lbr_ty}`}
+            rowKey="cost_center"
             pagination={false}
             onChange={handleTableChange}
             dataSource={totals}

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

@@ -6,6 +6,10 @@ 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/note-upsert-modal/note-upsert-modal.component.jsx

@@ -1,14 +1,4 @@
-import {
+import { Checkbox, Col, Form, Input, Row, Space, Switch, Tag } from "antd";
-  Checkbox,
-  Col,
-  Form,
-  Input,
-  Row,
-  Select,
-  Space,
-  Switch,
-  Tag,
-} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -56,28 +46,6 @@ export function NoteUpsertModalComponent({ form, noteUpsertModal }) {
             <Switch />
           </Form.Item>
         </Col>
-        <Col span={8}>
-          <Form.Item
-            label={t("notes.fields.type")}
-            name="type"
-            initialValue="general"
-          >
-            <Select
-              options={[
-                { value: "general", label: t("notes.fields.types.general") },
-                { value: "customer", label: t("notes.fields.types.customer") },
-                { value: "shop", label: t("notes.fields.types.shop") },
-                { value: "office", label: t("notes.fields.types.office") },
-                { value: "parts", label: t("notes.fields.types.parts") },
-                { value: "paint", label: t("notes.fields.types.paint") },
-                {
-                  value: "supplement",
-                  label: t("notes.fields.types.supplement"),
-                },
-              ]}
-            />
-          </Form.Item>
-        </Col>
         <Col span={8}>
           <NotesPresetButton form={form} />
         </Col>

client/src/components/note-upsert-modal/note-upsert-modal.container.jsx

@@ -34,7 +34,7 @@ export function NoteUpsertModalContainer({
   const [updateNote] = useMutation(UPDATE_NOTE);
 
   const { visible, context, actions } = noteUpsertModal;
-  const { jobId, existingNote, text } = context;
+  const { jobId, existingNote } = context;
   const { refetch } = actions;
 
   const [form] = Form.useForm();
@@ -45,12 +45,8 @@ export function NoteUpsertModalContainer({
       form.setFieldsValue(existingNote);
     } else if (!existingNote && visible) {
       form.resetFields();
-
-      if (text) {
-        form.setFieldValue("text", text);
-      }
     }
-  }, [existingNote, form, visible, text]);
+  }, [existingNote, form, visible]);
 
   const handleFinish = async (formValues) => {
     const { relatedros, ...values } = formValues;
@@ -86,7 +82,6 @@ export function NoteUpsertModalContainer({
             { ...values, jobid: jobId, created_by: currentUser.email },
           ],
         },
-        refetchQueries: ["QUERY_NOTES_BY_JOB_PK"],
       });
 
       if (AdditionalNoteInserts.length > 0) {

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

@@ -1,40 +1,15 @@
-import { Button, Form, notification, PageHeader, Popconfirm } from "antd";
+import { Button, Form, notification, PageHeader } from "antd";
 import React, { useState } from "react";
-import { useHistory } from "react-router-dom";
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
-import { DELETE_OWNER, UPDATE_OWNER } from "../../graphql/owners.queries";
+import { 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);
@@ -66,29 +41,15 @@ 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,9 +34,7 @@ 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_yr} ${record.v_make_desc} ${record.v_model_desc}`}
-              record.v_model_desc || ""
-            }`.trim()}
           </Link>
         ) : (
           t("jobs.errors.novehicle")

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

@@ -201,7 +201,6 @@ export function PartsOrderListTableComponent({
           subject: record.return
             ? Templates.parts_return_slip.subject
             : Templates.parts_order.subject,
-          to: record.vendor.email,
         }}
         id={job.id}
       />
@@ -297,6 +296,7 @@ export function PartsOrderListTableComponent({
         sortOrder:
           state.sortedInfo.columnKey === "quantity" && state.sortedInfo.order,
       },
+
       {
         title: t("parts_orders.fields.act_price"),
         dataIndex: "act_price",

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

@@ -1,10 +1,12 @@
 import { useTreatments } from "@splitsoftware/splitio-react";
-import { Form, Input, Radio, Select } from "antd";
+import { CardElement } from "@stripe/react-stripe-js";
+import { Checkbox, 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";
@@ -17,9 +19,11 @@ const mapStateToProps = createStructuredSelector({
 
 export function PaymentFormComponent({
   form,
+  stripeStateArr,
   bodyshop,
   disabled,
 }) {
+  const [stripeState, setStripeState] = stripeStateArr;
   const { Qb_Multi_Ar } = useTreatments(
     ["Qb_Multi_Ar"],
     {},
@@ -27,6 +31,9 @@ export function PaymentFormComponent({
   );
 
   const { t } = useTranslation();
+  const handleStripeChange = (e) => {
+    setStripeState({ error: e.error, cardComplete: e.complete });
+  };
 
   return (
     <div>
@@ -143,6 +150,57 @@ 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-mark-export-button/payment-mark-export-button-component.jsx

@@ -1,100 +0,0 @@
-import React from "react";
-import { Button, notification } from "antd";
-import { useMutation } from "@apollo/client";
-import { useTranslation } from "react-i18next";
-import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
-import { setModalContext } from "../../redux/modals/modals.actions";
-import { connect } from "react-redux";
-import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
-import { selectCurrentUser } from "../../redux/user/user.selectors";
-import { createStructuredSelector } from "reselect";
-
-const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser,
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  setPaymentContext: (context) =>
-    dispatch(setModalContext({ context: context, modal: "payment" })),
-});
-
-const PaymentMarkForExportButton = ({
-  bodyshop,
-  payment,
-  refetch,
-  setPaymentContext,
-  currentUser,
-}) => {
-  const { t } = useTranslation();
-  const [insertExportLog, { loading: exportLogLoading }] =
-    useMutation(INSERT_EXPORT_LOG);
-  const [updatePayment, { loading: updatePaymentLoading }] =
-    useMutation(UPDATE_PAYMENT);
-
-  const handleClick = async () => {
-    const today = new Date();
-
-    await insertExportLog({
-      variables: {
-        logs: [
-          {
-            bodyshopid: bodyshop.id,
-            paymentid: payment.id,
-            successful: true,
-            useremail: currentUser.email,
-          },
-        ],
-      },
-    });
-
-    const paymentUpdateResponse = await updatePayment({
-      variables: {
-        paymentId: payment.id,
-        payment: {
-          exportedat: today,
-        },
-      },
-    });
-
-    if (!!!paymentUpdateResponse.errors) {
-      notification.open({
-        type: "success",
-        key: "paymentsuccessmarkforexport",
-        message: t("payments.successes.markexported"),
-      });
-
-      if (refetch) refetch();
-
-      setPaymentContext({
-        actions: {
-          refetch,
-        },
-        context: {
-          ...payment,
-          exportedat: today,
-        },
-      });
-    } else {
-      notification["error"]({
-        message: t("payments.errors.exporting", {
-          error: JSON.stringify(paymentUpdateResponse.error),
-        }),
-      });
-    }
-  };
-
-  return (
-    <Button
-      onClick={handleClick}
-      loading={exportLogLoading || updatePaymentLoading}
-      disabled={!!payment.exportedat}
-    >
-      {t("payments.labels.markexported")}
-    </Button>
-  );
-};
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(PaymentMarkForExportButton);

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

@@ -1,10 +1,13 @@
-import { useMutation } from "@apollo/client";
+import { useApolloClient, useMutation } from "@apollo/client";
-
+import { CardElement, useElements, useStripe } from "@stripe/react-stripe-js";
-import { Button, Form, Modal, notification, Space } from "antd";
+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,
@@ -19,8 +22,6 @@ import {
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import PaymentForm from "../payment-form/payment-form.component";
-import PaymentReexportButton from "../payment-reexport-button/payment-reexport-button.component";
-import PaymentMarkForExportButton from "../payment-mark-export-button/payment-mark-export-button-component";
 
 const mapStateToProps = createStructuredSelector({
   paymentModal: selectPayment,
@@ -44,23 +45,82 @@ 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);
-    let updatedPayment; //Moved up from if statement for greater scope.
+
     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,
             },
           },
         });
@@ -89,7 +149,7 @@ function PaymentModalContainer({
           );
         }
       } else {
-        updatedPayment = await updatePayment({
+        const updatedPayment = await updatePayment({
           variables: {
             paymentId: context.id,
             payment: paymentObj,
@@ -103,11 +163,7 @@ function PaymentModalContainer({
         }
       }
 
-      if (actions.refetch)
+      if (actions.refetch) actions.refetch();
-        actions.refetch(
-          updatedPayment && updatedPayment.data.update_payments.returning[0]
-        );
-
       if (enterAgain) {
         const prev = form.getFieldsValue(["date"]);
 
@@ -130,11 +186,7 @@ function PaymentModalContainer({
   };
 
   useEffect(() => {
-    if (visible) {
+    if (visible) form.resetFields();
-      form.resetFields();
-      form.resetFields();
-      form.setFieldsValue(context);
-    }
   }, [visible, form, context]);
 
   useEffect(() => {
@@ -149,7 +201,6 @@ function PaymentModalContainer({
           : t("payments.labels.edit")
       }
       visible={visible}
-      destroyOnClose
       okText={t("general.actions.save")}
       onOk={() => form.submit()}
       width="50%"
@@ -178,26 +229,18 @@ function PaymentModalContainer({
         </span>
       }
     >
-      {!context || (context && !context.id) ? null : (
-        <Space>
-          <PaymentReexportButton payment={context} refetch={actions.refetch} />
-          <PaymentMarkForExportButton
-            bodyshop={bodyshop}
-            payment={context}
-            refetch={actions.refetch}
-          />
-        </Space>
-      )}
-
       <Form
         onFinish={handleFinish}
         autoComplete={"off"}
         form={form}
         layout="vertical"
         initialValues={context || {}}
-        disabled={context?.exportedat}
       >
-        <PaymentForm form={form} />
+        <PaymentForm
+          form={form}
+          stripeStateArr={stripeStateArr}
+          disabled={context && context.stripeid}
+        />
       </Form>
     </Modal>
   );
@@ -207,3 +250,15 @@ 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/payment-reexport-button/payment-reexport-button.component.jsx

@@ -1,66 +0,0 @@
-import React from "react";
-import { Button, notification } from "antd";
-import { useTranslation } from "react-i18next";
-import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
-import { useMutation } from "@apollo/client";
-import { setModalContext } from "../../redux/modals/modals.actions";
-import { connect } from "react-redux";
-
-const mapDispatchToProps = (dispatch) => ({
-  setPaymentContext: (context) =>
-    dispatch(setModalContext({ context: context, modal: "payment" })),
-});
-
-const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
-  const { t } = useTranslation();
-  const [updatePayment, { loading }] = useMutation(UPDATE_PAYMENT);
-
-  const handleClick = async () => {
-    const paymentUpdateResponse = await updatePayment({
-      variables: {
-        paymentId: payment.id,
-        payment: {
-          exportedat: null,
-        },
-      },
-    });
-
-    if (!!!paymentUpdateResponse.errors) {
-      notification.open({
-        type: "success",
-        key: "paymentsuccessexport",
-        message: t("payments.successes.markreexported"),
-      });
-
-      if (refetch) refetch();
-
-      setPaymentContext({
-        actions: {
-          refetch,
-        },
-        context: {
-          ...payment,
-          exportedat: null,
-        },
-      });
-    } else {
-      notification["error"]({
-        message: t("payments.errors.exporting", {
-          error: JSON.stringify(paymentUpdateResponse.error),
-        }),
-      });
-    }
-  };
-
-  return (
-    <Button
-      onClick={handleClick}
-      loading={loading}
-      disabled={!payment.exportedat}
-    >
-      {t("payments.labels.markforreexport")}
-    </Button>
-  );
-};
-
-export default connect(null, mapDispatchToProps)(PaymentReexportButton);

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

@@ -1,23 +1,22 @@
 import { EditFilled, SyncOutlined } from "@ant-design/icons";
-import { useApolloClient } from "@apollo/client";
 import { Button, Card, Input, Space, Table, Typography } from "antd";
-import axios from "axios";
 import queryString from "query-string";
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { QUERY_PAYMENT_BY_ID } from "../../graphql/payments.queries";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
-import { TemplateList } from "../../utils/TemplateConstants";
 import { alphaSort } from "../../utils/sorters";
+import { TemplateList } from "../../utils/TemplateConstants";
 import CaBcEtfTableModalContainer from "../ca-bc-etf-table-modal/ca-bc-etf-table-modal.container";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
+import 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
@@ -42,10 +41,7 @@ export function PaymentsListPaginated({
   bodyshop,
 }) {
   const search = queryString.parse(useLocation().search);
-  const [openSearchResults, setOpenSearchResults] = useState([]);
-  const [searchLoading, setSearchLoading] = useState(false);
   const { page, sortcolumn, sortorder } = search;
-  const client = useApolloClient();
   const history = useHistory();
   const [state, setState] = useState({
     sortedInfo: {},
@@ -58,17 +54,13 @@ export function PaymentsListPaginated({
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      // sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
+      sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
-      // sortOrder: sortcolumn === "ro_number" && sortorder,
+      sortOrder: sortcolumn === "ro_number" && sortorder,
-      render: (text, record) => {
+      render: (text, record) => (
-        return record.job ? (
+        <Link to={"/manage/jobs/" + record.job.id}>
-          <Link to={"/manage/jobs/" + record.job.id}>
+          {record.job.ro_number || t("general.labels.na")}
-            {record.job.ro_number || t("general.labels.na")}
+        </Link>
-          </Link>
+      ),
-        ) : (
-          <span>{t("general.labels.na")}</span>
-        );
-      },
     },
     {
       title: t("payments.fields.paymentnum"),
@@ -82,16 +74,16 @@ export function PaymentsListPaginated({
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
-      // sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
+      sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
-      // sortOrder: sortcolumn === "owner" && sortorder,
+      sortOrder: sortcolumn === "owner" && sortorder,
       render: (text, record) => {
-        return record.job?.owner ? (
+        return record.job.owner ? (
-          <Link to={"/manage/owners/" + record.job?.owner?.id}>
+          <Link to={"/manage/owners/" + record.job.owner.id}>
-            <OwnerNameDisplay ownerObject={record.job} />
+            <OwnerNameDisplay ownerObject={record} />
           </Link>
         ) : (
           <span>
-            <OwnerNameDisplay ownerObject={record.job} />
+            <OwnerNameDisplay ownerObject={record} />
           </span>
         );
       },
@@ -133,6 +125,23 @@ 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",
@@ -156,34 +165,11 @@ export function PaymentsListPaginated({
       render: (text, record) => (
         <Space>
           <Button
-            // disabled={record.exportedat}
+            disabled={record.exportedat}
-            onClick={async () => {
+            onClick={() => {
-              let apolloResults;
-              if (search.search) {
-                const { data } = await client.query({
-                  query: QUERY_PAYMENT_BY_ID,
-                  variables: {
-                    paymentId: record.id,
-                  },
-                });
-                apolloResults = data.payments_by_pk;
-              }
               setPaymentContext({
-                actions: {
+                actions: { refetch: refetch },
-                  refetch: apolloResults
+                context: record,
-                    ? (updatedRecord) => {
-                        setOpenSearchResults((results) =>
-                          results.map((result) => {
-                            if (result.id !== record.id) {
-                              return result;
-                            }
-                            return updatedRecord;
-                          })
-                        );
-                      }
-                    : refetch,
-                },
-                context: apolloResults ? apolloResults : record,
               });
             }}
           >
@@ -210,28 +196,6 @@ export function PaymentsListPaginated({
     history.push({ search: queryString.stringify(search) });
   };
 
-  useEffect(() => {
-    if (search.search && search.search.trim() !== "") {
-      searchPayments();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  async function searchPayments(value) {
-    try {
-      setSearchLoading(true);
-      const searchData = await axios.post("/search", {
-        search: value || search.search,
-        index: "payments",
-      });
-      setOpenSearchResults(searchData.data.hits.hits.map((s) => s._source));
-    } catch (error) {
-      console.log("Error while fetching search results", error);
-    } finally {
-      setSearchLoading(false);
-    }
-  }
-
   return (
     <Card
       extra={
@@ -244,7 +208,6 @@ export function PaymentsListPaginated({
               <Button
                 onClick={() => {
                   delete search.search;
-                  delete search.page;
                   history.push({ search: queryString.stringify(search) });
                 }}
               >
@@ -268,33 +231,24 @@ export function PaymentsListPaginated({
             onSearch={(value) => {
               search.search = value;
               history.push({ search: queryString.stringify(search) });
-              searchPayments(value);
             }}
-            loading={loading || searchLoading}
             enterButton
           />
         </Space>
       }
     >
       <Table
-        loading={loading || searchLoading}
+        loading={loading}
         scroll={{ x: true }}
-        pagination={
+        pagination={{
-          search?.search
+          position: "top",
-            ? {
+          pageSize: 25,
-                pageSize: 25,
+          current: parseInt(page || 1),
-                showSizeChanger: false,
+          total: total,
-              }
+        }}
-            : {
-                pageSize: 25,
-                current: parseInt(page || 1),
-                total: total,
-                showSizeChanger: false,
-              }
-        }
         columns={columns}
         rowKey="id"
-        dataSource={search?.search ? openSearchResults : payments}
+        dataSource={payments}
         onChange={handleTableChange}
       />
     </Card>

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

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

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

@@ -23,34 +23,14 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
   const { id: jobId, job } = printCenterModal.context;
   const tempList = TemplateList("job", {});
   const { t } = useTranslation();
-
+  const JobsReportsList = Object.keys(tempList)
-  const JobsReportsList =
+    .map((key) => {
-    bodyshop.cdk_dealerid === null && bodyshop.pbs_serialnumber === null
+      return tempList[key];
-      ? Object.keys(tempList)
+    })
-          .map((key) => {
+    .filter(
-            return tempList[key];
+      (temp) =>
-          })
+        !temp.regions || (temp.regions && temp.regions[bodyshop.region_config])
-          .filter(
+    );
-            (temp) =>
-              (!temp.regions ||
-                (temp.regions && temp.regions[bodyshop.region_config]) ||
-                (temp.regions &&
-                  bodyshop.region_config.includes(Object.keys(temp.regions)) ===
-                    true)) &&
-              (!temp.dms || temp.dms === false)
-          )
-      : Object.keys(tempList)
-          .map((key) => {
-            return tempList[key];
-          })
-          .filter(
-            (temp) =>
-              !temp.regions ||
-              (temp.regions && temp.regions[bodyshop.region_config]) ||
-              (temp.regions &&
-                bodyshop.region_config.includes(Object.keys(temp.regions)) ===
-                  true)
-          );
 
   const filteredJobsReportsList =
     search !== ""

client/src/components/production-board-kanban-card/production-board-kanban-card-color-legend.component.jsx

@@ -1,51 +0,0 @@
-import { Col, List, Space, Typography } from "antd";
-import React from "react";
-import { useTranslation } from "react-i18next";
-
-const CardColorLegend = ({ bodyshop }) => {
-  const { t } = useTranslation();
-  const data = bodyshop.ssbuckets.map((bucket) => {
-    let color = { r: 255, g: 255, b: 255 };
-
-    if (bucket.color) {
-      color = bucket.color;
-
-      if (bucket.color.rgb) {
-        color = bucket.color.rgb;
-      }
-    }
-
-    return {
-      label: bucket.label,
-      color,
-    };
-  });
-
-  return (
-    <Col>
-      <Typography>{t("production.labels.legend")}</Typography>
-      <List
-        grid={{
-          gutter: 16,
-        }}
-        dataSource={data}
-        renderItem={(item) => (
-          <List.Item>
-            <Space>
-              <div
-                style={{
-                  width: "1.5rem",
-                  aspectRatio: "1/1",
-                  backgroundColor: `rgba(${item.color.r},${item.color.g},${item.color.b},${item.color.a})`,
-                }}
-              ></div>
-              <div>{item.label}</div>
-            </Space>
-          </List.Item>
-        )}
-      />
-    </Col>
-  );
-};
-
-export default CardColorLegend;

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

@@ -18,31 +18,6 @@ import moment from "moment";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
 
-const cardColor = (ssbuckets, totalHrs) => {
-  const bucket = ssbuckets.filter(
-    (bucket) =>
-      bucket.gte <= totalHrs && (!!bucket.lt ? bucket.lt > totalHrs : true)
-  )[0];
-
-  let color = { r: 255, g: 255, b: 255 };
-
-  if (bucket && bucket.color) {
-    color = bucket.color;
-
-    if (bucket.color.rgb) {
-      color = bucket.color.rgb;
-    }
-  }
-
-  return color;
-};
-
-function getContrastYIQ(bgColor) {
-  const yiq = (bgColor.r * 299 + bgColor.g * 587 + bgColor.b * 114) / 1000;
-
-  return yiq >= 128 ? "black" : "white";
-}
-
 export default function ProductionBoardCard(
   technician,
   card,
@@ -79,22 +54,10 @@ export default function ProductionBoardCard(
         .isSame(moment(card.scheduled_completion), "day") &&
         "production-completion-soon"));
 
-  const totalHrs =
-    card.labhrs.aggregate.sum.mod_lb_hrs + card.larhrs.aggregate.sum.mod_lb_hrs;
-  const bgColor = cardColor(bodyshop.ssbuckets, totalHrs);
-
   return (
     <Card
       className="react-kanban-card imex-kanban-card"
       size="small"
-      style={{
-        backgroundColor:
-          cardSettings &&
-          cardSettings.cardcolor &&
-          `rgba(${bgColor.r},${bgColor.g},${bgColor.b},${bgColor.a})`,
-        color:
-          cardSettings && cardSettings.cardcolor && getContrastYIQ(bgColor),
-      }}
       title={
         <Space>
           <ProductionAlert record={card} key="alert" />

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

@@ -104,13 +104,6 @@ export default function ProductionBoardKanbanCardSettings({
               >
                 <Switch />
               </Form.Item>
-              <Form.Item
-                valuePropName="checked"
-                label={t("production.labels.cardcolor")}
-                name="cardcolor"
-              >
-                <Switch />
-              </Form.Item>
             </Col>
             <Col span={12}>
               <Form.Item
@@ -173,7 +166,7 @@ export default function ProductionBoardKanbanCardSettings({
     </div>
   );
   return (
-    <Popover content={overlay} visible={visible} placement="topRight">
+    <Popover content={overlay} visible={visible}>
       <Button loading={loading} onClick={() => setVisible(true)}>
         {t("production.labels.cardsettings")}
       </Button>

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

@@ -22,7 +22,6 @@ import ProductionBoardKanbanCardSettings from "./production-board-kanban.card-se
 //import "@asseinfo/react-kanban/dist/styles.css";
 import "./production-board-kanban.styles.scss";
 import { createBoardData } from "./production-board-kanban.utils.js";
-import CardColorLegend from "../production-board-kanban-card/production-board-kanban-card-color-legend.component";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   technician: selectTechnician,
@@ -222,7 +221,6 @@ export function ProductionBoardKanbanComponent({
           employeeassignments: true,
           scheduled_completion: true,
           stickyheader: false,
-          cardcolor: false,
         };
 
   return (
@@ -258,11 +256,6 @@ export function ProductionBoardKanbanComponent({
           </Space>
         }
       />
-
-      {cardSettings.cardcolor && (
-        <CardColorLegend cardSettings={cardSettings} bodyshop={bodyshop} />
-      )}
-
       <ProductionListDetailComponent jobs={data} />
       <StickyContainer>
         <Board

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

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

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

@@ -25,7 +25,6 @@ export default function ProductionListDate({
     // }
 
     //e.stopPropagation();
-
     updateAlert({
       variables: {
         jobId: record.id,
@@ -33,11 +32,6 @@ export default function ProductionListDate({
           [field]: date,
         },
       },
-      optimisticResponse: {
-        update_jobs: {
-          [field]: date,
-        },
-      },
     }).then(() => {
       if (record.refetch) record.refetch();
       if (!time) {
@@ -55,11 +49,9 @@ export default function ProductionListDate({
         (moment().add(1, "day").isSame(moment(record[field]), "day") &&
           "production-completion-soon"));
   }
-
   return (
     <Dropdown
-      trigger={["click"]}
+      //trigger={["click"]}
-      onVisibleChange={(v) => setVisible(v)}
       visible={visible}
       style={{
         height: "19px",

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

@@ -1,23 +1,12 @@
 import Icon from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { Button, Input, Popover, Space } from "antd";
+import { Button, Input, Popover } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaRegStickyNote } from "react-icons/fa";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
-import { setModalContext } from "../../redux/modals/modals.actions";
+export default function ProductionListColumnProductionNote({ record }) {
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-
-const mapStateToProps = createStructuredSelector({});
-
-const mapDispatchToProps = (dispatch) => ({
-  setNoteUpsertContext: (context) =>
-    dispatch(setModalContext({ context: context, modal: "noteUpsert" })),
-});
-
-function ProductionListColumnProductionNote({ record, setNoteUpsertContext }) {
   const { t } = useTranslation();
 
   const [note, setNote] = useState(
@@ -71,26 +60,12 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext }) {
             // onPressEnter={handleSaveNote}
             autoFocus
             allowClear
-            style={{ marginBottom: "1em" }}
           />
-          <Space>
+          <div>
-            <Button onClick={handleSaveNote} type="primary">
+            <Button onClick={handleSaveNote}>
               {t("general.actions.save")}
             </Button>
-            <Button
+          </div>
-              onClick={() => {
-                setVisible(false);
-                setNoteUpsertContext({
-                  context: {
-                    jobId: record.id,
-                    text: note,
-                  },
-                });
-              }}
-            >
-              {t("notes.actions.savetojobnotes")}
-            </Button>
-          </Space>
         </div>
       }
       trigger={["click"]}
@@ -110,8 +85,3 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext }) {
     </Popover>
   );
 }
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(ProductionListColumnProductionNote);

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

@@ -55,7 +55,6 @@ 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 ?? 100,
+          width: k.width,
         };
       })) ||
       []
@@ -246,21 +246,11 @@ export function ProductionListTable({
                 (x) => x.status === record.status
               );
 
-              if (!color) {
+              if (!color) return null;
-                if (index % 2 === 0)
-                  return {
-                    style: {
-                      backgroundColor: `rgb(236, 236, 236)`,
-                    },
-                  };
-
-                return null;
-              }
 
               return {
-                className: "rowWithColor",
                 style: {
-                  "--bgColor": `rgb(${color.color.r},${color.color.g},${color.color.b},${color.color.a})`,
+                  backgroundColor: `rgb(${color.color.r},${color.color.g},${color.color.b},${color.color.a})`,
                 },
               };
             },
@@ -277,8 +267,6 @@ 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),
@@ -288,12 +276,11 @@ export function ProductionListTable({
           rowKey="id"
           loading={loading}
           dataSource={dataSource}
-          scroll={{ x: 1000 }}
+          // scroll={{ x: true }}
           onChange={handleTableChange}
         />
       </ReactDragListView.DragColumn>
     </div>
   );
 }
-
 export default connect(mapStateToProps, null)(ProductionListTable);

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

@@ -3,26 +3,8 @@ import { Resizable } from "react-resizable";
 
 export default function ResizableComponent(props) {
   const { onResize, width, ...restProps } = props;
-
-  if (!width) {
-    return <th {...restProps} />;
-  }
-
   return (
-    <Resizable
+    <Resizable width={width || 200} height={0} onResize={onResize}>
-      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, Card, Col, Form, Input, notification } from "antd";
+import { Button, Form, Input, notification } from "antd";
 import { LockOutlined } from "@ant-design/icons";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -48,99 +48,81 @@ export default connect(
   };
 
   return (
-    <>
+    <div>
-      <Col span={24}>
+      <Form
-        <Form
+        onFinish={handleFinish}
-          onFinish={handleFinish}
+        autoComplete={"no"}
-          autoComplete={"no"}
+        initialValues={currentUser}
-          initialValues={currentUser}
+        layout="vertical"
-          layout="vertical"
+      >
-        >
+        <LayoutFormRow>
-          <Card
+          <Form.Item
-            title={t("user.labels.profileinfo")}
+            label={t("user.fields.displayname")}
-            extra={
+            rules={[
-              <Button type="primary" key="submit" htmlType="submit">
+              {
-                {t("user.actions.updateprofile")}
+                required: true,
-              </Button>
+                //message: t("general.validation.required"),
-            }
+              },
+            ]}
+            name="displayName"
           >
-            <LayoutFormRow noDivider>
+            <Input />
-              <Form.Item
+          </Form.Item>
-                label={t("user.fields.displayname")}
+          <Form.Item label={t("user.fields.photourl")} name="photoURL">
-                rules={[
+            <Input />
-                  {
+          </Form.Item>
-                    required: true,
+        </LayoutFormRow>
-                    //message: t("general.validation.required"),
+
-                  },
+        <Button type="primary" key="submit" htmlType="submit">
-                ]}
+          {t("user.actions.updateprofile")}
-                name="displayName"
+        </Button>
-              >
+      </Form>
-                <Input />
+      <Form
-              </Form.Item>
+        onFinish={handleChangePassword}
-              <Form.Item label={t("user.fields.photourl")} name="photoURL">
+        autoComplete={"no"}
-                <Input />
+        initialValues={currentUser}
-              </Form.Item>
+        layout="vertical"
-            </LayoutFormRow>
+      >
-          </Card>
+        <LayoutFormRow>
-        </Form>
+          <Form.Item label={t("general.labels.newpassword")} name="password">
-      </Col>
+            <Input
-      <Col span={24}>
+              prefix={<LockOutlined />}
-        <Form
+              type="password"
-          onFinish={handleChangePassword}
+              placeholder={t("general.labels.password")}
-          autoComplete={"no"}
+            />
-          initialValues={currentUser}
+          </Form.Item>
-          layout="vertical"
+          <Form.Item
-        >
+            label={t("general.labels.confirmpassword")}
-          <Card
+            name="password-confirm"
-            title={t("user.labels.changepassword")}
+            dependencies={["password"]}
-            extra={
+            rules={[
-              <Button type="primary" key="submit" htmlType="submit">
+              {
-                {t("user.actions.changepassword")}
+                required: true,
-              </Button>
+                //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>
+            <Input
-              <Form.Item
+              prefix={<LockOutlined />}
-                label={t("general.labels.newpassword")}
+              type="password"
-                name="password"
+              placeholder={t("general.labels.password")}
-              >
+            />
-                <Input
+          </Form.Item>
-                  prefix={<LockOutlined />}
+        </LayoutFormRow>
-                  type="password"
+        <Button type="primary" key="submit" htmlType="submit">
-                  placeholder={t("general.labels.password")}
+          {t("user.actions.changepassword")}
-                />
+        </Button>
-              </Form.Item>
+      </Form>
-              <Form.Item
+    </div>
-                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 { Button, Card, Col, Input, Table, Typography } from "antd";
+import React from "react";
-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,38 +40,17 @@ export default function ProfileShopsComponent({
     },
   ];
 
-  const filteredData =
-    search === ""
-      ? data
-      : data.filter((d) =>
-          d.bodyshop.shopname.toLowerCase().includes(search.toLowerCase())
-        );
-
   return (
-    <Col span={24}>
+    <Table
-      <Card
+      title={() => (
-        title={
+        <Typography.Title level={4}>
-          <Typography.Title level={4}>
+          {t("profile.labels.activeshop")}
-            {t("profile.labels.activeshop")}
+        </Typography.Title>
-          </Typography.Title>
+      )}
-        }
+      loading={loading}
-        extra={
+      columns={columns}
-          <Input.Search
+      rowKey="id"
-            value={search}
+      dataSource={data}
-            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_ACTIVE_ASSOCIATION,
+  UPDATE_ASSOCIATION,
 } from "../../graphql/associations.queries";
 import AlertComponent from "../alert/alert.component";
 import ProfileShopsComponent from "./profile-shops.component";
@@ -13,13 +13,9 @@ import { getToken } from "firebase/messaging";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import {
+import { selectBodyshop } from "../../redux/user/user.selectors";
-  selectBodyshop,
-  selectCurrentUser,
-} from "../../redux/user/user.selectors";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
-  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -29,18 +25,14 @@ export default connect(
   mapDispatchToProps
 )(ProfileShopsContainer);
 
-export function ProfileShopsContainer({ bodyshop, currentUser }) {
+export function ProfileShopsContainer({ bodyshop }) {
   const { loading, error, data } = useQuery(QUERY_ALL_ASSOCIATIONS, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
-    variables: {
-      email: currentUser.email,
-    },
-    skip: !currentUser,
   });
-  const [updateActiveAssociation] = useMutation(UPDATE_ACTIVE_ASSOCIATION);
+  const [updateAssocation] = useMutation(UPDATE_ASSOCIATION);
 
-  const updateActiveShop = async (newActiveAssocId) => {
+  const updateActiveShop = async (activeShopId) => {
     logImEXEvent("profile_change_active_shop");
 
     try {
@@ -54,12 +46,16 @@ export function ProfileShopsContainer({ bodyshop, currentUser }) {
     } catch (error) {
       console.log("No FCM token. Skipping unsubscribe.");
     }
-
+    await Promise.all(
-    await updateActiveAssociation({
+      data.associations.map(async (record) => {
-      variables: {
+        await updateAssocation({
-        newActiveAssocId: newActiveAssocId,
+          variables: {
-      },
+            assocId: record.id,
-    });
+            assocActive: record.id === activeShopId ? true : false,
+          },
+        });
+      })
+    );
 
     //Force window refresh.
 

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

@@ -26,8 +26,6 @@ const ret = {
   "jobs:partsqueue": 4,
   "jobs:checklist-view": 2,
   "jobs:list-ready": 1,
-  "jobs:void": 5,
-
   "bills:enter": 2,
   "bills:view": 2,
   "bills:list": 2,

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

@@ -92,11 +92,7 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
         to: values.to,
         subject: Templates[values.key]?.subject,
       },
-      values.sendbyexcel === "excel"
+      values.sendby === "email" ? "e" : "p",
-        ? "x"
-        : values.sendby === "email"
-        ? "e"
-        : "p",
       id
     );
     setLoading(false);
@@ -254,38 +250,15 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
             ranges={DatePIckerRanges}
           />
         </Form.Item>
-        <Form.Item style={{ margin: 0, padding: 0 }} dependencies={["key"]}>
+        <Form.Item
-          {() => {
+          label={t("general.labels.sendby")}
-            const key = form.getFieldValue("key");
+          name="sendby"
-            //Kind of Id
+          initialValue="print"
-            const reporttype = Templates[key] && Templates[key].reporttype;
+        >
-
+          <Radio.Group>
-            if (reporttype === "excel")
+            <Radio value="email">{t("general.labels.email")}</Radio>
-              return (
+            <Radio value="print">{t("general.labels.print")}</Radio>
-                <Form.Item
+          </Radio.Group>
-                  label={t("general.labels.sendby")}
-                  name="sendbyexcel"
-                  initialValue="excel"
-                >
-                  <Radio.Group>
-                    <Radio value="excel">{t("general.labels.excel")}</Radio>
-                  </Radio.Group>
-                </Form.Item>
-              );
-            if (reporttype !== "excel")
-              return (
-                <Form.Item
-                  label={t("general.labels.sendby")}
-                  name="sendby"
-                  initialValue="print"
-                >
-                  <Radio.Group>
-                    <Radio value="email">{t("general.labels.email")}</Radio>
-                    <Radio value="print">{t("general.labels.print")}</Radio>
-                  </Radio.Group>
-                </Form.Item>
-              );
-          }}
         </Form.Item>
 
         <div

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

@@ -1,48 +0,0 @@
-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,13 +4,11 @@ import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import {
-  Legend,
+  Legend, PolarAngleAxis,
-  PolarAngleAxis,
   PolarGrid,
   PolarRadiusAxis,
-  Radar,
+  Radar, RadarChart,
-  RadarChart,
+  Tooltip
-  Tooltip,
 } from "recharts";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -46,8 +44,6 @@ 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.allJobsOut ? (
+          {loadData && loadData.jobsOut ? (
-            loadData.allJobsOut.map((j) => (
+            loadData.jobsOut.map((j) => (
               <tr key={j.id}>
                 <td>
                   <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
@@ -102,12 +102,11 @@ export function ScheduleCalendarHeaderComponent({
     <div onClick={(e) => e.stopPropagation()}>
       <table>
         <tbody>
-          {loadData && loadData.allJobsIn ? (
+          {loadData && loadData.jobsIn ? (
-            loadData.allJobsIn.map((j) => (
+            loadData.jobsIn.map((j) => (
               <tr key={j.id}>
                 <td>
                   <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
-                  {j.status}
                 </td>
                 <td>
                   <OwnerNameDisplay ownerObject={j} />
@@ -143,7 +142,7 @@ export function ScheduleCalendarHeaderComponent({
           title={t("appointments.labels.arrivingjobs")}
         >
           <Icon component={MdFileDownload} style={{ color: "green" }} />
-          {(loadData.allHoursIn || 0) && loadData.allHoursIn.toFixed(2)}
+          {(loadData.hoursIn || 0) && loadData.hoursIn.toFixed(2)}
         </Popover>
         <Popover
           placement={"bottom"}
@@ -152,7 +151,7 @@ export function ScheduleCalendarHeaderComponent({
           title={t("appointments.labels.completingjobs")}
         >
           <Icon component={MdFileUpload} style={{ color: "red" }} />
-          {(loadData.allHoursOut || 0) && loadData.allHoursOut.toFixed(2)}
+          {(loadData.hoursOut || 0) && loadData.hoursOut.toFixed(2)}
         </Popover>
         <ScheduleCalendarHeaderGraph loadData={loadData} />
       </div>

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

@@ -11,9 +11,8 @@ 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, Collapse } from "antd";
+import { Alert } from "antd";
-import { useTranslation, Trans } from "react-i18next";
+import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -54,58 +53,17 @@ export function ScheduleCalendarWrapperComponent({
   return (
     <>
       <JobDetailCards />
-      {problemJobs && problemJobs.length > 2 ? (
+      {problemJobs &&
-        <Collapse>
-          <Collapse.Panel
-            header={
-              <span style={{ color: "tomato" }}>
-                {t("appointments.labels.severalerrorsfound")}
-              </span>
-            }
-          >
-            {problemJobs.map((problem) => (
-              <Alert
-                key={problem.id}
-                type="error"
-                message={
-                  <Trans
-                    i18nKey="appointments.labels.dataconsistency"
-                    components={[
-                      <Link
-                        to={`/manage/jobs/${problem.id}`}
-                        target="_blank"
-                      />,
-                    ]}
-                    values={{
-                      ro_number: problem.ro_number,
-                      code: problem.code,
-                    }}
-                  />
-                }
-              />
-            ))}
-          </Collapse.Panel>
-        </Collapse>
-      ) : (
         problemJobs.map((problem) => (
           <Alert
             key={problem.id}
             type="error"
-            message={
+            message={t("appointments.labels.dataconsistency", {
-              <Trans
+              ro_number: problem.ro_number,
-                i18nKey="appointments.labels.dataconsistency"
+              code: problem.code,
-                components={[
+            })}
-                  <Link to={`/manage/jobs/${problem.id}`} target="_blank" />,
-                ]}
-                values={{
-                  ro_number: problem.ro_number,
-                  code: problem.code,
-                }}
-              />
-            }
           />
-        ))
+        ))}
-      )}
 
       <Calendar
         events={data}

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

@@ -1,91 +1,31 @@
 import { SyncOutlined } from "@ant-design/icons";
-import {
+import { Button, Card, Checkbox, Col, PageHeader, Row, Space } from "antd";
-  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";
-import _ from "lodash";
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(ScheduleCalendarComponent);
 
-export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
+export default function ScheduleCalendarComponent({ data, refetch }) {
   const [filter, setFilter] = useLocalStorage("filter_events", {
     intake: true,
     manual: true,
     employeevacation: true,
-    ins_co_nm: null,
   });
-  const [estimatorsFilter, setEstimatiorsFilter] = useLocalStorage(
-    "estimators",
-    []
-  );
-
-  const estimators = useMemo(() => {
-    return _.uniq([
-      ...data
-        .filter((d) => d.__typename === "appointments")
-        .map((app) =>
-          `${app.job?.est_ct_fn || ""} ${app.job?.est_ct_ln || ""}`.trim()
-        )
-        .filter((e) => e.length > 0),
-      ...bodyshop.md_estimators.map((e) =>
-        `${e.est_ct_fn || ""} ${e.est_ct_ln || ""}`.trim()
-      ),
-    ]);
-  }, [data, bodyshop.md_estimators]);
-
   const filteredData = useMemo(() => {
-    return data.filter((d) => {
+    return data.filter(
-      const estFilter =
+      (d) =>
-        d.__typename === "appointments"
+        d.block ||
-          ? estimatorsFilter.length === 0
+        (filter.intake && d.isintake) ||
-            ? true
+        (filter.manual && !d.isintake && d.block === false) ||
-            : !!estimatorsFilter.find(
+        (d.__typename === "employee_vacation" &&
-                (e) =>
+          filter.employeevacation &&
-                  e ===
+          !!d.employee)
-                  `${d.job?.est_ct_fn || ""} ${d.job?.est_ct_ln || ""}`.trim()
+    );
-              )
+  }, [data, filter]);
-          : true;
-
-      return (
-        (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) &&
-        estFilter
-      );
-    });
-  }, [data, filter, estimatorsFilter]);
 
   return (
     <Row gutter={[16, 16]}>
@@ -95,37 +35,6 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
         <PageHeader
           extra={
             <Space wrap>
-              <ScheduleAtsSummary appointments={filteredData} />
-              <Select
-                style={{ minWidth: "15rem" }}
-                mode="multiple"
-                placeholder={t("schedule.labels.estimators")}
-                allowClear
-                onClear={() => setEstimatiorsFilter([])}
-                value={[...estimatorsFilter]}
-                onChange={(e) => {
-                  setEstimatiorsFilter(e);
-                }}
-                options={estimators.map((e) => ({
-                  label: e,
-                  value: e,
-                }))}
-              />
-              <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,7 +15,6 @@ 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";
@@ -29,7 +28,6 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
-  calculateScheduleLoad: (endDate) => dispatch(calculateScheduleLoad(endDate)),
 });
 
 export function ScheduleJobModalComponent({
@@ -38,7 +36,6 @@ export function ScheduleJobModalComponent({
   existingAppointments,
   lbrHrsData,
   jobId,
-  calculateScheduleLoad,
 }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
@@ -60,7 +57,6 @@ export function ScheduleJobModalComponent({
 
   const handleDateBlur = () => {
     const values = form.getFieldsValue();
-
     if (lbrHrsData) {
       const totalHours =
         lbrHrsData.jobs_by_pk.labhrs.aggregate.sum.mod_lb_hrs +
@@ -134,12 +130,7 @@ export function ScheduleJobModalComponent({
               className="imex-flex-row__margin"
               key={idx}
               onClick={() => {
-                const ssDate = moment(d);
+                form.setFieldsValue({ start: new moment(d).add(8, "hours") });
-                if (ssDate.isBefore(moment())) {
-                  form.setFieldsValue({ start: moment() });
-                } else {
-                  form.setFieldsValue({ start: moment(d).add(8, "hours") });
-                }
                 handleDateBlur();
               }}
             >
@@ -200,9 +191,6 @@ 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,7 +148,6 @@ export function ScheduleJobModalContainer({
             date_scheduled: new Date(),
             scheduled_in: values.start,
             scheduled_completion: values.scheduled_completion,
-            lost_sale_reason: null,
           },
         },
       });