Merge branch 'release/2023-03-21' into release/2023-03-24

.circleci/config.yml

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

.gitignore

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

.npmrc

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

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

@@ -7,7 +7,7 @@
     "@apollo/client": "^3.7.9",
     "@asseinfo/react-kanban": "^2.2.0",
     "@craco/craco": "^7.0.0",
-    "@fingerprintjs/fingerprintjs": "^3.4.2",
+    "@fingerprintjs/fingerprintjs": "^3.3.3",
     "@jsreport/browser-client": "^3.1.0",
     "@sentry/react": "^7.40.0",
     "@sentry/tracing": "^7.40.0",
@@ -46,12 +46,10 @@
     "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-icons": "^4.7.1",
-    "react-image-lightbox": "^5.1.4",
-    "react-intersection-observer": "^9.4.3",
     "react-number-format": "^5.1.3",
     "react-redux": "^8.0.5",
     "react-resizable": "^3.0.4",
@@ -89,8 +87,8 @@
     "analyze": "source-map-explorer 'build/static/js/*.js'",
     "start": "craco start",
     "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
-    "build:test": "env-cmd -f .env.test npm run build",
+    "build:test": "env-cmd -f .env.test yarn run build",
-    "build-deploy:test": "npm run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
+    "build-deploy:test": "yarn run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
     "buildcra": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
     "test": "cypress open",
     "eject": "react-scripts eject",

client/src/App/App.styles.scss

@@ -143,28 +143,13 @@
   }
 }
 
-//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 {
+.job-line-manual{
-  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

@@ -0,0 +1,49 @@
+import React from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { setEmailOptions } from "../../redux/email/email.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { TemplateList } from "../../utils/TemplateConstants";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  setEmailOptions: (e) => dispatch(setEmailOptions(e)),
+});
+
+function Test({ bodyshop, setEmailOptions }) {
+  return (
+    <div>
+      <button
+        onClick={() => {
+          setEmailOptions({
+            messageOptions: {
+              to: ["patrickwf@gmail.com"],
+              replyTo: bodyshop.email,
+            },
+            template: {
+              name: TemplateList().parts_order.key,
+              variables: {
+                id: "a7c2d4e1-f519-42a9-a071-c48cf0f22979",
+              },
+            },
+          });
+        }}
+      >
+        send email
+      </button>
+      <button
+        onClick={() => {
+          logImEXEvent("IMEXEVENT", { somethignArThare: 5 });
+        }}
+      >
+        Log an ImEX Event.
+      </button>
+    </div>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(Test);

client/src/components/_test/payment_response.json

@@ -1,63 +0,0 @@
-{
-  "status": 24201299,
-  "custid": 19607899,
-  "paymentid": 24201299,
-  "response": "A",
-  "authcode": "498680",
-  "declinereason": "Approved",
-  "fee": 0,
-  "invoice": "",
-  "account": "john",
-  "amount": 1000,
-  "amountincludesfee": false,
-  "total": 1000,
-  "paymenttype": "C",
-  "methodhint": "VI ***1111",
-  "cardbrand": "Visa",
-  "cardnumdisplay": "***1111",
-  "receiptelements": {
-    "authcode": "498680",
-    "cust_srv_ph_num": "1-555-555-5555",
-    "rcpt_pg_ftr_txt": "Thank You\nPlease Come Again",
-    "rcpt_currency": "USD",
-    "responsecode": "A",
-    "rcpt_pay_mthd": "Visa",
-    "transid": "C00 915799",
-    "merch_disp_nm": "CP Devel Test",
-    "rcpt_input_mthd": "Keyed",
-    "rcpt_pg_hdr_txt": "Welcome!",
-    "rcpt_tran_time": "Thursday February 23 2023, 11:25:36 pm +08",
-    "rcpt_trans_type": "Normal Transaction (Sale)",
-    "message": "Approved",
-    "rcpt_dba_addr": "1234 Storefront Ave\nSome City, UT 84111",
-    "avsdata": "N",
-    "receiptrequirements": "S",
-    "rcpt_cardnum": "************1111",
-    "cv2result": "M",
-    "rfnd_policy_txt": "<b>No Refunds</b>\nStore Credit Only",
-    "labels": {
-      "tranref": "REF#",
-      "tid": "TID",
-      "validationcode": "ValCode",
-      "emvapplicationid": "AID",
-      "emvatc": "ATC",
-      "rcpt_pay_mthd": "Pay Method",
-      "transid": "TransID",
-      "rcpt_input_mthd": "IMode",
-      "emvtsi": "TSI",
-      "emvac": "AC",
-      "rcpt_trans_type": "TranType",
-      "emvapplicationname": "PApp",
-      "visarewards": "RewardsProg"
-    }
-  },
-  "receipttoken": "H4sIAAAAAAAAACXMTQuCMBgA4P/ynh3tw_3dBI/ipQ8NOtRN53QiblpBRfTfCzo/8LwhxGAdZCCwFYoJJFQjI2kvHdGu74lVkgmrWyWNhASW5jW7cB87yHjKKePGJODnxrrnMl7dDTKmEJlSOqV/_N30XPpyj2Eddq57_KKZ8FLzmh_G1VQnVfhjiXGK1XYTc/h8AVOkf4qUAAAA",
-  "call": "card_payment",
-  "nonce": "488b5568-b5c1-4f38-8b2f-3b050f3abb11P",
-  "hmac": "JyPAJ9Yx0SlYBTtqns1OxAFRt+xF3l2UiLPO5zTDRBE=",
-  "paymentreferenceid": "C19607899P24201299",
-  "cardnum": "...1111",
-  "email": "",
-  "nameOnCard": "John Allen",
-  "cardType": "visa"
-}

client/src/components/_test/test.component.jsx

@@ -0,0 +1,9 @@
+import React from "react";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
+export default function Test() {
+  return (
+    <div>
+      <QboAuthorizeComponent />
+    </div>
+  );
+}

client/src/components/_test/test.page.jsx

@@ -1,31 +0,0 @@
-import { Button } from "antd";
-import React from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { setModalContext } from "../../redux/modals/modals.actions";
-
-const mapStateToProps = createStructuredSelector({});
-
-const mapDispatchToProps = (dispatch) => ({
-  setRefundPaymentContext: (context) =>
-    dispatch(setModalContext({ context: context, modal: "refund_payment" })),
-});
-
-function Test({ setRefundPaymentContext, refundPaymentModal }) {
-  console.log("refundPaymentModal", refundPaymentModal);
-  return (
-    <div>
-      <Button
-        onClick={() =>
-          setRefundPaymentContext({
-            context: {},
-          })
-        }
-      >
-        Open Modal
-      </Button>
-    </div>
-  );
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Test);

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

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,
@@ -50,7 +49,6 @@ export function BillFormComponent({
   job,
   loadOutstandingReturns,
   loadInventory,
-  preferredMake,
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
@@ -60,11 +58,6 @@ export function BillFormComponent({
     {},
     bodyshop.imexshopid
   );
-  const { ClosingPeriod } = useTreatments(
-    ["ClosingPeriod"],
-    {},
-    bodyshop.imexshopid
-  );
 
   const handleVendorSelect = (props, opt) => {
     setDiscount(opt.discount);
@@ -186,7 +179,6 @@ export function BillFormComponent({
           <VendorSearchSelect
             disabled={disabled}
             options={vendorAutoCompleteOptions}
-            preferredMake={preferredMake}
             onSelect={handleVendorSelect}
           />
         </Form.Item>
@@ -267,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/bill-form/bill-form.container.jsx

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

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/card-payment-modal/card-payment-modal.component..jsx

@@ -1,374 +0,0 @@
-import { DeleteFilled } from "@ant-design/icons";
-import { useLazyQuery, useMutation } from "@apollo/client";
-import {
-  Button,
-  Card,
-  Col,
-  Form,
-  Input,
-  Row,
-  Space,
-  Spin,
-  Statistic,
-  notification,
-} from "antd";
-import axios from "axios";
-import moment from "moment";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import {
-  INSERT_PAYMENT_RESPONSE,
-  QUERY_RO_AND_OWNER_BY_JOB_PKS,
-} from "../../graphql/payment_response.queries";
-import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import { toggleModalVisible } from "../../redux/modals/modals.actions";
-import { selectCardPayment } from "../../redux/modals/modals.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
-import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
-
-const mapStateToProps = createStructuredSelector({
-  cardPaymentModal: selectCardPayment,
-  bodyshop: selectBodyshop,
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
-  toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
-});
-
-const CardPaymentModalComponent = ({
-  bodyshop,
-  cardPaymentModal,
-  toggleModalVisible,
-  insertAuditTrail,
-}) => {
-  const { context } = cardPaymentModal;
-
-  const [form] = Form.useForm();
-
-  const [loading, setLoading] = useState(false);
-  const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
-  const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
-  const { t } = useTranslation();
-
-  const [, { data, refetch, queryLoading }] = useLazyQuery(
-    QUERY_RO_AND_OWNER_BY_JOB_PKS,
-    {
-      variables: { jobids: [context.jobid] },
-      skip: true,
-    }
-  );
-
-  console.log("🚀 ~ file: card-payment-modal.component..jsx:61 ~ data:", data);
-  //Initialize the intellipay window.
-  const SetIntellipayCallbackFunctions = () => {
-    console.log("*** Set IntelliPay callback functions.");
-    window.intellipay.runOnClose(() => {
-      //window.intellipay.initialize();
-    });
-
-    window.intellipay.runOnApproval(async function (response) {
-      console.warn("*** Running On Approval Script ***");
-      form.setFieldValue("paymentResponse", response);
-      form.submit();
-    });
-
-    window.intellipay.runOnNonApproval(async function (response) {
-      // Mutate unsuccessful payment
-
-      const { payments } = form.getFieldsValue();
-
-      await insertPaymentResponse({
-        variables: {
-          paymentResponse: payments.map((payment) => ({
-            amount: payment.amount,
-            bodyshopid: bodyshop.id,
-            jobid: payment.jobid,
-            declinereason: response.declinereason,
-            ext_paymentid: response.paymentid.toString(),
-            successful: false,
-            response,
-          })),
-        },
-      });
-
-      payments.forEach((payment) =>
-        insertAuditTrail({
-          jobid: payment.jobid,
-          operation: AuditTrailMapping.failedpayment(),
-        })
-      );
-    });
-  };
-
-  const handleFinish = async (values) => {
-    try {
-      await insertPayment({
-        variables: {
-          paymentInput: values.payments.map((payment) => ({
-            amount: payment.amount,
-            transactionid: (values.paymentResponse.paymentid || "").toString(),
-            payer: t("payments.labels.customer"),
-            type: values.paymentResponse.cardbrand,
-            jobid: payment.jobid,
-            date: moment(Date.now()),
-            payment_responses: {
-              data: [
-                {
-                  amount: payment.amount,
-                  bodyshopid: bodyshop.id,
-
-                  jobid: payment.jobid,
-                  declinereason: values.paymentResponse.declinereason,
-                  ext_paymentid: values.paymentResponse.paymentid.toString(),
-                  successful: true,
-                  response: values.paymentResponse,
-                },
-              ],
-            },
-          })),
-        },
-        refetchQueries: ["GET_JOB_BY_PK"],
-      });
-      toggleModalVisible();
-    } catch (error) {
-      console.error(error);
-      notification.open({
-        type: "error",
-        message: t("payments.errors.inserting", { error: error.message }),
-      });
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const handleIntelliPayCharge = async () => {
-    setLoading(true);
-
-    //Validate
-    try {
-      await form.validateFields();
-    } catch (error) {
-      setLoading(false);
-      return;
-    }
-
-    try {
-      const response = await axios.post("/intellipay/lightbox_credentials", {
-        bodyshop,
-        refresh: !!window.intellipay,
-      });
-
-      if (window.intellipay) {
-        // eslint-disable-next-line no-eval
-        eval(response.data);
-        SetIntellipayCallbackFunctions();
-        window.intellipay.autoOpen();
-      } else {
-        var rg = document.createRange();
-        let node = rg.createContextualFragment(response.data);
-        document.documentElement.appendChild(node);
-        SetIntellipayCallbackFunctions();
-        window.intellipay.isAutoOpen = true;
-        window.intellipay.initialize();
-      }
-    } catch (error) {
-      notification.open({
-        type: "error",
-        message: t("job_payments.notifications.error.openingip"),
-      });
-      setLoading(false);
-    }
-  };
-
-  return (
-    <Card title="Card Payment">
-      <Spin spinning={loading}>
-        <Form
-          onFinish={handleFinish}
-          form={form}
-          layout="vertical"
-          initialValues={{
-            payments: context.jobid ? [{ jobid: context.jobid }] : [],
-          }}
-        >
-          <Form.List name={["payments"]}>
-            {(fields, { add, remove, move }) => {
-              return (
-                <div>
-                  {fields.map((field, index) => (
-                    <Form.Item key={field.key}>
-                      <Row gutter={[16, 16]}>
-                        <Col span={16}>
-                          <Form.Item
-                            key={`${index}jobid`}
-                            label={t("jobs.fields.ro_number")}
-                            name={[field.name, "jobid"]}
-                            rules={[
-                              {
-                                required: true,
-                                //message: t("general.validation.required"),
-                              },
-                            ]}
-                          >
-                            <JobSearchSelectComponent
-                              notExported={false}
-                              clm_no
-                            />
-                          </Form.Item>
-                        </Col>
-                        <Col span={6}>
-                          <Form.Item
-                            key={`${index}amount`}
-                            label={t("payments.fields.amount")}
-                            name={[field.name, "amount"]}
-                            rules={[
-                              {
-                                required: true,
-                                //message: t("general.validation.required"),
-                              },
-                            ]}
-                          >
-                            <CurrencyFormItemComponent />
-                          </Form.Item>
-                        </Col>
-                        <Col span={2}>
-                          <DeleteFilled
-                            style={{ margin: "1rem" }}
-                            onClick={() => {
-                              remove(field.name);
-                            }}
-                          />
-                        </Col>
-                      </Row>
-                    </Form.Item>
-                  ))}
-                  <Form.Item>
-                    <Button
-                      type="dashed"
-                      onClick={() => {
-                        add();
-                      }}
-                      style={{ width: "100%" }}
-                    >
-                      {t("general.actions.add")}
-                    </Button>
-                  </Form.Item>
-                </div>
-              );
-            }}
-          </Form.List>
-
-          <Form.Item
-            shouldUpdate={(prevValues, curValues) =>
-              prevValues.payments?.map((p) => p?.jobid).join() !==
-              curValues.payments?.map((p) => p?.jobid).join()
-            }
-          >
-            {() => {
-              console.log("Updating the owner info section.");
-              //If all of the job ids have been fileld in, then query and update the IP field.
-              const { payments } = form.getFieldsValue();
-              if (
-                payments?.length > 0 &&
-                payments?.filter((p) => p?.jobid).length === payments?.length
-              ) {
-                console.log("**Calling refetch.");
-                refetch({ jobids: payments.map((p) => p.jobid) });
-              }
-              console.log(
-                "Acc info",
-                data,
-                payments && data && data.jobs.length > 0
-                  ? data.jobs.map((j) => j.ro_number).join(", ")
-                  : null
-              );
-              return (
-                <>
-                  <Input
-                    className="ipayfield"
-                    data-ipayname="account"
-                    //type="hidden"
-                    value={
-                      payments && data && data.jobs.length > 0
-                        ? data.jobs.map((j) => j.ro_number).join(", ")
-                        : null
-                    }
-                    hidden
-                  />
-                  <Input
-                    className="ipayfield"
-                    data-ipayname="email"
-                    // type="hidden"
-                    value={
-                      payments && data && data.jobs.length > 0
-                        ? data.jobs.filter((j) => j.ownr_ea)[0]?.ownr_ea
-                        : null
-                    }
-                    hidden
-                  />
-                </>
-              );
-            }}
-          </Form.Item>
-          <Form.Item
-            shouldUpdate={(prevValues, curValues) =>
-              prevValues.payments?.map((p) => p?.amount).join() !==
-              curValues.payments?.map((p) => p?.amount).join()
-            }
-          >
-            {() => {
-              const { payments } = form.getFieldsValue();
-              const totalAmountToCharge = payments?.reduce((acc, val) => {
-                return acc + (val?.amount || 0);
-              }, 0);
-
-              return (
-                <Space style={{ float: "right" }}>
-                  <Statistic
-                    title="Amount To Charge"
-                    value={totalAmountToCharge}
-                    precision={2}
-                  />
-                  <Input
-                    className="ipayfield"
-                    data-ipayname="amount"
-                    //type="hidden"
-                    value={totalAmountToCharge?.toFixed(2)}
-                    hidden
-                  />
-                  <Button
-                    type="primary"
-                    //  data-ipayname="submit"
-                    className="ipayfield"
-                    loading={queryLoading || loading}
-                    disabled={!(totalAmountToCharge > 0)}
-                    onClick={handleIntelliPayCharge}
-                  >
-                    {t("job_payments.buttons.proceedtopayment")}
-                  </Button>
-                </Space>
-              );
-            }}
-          </Form.Item>
-
-          {/* Lightbox payment response when it is completed */}
-          <Form.Item name="paymentResponse" hidden>
-            <Input type="hidden" />
-          </Form.Item>
-        </Form>
-      </Spin>
-    </Card>
-  );
-};
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(CardPaymentModalComponent);

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

@@ -1,57 +0,0 @@
-import { Button, Modal } from "antd";
-import React from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { toggleModalVisible } from "../../redux/modals/modals.actions";
-import { selectCardPayment } from "../../redux/modals/modals.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import CardPaymentModalComponent from "./card-payment-modal.component.";
-
-const mapStateToProps = createStructuredSelector({
-  cardPaymentModal: selectCardPayment,
-  bodyshop: selectBodyshop,
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
-});
-
-function CardPaymentModalContainer({
-  cardPaymentModal,
-  toggleModalVisible,
-  bodyshop,
-}) {
-  const { visible } = cardPaymentModal;
-  const { t } = useTranslation();
-
-  const handleCancel = () => {
-    toggleModalVisible();
-  };
-
-  const handleOK = () => {
-    toggleModalVisible();
-  };
-
-  return (
-    <Modal
-      open={visible}
-      onOk={handleOK}
-      onCancel={handleCancel}
-      footer={[
-        <Button key="back" onClick={handleCancel}>
-          {t("job_payments.buttons.goback")}
-        </Button>,
-      ]}
-      width="80%"
-      destroyOnClose
-    >
-      <CardPaymentModalComponent />
-    </Modal>
-  );
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(CardPaymentModalContainer);

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-open-button/chat-open-button.component.jsx

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

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

@@ -4,9 +4,9 @@ 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";
@@ -47,13 +47,12 @@ export function ChatPopupComponent({
     ...(pollInterval > 0 ? { pollInterval } : {}),
   });
 
-  const [getConversations, { loading, data, refetch, fetchMore }] =
+  const { loading, data, refetch, called } = useQuery(CONVERSATION_LIST_QUERY, {
-    useLazyQuery(CONVERSATION_LIST_QUERY, {
+    fetchPolicy: "network-only",
-      fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
-      nextFetchPolicy: "network-only",
+    skip: !chatVisible,
-      skip: !chatVisible,
+    ...(pollInterval > 0 ? { pollInterval } : {}),
-      ...(pollInterval > 0 ? { pollInterval } : {}),
+  });
-    });
 
   const fcmToken = sessionStorage.getItem("fcmtoken");
 
@@ -66,22 +65,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;
 
@@ -118,7 +110,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-jobs/contract-jobs.container.jsx

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

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

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

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

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

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

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

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

@@ -1,244 +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) => {
-    if (item.job) {
-      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 moment(a.start) - new moment(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

@@ -18,7 +18,7 @@ export default function DataLabel({
     <div {...props} style={{ display: "flex" }}>
       <div
         style={{
-         // flex: 2,
+          flex: 2,
           marginRight: ".2rem",
         }}
       >

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,20 +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>
-              <Form.Item
-                name="dms_model_override"
-                label={t("jobs.fields.dms.dms_model_override")}
-                initialValue={false}
-              >
-                <Switch />
-              </Form.Item>
             </Space>
           </div>
         )}

client/src/components/email-overlay/email-overlay.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/email-overlay/email-overlay.container.jsx

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

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

@@ -1,217 +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>
-                      <span>{`${job.plate_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

@@ -8,7 +8,7 @@ import { GLOBAL_SEARCH_QUERY } from "../../graphql/search.queries";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import AlertComponent from "../alert/alert.component";
 import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
+  OwnerNameDisplayFunction
 } from "../owner-name-display/owner-name-display.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 export default function GlobalSearch() {
@@ -18,18 +18,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 +37,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" />}>

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

@@ -1,9 +1,10 @@
+import { useTreatments } from "@splitsoftware/splitio-react";
 import Icon, {
   BankFilled,
   BarChartOutlined,
   CarFilled,
-  CheckCircleOutlined,
   ClockCircleFilled,
+  CheckCircleOutlined,
   DashboardFilled,
   DollarCircleFilled,
   ExportOutlined,
@@ -25,7 +26,6 @@ import Icon, {
   UnorderedListOutlined,
   UserOutlined,
 } from "@ant-design/icons";
-import { useTreatments } from "@splitsoftware/splitio-react";
 import { Layout, Menu } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -70,8 +70,6 @@ const mapDispatchToProps = (dispatch) => ({
   setReportCenterContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "reportCenter" })),
   signOutStart: () => dispatch(signOutStart()),
-  setCardPaymentContext: (context) =>
-    dispatch(setModalContext({ context: context, modal: "cardPayment" })),
 });
 
 function Header({
@@ -85,7 +83,6 @@ function Header({
   setPaymentContext,
   setReportCenterContext,
   recentItems,
-  setCardPaymentContext,
 }) {
   const { Simple_Inventory } = useTreatments(
     ["Simple_Inventory"],
@@ -97,11 +94,6 @@ function Header({
     {},
     bodyshop && bodyshop.imexshopid
   );
-  const { ImEXPay } = useTreatments(
-    ["ImEXPay"],
-    {},
-    bodyshop && bodyshop.imexshopid
-  );
 
   const { t } = useTranslation();
 
@@ -248,20 +240,6 @@ function Header({
           >
             {t("menus.header.enterpayment")}
           </Menu.Item>
-          {ImEXPay.treatment === "on" && (
-            <Menu.Item
-              key="entercardpayments"
-              onClick={() => {
-                setCardPaymentContext({
-                  actions: {},
-                  context: {},
-                });
-              }}
-              icon={<Icon component={FaCreditCard} />}
-            >
-              {t("menus.header.entercardpayment")}
-            </Menu.Item>
-          )}
           <Menu.Divider key="div5" />
           <Menu.Item key="timetickets" icon={<FieldTimeOutlined />}>
             <Link to="/manage/timetickets">
@@ -274,11 +252,7 @@ function Header({
             onClick={() => {
               setTimeTicketContext({
                 actions: {},
-                context: {
+                context: {},
-                  created_by: currentUser.displayName
-                    ? currentUser.email.concat(" | ", currentUser.displayName)
-                    : currentUser.email,
-                },
               });
             }}
           >
@@ -337,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-3rd-party-modal/job-3rd-party-modal.component.jsx

@@ -5,7 +5,6 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { SEARCH_VENDOR_AUTOCOMPLETE_WITH_ADDR } from "../../graphql/vendors.queries";
-import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
@@ -14,14 +13,13 @@ import VendorSearchSelect from "../vendor-search-select/vendor-search-select.com
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
-  technician: selectTechnician,
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(Jobd3RdPartyModal);
 
-export function Jobd3RdPartyModal({ bodyshop, jobId, job, technician }) {
+export function Jobd3RdPartyModal({ bodyshop, jobId, job }) {
   const [isModalVisible, setIsModalVisible] = useState(false);
   const { t } = useTranslation();
   const [form] = Form.useForm();
@@ -214,9 +212,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId, job, technician }) {
             ]}
           >
             <Radio.Group>
-              {!technician ? (
+              <Radio value={"e"}>{t("parts_orders.labels.email")}</Radio>
-                <Radio value={"e"}>{t("parts_orders.labels.email")}</Radio>
-              ) : null}
               <Radio value={"p"}>{t("parts_orders.labels.print")}</Radio>
             </Radio.Group>
           </Form.Item>

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

@@ -4,7 +4,6 @@ import {
   Divider,
   Dropdown,
   Form,
-  Input,
   Menu,
   notification,
   Popover,
@@ -30,13 +29,11 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
-import { useMutation } from "@apollo/client";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -61,44 +58,16 @@ export function ScheduleEventComponent({
   const [visible, setVisible] = useState(false);
   const history = useHistory();
   const searchParams = queryString.parse(useLocation().search);
-  const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
-  const [title, setTitle] = useState(event.title);
-  const blockContent = (
-    <Space direction="vertical" wrap>
-      <Input
-        value={title}
-        onChange={(e) => setTitle(e.currentTarget.value)}
-        onBlur={async () => {
-          await updateAppointment({
-            variables: {
-              appid: event.id,
-              app: {
-                title: title,
-              },
-            },
-            optimisticResponse: {
-              update_appointments: {
-                __typename: "appointments_mutation_response",
-                returning: [
-                  {
-                    ...event,
-                    title: title,
-                    __typename: "appointments",
-                  },
-                ],
-              },
-            },
-          });
-        }}
-      />
 
+  const blockContent = (
+    <div>
       <Button
         onClick={() => handleCancel({ id: event.id })}
         disabled={event.arrived}
       >
-        {t("appointments.actions.unblock")}
+        {t("appointments.actions.cancel")}
       </Button>
-    </Space>
+    </div>
   );
 
   const popoverContent = (
@@ -239,56 +208,46 @@ export function ScheduleEventComponent({
             <Button>{t("appointments.actions.sendreminder")}</Button>
           </Dropdown>
         ) : null}
-        {event.arrived ? (
+        <Popover
+          trigger="click"
+          disabled={event.arrived}
+          content={
+            <Form
+              layout="vertical"
+              onFinish={({ lost_sale_reason }) => {
+                handleCancel({ id: event.id, lost_sale_reason });
+              }}
+            >
+              <Form.Item
+                name="lost_sale_reason"
+                label={t("jobs.fields.lost_sale_reason")}
+                rules={[
+                  {
+                    required: true,
+                    //message: t("general.validation.required"),
+                  },
+                ]}
+              >
+                <Select
+                  options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
+                    label: lsr,
+                    value: lsr,
+                  }))}
+                />
+              </Form.Item>
+              <Button htmlType="submit">
+                {t("appointments.actions.cancel")}
+              </Button>
+            </Form>
+          }
+        >
           <Button
             // onClick={() => handleCancel(event.id)}
             disabled={event.arrived}
           >
             {t("appointments.actions.cancel")}
           </Button>
-        ) : (
+        </Popover>
-          <Popover
-            trigger="click"
-            disabled={event.arrived}
-            content={
-              <Form
-                layout="vertical"
-                onFinish={({ lost_sale_reason }) => {
-                  handleCancel({ id: event.id, lost_sale_reason });
-                }}
-              >
-                <Form.Item
-                  name="lost_sale_reason"
-                  label={t("jobs.fields.lost_sale_reason")}
-                  rules={[
-                    {
-                      required: true,
-                      //message: t("general.validation.required"),
-                    },
-                  ]}
-                >
-                  <Select
-                    options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
-                      label: lsr,
-                      value: lsr,
-                    }))}
-                  />
-                </Form.Item>
-                <Button htmlType="submit">
-                  {t("appointments.actions.cancel")}
-                </Button>
-              </Form>
-            }
-          >
-            <Button
-              // onClick={() => handleCancel(event.id)}
-              disabled={event.arrived}
-            >
-              {t("appointments.actions.cancel")}
-            </Button>
-          </Popover>
-        )}
-
         {event.isintake ? (
           <Button
             disabled={event.arrived}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,26 +1,19 @@
-import { EditFilled } from "@ant-design/icons";
 import { Button, Card, Space, Table } from "antd";
+import { EditFilled } from "@ant-design/icons";
 import Dinero from "dinero.js";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import {
-  openChatByPhone,
-  setMessage,
-} from "../../redux/messaging/messaging.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
-import { TemplateList } from "../../utils/TemplateConstants";
 import { alphaSort, dateSort } from "../../utils/sorters";
+import { TemplateList } from "../../utils/TemplateConstants";
 import DataLabel from "../data-label/data-label.component";
-import PaymentExpandedRowComponent from "../payment-expanded-row/payment-expanded-row.component";
-import PaymentsGenerateLink from "../payments-generate-link/payments-generate-link.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
-import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -30,34 +23,20 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPaymentContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "payment" })),
-  setCardPaymentContext: (context) =>
-    dispatch(setModalContext({ context: context, modal: "cardPayment" })),
-  openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
-  setMessage: (text) => dispatch(setMessage(text)),
 });
 
 export function JobPayments({
   job,
   jobRO,
   bodyshop,
-  setMessage,
-  openChatByPhone,
   setPaymentContext,
-  setCardPaymentContext,
   refetch,
 }) {
-  const { ImEXPay } = useTreatments(
-    ["ImEXPay"],
-    {},
-    bodyshop && bodyshop.imexshopid
-  );
-
   const { t } = useTranslation();
   const [state, setState] = useState({
     sortedInfo: {},
     filteredInfo: {},
   });
-
   const columns = [
     {
       title: t("payments.fields.date"),
@@ -120,7 +99,7 @@ export function JobPayments({
       render: (text, record) => (
         <Space wrap>
           <Button
-            // disabled={record.exportedat}
+            disabled={record.exportedat}
             onClick={() => {
               setPaymentContext({
                 actions: { refetch: refetch },
@@ -170,21 +149,6 @@ export function JobPayments({
       title={t("payments.labels.title")}
       extra={
         <Space wrap>
-          {ImEXPay.treatment === "on" && (
-            <>
-              <Button
-                onClick={() =>
-                  setCardPaymentContext({
-                    actions: { refetch },
-                    context: { jobid: job.id, balance },
-                  })
-                }
-              >
-                {t("menus.header.entercardpayment")}
-              </Button>
-              <PaymentsGenerateLink job={job} />
-            </>
-          )}
           <Button
             disabled={!job.converted}
             onClick={() =>
@@ -196,7 +160,6 @@ export function JobPayments({
           >
             {t("menus.header.enterpayment")}
           </Button>
-
           <DataLabel
             valueStyle={{ color: balance.getAmount() !== 0 ? "red" : "green" }}
             label={t("payments.labels.balance")}
@@ -215,11 +178,6 @@ export function JobPayments({
         scroll={{
           x: true,
         }}
-        expandable={{
-          expandedRowRender: (record) => (
-            <PaymentExpandedRowComponent record={record} bodyshop={bodyshop} />
-          ),
-        }}
         summary={() => (
           <>
             <Table.Summary.Row>

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

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

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

@@ -1,19 +1,18 @@
+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";
 import { insertAuditTrail } from "../../redux/application/application.actions";
-import { DateTimeFormat } from "./../../utils/DateFormatter";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -39,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(
@@ -54,7 +53,7 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
         operation: AuditTrailMapping.admin_jobfieldchange(
           key,
           changedAuditFields[key] instanceof moment
-            ? DateTimeFormat(changedAuditFields[key])
+            ? moment(changedAuditFields[key]).format("MM/DD/YYYY hh:mm a")
             : changedAuditFields[key]
         ),
       });
@@ -127,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
@@ -177,15 +173,6 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
           >
             <DateTimePicker />
           </Form.Item>
-          <Form.Item label={t("jobs.fields.date_void")} name="date_void">
-            <DateTimePicker />
-          </Form.Item>
-          <Form.Item
-            label={t("jobs.fields.date_lost_sale")}
-            name="date_lost_sale"
-          >
-            <DateTimePicker />
-          </Form.Item>
         </LayoutFormRow>
       </Form>
 

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

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

@@ -4,35 +4,22 @@ import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useHistory } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { auth, logImEXEvent } from "../../firebase/firebase.utils";
+import { auth } from "../../firebase/firebase.utils";
-import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import client from "../../utils/GraphQLClient";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import { useHistory } from "react-router-dom";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
 
-function updateJobCache(items) {
-  client.cache.modify({
-    id: "ROOT_QUERY",
-    fields: {
-      jobs(existingJobs = []) {
-        return existingJobs.filter(
-          (jobRef) => jobRef.__ref.includes(items) === false
-        );
-      },
-    },
-  });
-}
-
 export function JobsCloseExportButton({
   bodyshop,
   currentUser,
@@ -114,9 +101,6 @@ export function JobsCloseExportButton({
 
     //Check to see if any of them failed. If they didn't don't execute the update.
     const failedTransactions = PartnerResponse.data.filter((r) => !r.success);
-    const successfulTransactions = PartnerResponse.data.filter(
-      (r) => r.success
-    );
     if (failedTransactions.length > 0) {
       //Uh oh. At least one was no good.
       failedTransactions.forEach((ft) => {
@@ -175,15 +159,12 @@ export function JobsCloseExportButton({
           },
         });
 
-        if (!!!jobUpdateResponse.errors) {
+        if (!jobUpdateResponse.errors) {
           notification.open({
             type: "success",
             key: "jobsuccessexport",
             message: t("jobs.successes.exported"),
           });
-          updateJobCache(
-            jobUpdateResponse.data.update_jobs.returning.map((job) => job.id)
-          );
         } else {
           notification["error"]({
             message: t("jobs.errors.exporting", {
@@ -192,31 +173,13 @@ export function JobsCloseExportButton({
           });
         }
       }
-      if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
-        notification.open({
-          type: "success",
-          key: "jobsuccessexport",
-          message: t("jobs.successes.exported"),
-        });
-        updateJobCache([
-          ...new Set(
-            successfulTransactions.map(
-              (st) =>
-                st[
-                  bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
-                    ? "jobid"
-                    : "id"
-                ]
-            )
-          ),
-        ]);
-      }
       if (setSelectedJobs) {
         setSelectedJobs((selectedJobs) => {
           return selectedJobs.filter((i) => i !== jobId);
         });
       }
     }
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
     setLoading(false);
   };
 

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

@@ -108,9 +108,9 @@ export function JobsConvertButton({
             },
           ]}
         >
-          <Select showSearch>
+          <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>
             ))}
@@ -219,15 +219,13 @@ export function JobsConvertButton({
             </Select>
           </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.driveable")}
           name="driveable"

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-detail-dates/jobs-detail-dates.component.jsx

@@ -141,17 +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>
-
-        <Form.Item
-          label={t("jobs.fields.date_lost_sale")}
-          name="date_lost_sale"
-        >
-          <DateTimePicker disabled={true || jobRO} />
-        </Form.Item>
       </FormRow>
     </div>
   );

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

@@ -5,10 +5,10 @@ import {
   Dropdown,
   Form,
   Menu,
+  notification,
   Popconfirm,
   Popover,
   Select,
-  notification,
 } from "antd";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
@@ -18,15 +18,12 @@ import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENTS_BY_JOB_ID } from "../../graphql/appointments.queries";
 import { DELETE_JOB, UPDATE_JOB, VOID_JOB } from "../../graphql/jobs.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import JobsDetailHeaderActionsAddevent from "./jobs-detail-header-actions.addevent";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import JobsDetaiLheaderCsi from "./jobs-detail-header-actions.csi.component";
@@ -50,10 +47,6 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setModalContext({ context: context, modal: "jobCosting" })),
   setTimeTicketContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "timeTicket" })),
-  setCardPaymentContext: (context) =>
-    dispatch(setModalContext({ context: context, modal: "cardPayment" })),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function JobsDetailHeaderActions({
@@ -67,8 +60,6 @@ export function JobsDetailHeaderActions({
   setJobCostingContext,
   jobRO,
   setTimeTicketContext,
-  setCardPaymentContext,
-  insertAuditTrail,
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
@@ -145,73 +136,63 @@ export function JobsDetailHeaderActions({
       <Menu.Item
         disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
       >
-        {job.status !== bodyshop.md_ro_statuses.default_scheduled ? (
+        <Popover
-          t("menus.jobsactions.cancelallappointments")
+          trigger="click"
-        ) : (
+          disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
-          <Popover
+          content={
-            trigger="click"
+            <Form
-            disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
+              layout="vertical"
-            content={
+              onFinish={async ({ lost_sale_reason }) => {
-              <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,
+                      lost_sale_reason,
-                        scheduled_in: null,
+                      status: bodyshop.md_ro_statuses.default_imported,
-                        scheduled_completion: null,
-                        lost_sale_reason,
-                        date_lost_sale: new Date(),
-                        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"),
+              }}
-                    });
+            >
-                    insertAuditTrail({
+              <Form.Item
-                      jobid: job.id,
+                name="lost_sale_reason"
-                      operation:
+                label={t("jobs.fields.lost_sale_reason")}
-                        AuditTrailMapping.appointmentcancel(lost_sale_reason),
+                rules={[
-                    });
+                  {
-                    return;
+                    required: true,
-                  }
+                    //message: t("general.validation.required"),
-                }}
+                  },
+                ]}
               >
-                <Form.Item
+                <Select
-                  name="lost_sale_reason"
+                  options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
-                  label={t("jobs.fields.lost_sale_reason")}
+                    label: lsr,
-                  rules={[
+                    value: lsr,
-                    {
+                  }))}
-                      required: true,
+                />
-                      //message: t("general.validation.required"),
+              </Form.Item>
-                    },
+              <Button
-                  ]}
+                htmlType="submit"
-                >
+                disabled={
-                  <Select
+                  job.status !== bodyshop.md_ro_statuses.default_scheduled
-                    options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
+                }
-                      label: lsr,
+              >
-                      value: lsr,
+                {t("appointments.actions.cancel")}
-                    }))}
+              </Button>
-                  />
+            </Form>
-                </Form.Item>
+          }
-                <Button
+        >
-                  htmlType="submit"
+          {t("menus.jobsactions.cancelallappointments")}
-                  disabled={
+        </Popover>
-                    job.status !== bodyshop.md_ro_statuses.default_scheduled
-                  }
-                >
-                  {t("appointments.actions.cancel")}
-                </Button>
-              </Form>
-            }
-          >
-            {t("menus.jobsactions.cancelallappointments")}
-          </Popover>
-        )}
       </Menu.Item>
       <Menu.Item
         disabled={
@@ -257,12 +238,7 @@ export function JobsDetailHeaderActions({
 
           setTimeTicketContext({
             actions: {},
-            context: {
+            context: { jobId: job.id },
-              jobId: job.id,
-              created_by: currentUser.displayName
-                ? currentUser.email.concat(" | ", currentUser.displayName)
-                : currentUser.email,
-            },
           });
         }}
       >
@@ -282,18 +258,6 @@ export function JobsDetailHeaderActions({
       >
         {t("menus.header.enterpayment")}
       </Menu.Item>
-      <Menu.Item
-        key="entercardpayments"
-        disabled={!job.converted}
-        onClick={() => {
-          setCardPaymentContext({
-            actions: {},
-            context: { jobid: job.id },
-          });
-        }}
-      >
-        {t("menus.header.entercardpayment")}
-      </Menu.Item>
       <Menu.Item key="cccontract" disabled={jobRO || !job.converted}>
         <Link
           to={{
@@ -497,57 +461,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-actions/jobs-detail-header-actions.duplicate.util.js

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

client/src/components/jobs-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-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,5 +1,5 @@
 import React, { useEffect } from "react";
-import { Gallery } from "react-grid-gallery";
+import Gallery from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
 import { GenerateSrcUrl, GenerateThumbUrl } from "./job-documents.utility";
 
@@ -15,8 +15,8 @@ function JobsDocumentGalleryExternal({
     let documents = data.reduce((acc, value) => {
       if (value.type.startsWith("image")) {
         acc.push({
-          fullsize: 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, fullsize: val.src });
+              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

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

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

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

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

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

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,
 

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

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

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

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

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-jobs/owner-detail-jobs.component.jsx

@@ -6,7 +6,6 @@ import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort, statusSort } from "../../utils/sorters";
 import OwnerDetailUpdateJobsComponent from "../owner-detail-update-jobs/owner-detail-update-jobs.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -16,15 +15,6 @@ const mapStateToProps = createStructuredSelector({
 function OwnerDetailJobsComponent({ bodyshop, owner }) {
   const { t } = useTranslation();
   const [selectedJobs, setSelectedJobs] = useState([]);
-  const [state, setState] = useState({
-    sortedInfo: {},
-    filteredInfo: { text: "" },
-  });
-
-  const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
-  };
-  
   const columns = [
     {
       title: t("jobs.fields.ro_number"),
@@ -36,9 +26,6 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
           {record.ro_number || t("general.labels.na")}
         </Link>
       ),
-      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
-      sortOrder:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
     },
     {
       title: t("jobs.fields.vehicle"),
@@ -59,17 +46,11 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       title: t("jobs.fields.clm_no"),
       dataIndex: "clm_no",
       key: "clm_no",
-      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
-      sortOrder:
-        state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
     },
     {
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-      sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
-      sortOrder:
-        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
     },
 
     {
@@ -79,9 +60,6 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       render: (text, record) => (
         <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
       ),
-      sorter: (a, b) => a.clm_total - b.clm_total,
-      sortOrder:
-        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
     },
   ];
 
@@ -102,7 +80,6 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
         scroll={{ x: true }}
         rowKey="id"
         dataSource={owner.jobs}
-        onChange={handleTableChange}
         rowSelection={{
           onSelect: (record, selected, selectedRows) => {
             setSelectedJobs(selectedRows ? selectedRows.map((i) => i.id) : []);

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

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

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

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

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

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

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

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

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

@@ -113,8 +113,6 @@ export function PartsOrderListTableComponent({
                   id: pol.id,
                   line_desc: pol.line_desc,
                   quantity: pol.quantity,
-                  act_price: pol.act_price,
-                  oem_partno: pol.oem_partno,
                 };
               }),
             },
@@ -203,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}
       />
@@ -299,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/parts-receive-modal/parts-receive-modal.component.jsx

@@ -79,20 +79,6 @@ export function PartsReceiveModalComponent({ bodyshop, form }) {
                       >
                         <Input />
                       </Form.Item>
-                      <Form.Item
-                        label={t("joblines.fields.oem_partno")}
-                        key={`${index}oem_partno`}
-                        name={[field.name, "oem_partno"]}
-                      >
-                        <Input disabled />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("joblines.fields.act_price")}
-                        key={`${index}act_price`}
-                        name={[field.name, "act_price"]}
-                      >
-                        <Input disabled />
-                      </Form.Item>
                       <Form.Item
                         label={t("joblines.fields.location")}
                         key={`${index}location`}

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

@@ -1,39 +1,26 @@
 import { useMutation } from "@apollo/client";
 import { Button, notification } from "antd";
 import axios from "axios";
-import _ from "lodash";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { auth, logImEXEvent } from "../../firebase/firebase.utils";
+import { auth } from "../../firebase/firebase.utils";
-import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_BILLS } from "../../graphql/bills.queries";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import client from "../../utils/GraphQLClient";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import _ from "lodash";
+import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import { Link } from "react-router-dom";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
 
-function updateBillCache(items) {
-  client.cache.modify({
-    id: "ROOT_QUERY",
-    fields: {
-      bills(existingJobs = []) {
-        return existingJobs.filter(
-          (billRef) => billRef.__ref.includes(items) === false
-        );
-      },
-    },
-  });
-}
-
 export function PayableExportAll({
   bodyshop,
   currentUser,
@@ -110,9 +97,7 @@ export function PayableExportAll({
       proms.push(
         (async () => {
           const failedTransactions = groupedData[key].filter((r) => !r.success);
-          const successfulTransactions = groupedData[key].filter(
+
-            (r) => r.success
-          );
           if (failedTransactions.length > 0) {
             //Uh oh. At least one was no good.
             failedTransactions.map((ft) =>
@@ -158,15 +143,7 @@ export function PayableExportAll({
 
               const billUpdateResponse = await updateBill({
                 variables: {
-                  billIdList: successfulTransactions.map(
+                  billIdList: [key],
-                    (st) =>
-                      st[
-                        bodyshop.accountingconfig &&
-                        bodyshop.accountingconfig.qbo
-                          ? "billid"
-                          : "id"
-                      ]
-                  ),
                   bill: {
                     exported: true,
                     exported_at: new Date(),
@@ -179,11 +156,6 @@ export function PayableExportAll({
                   key: "billsuccessexport",
                   message: t("bills.successes.exported"),
                 });
-                updateBillCache(
-                  billUpdateResponse.data.update_bills.returning.map(
-                    (bill) => bill.id
-                  )
-                );
               } else {
                 notification["error"]({
                   message: t("bills.errors.exporting", {
@@ -192,26 +164,6 @@ export function PayableExportAll({
                 });
               }
             }
-            if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
-              notification.open({
-                type: "success",
-                key: "billsuccessexport",
-                message: t("bills.successes.exported"),
-              });
-              updateBillCache([
-                ...new Set(
-                  successfulTransactions.map(
-                    (st) =>
-                      st[
-                        bodyshop.accountingconfig &&
-                        bodyshop.accountingconfig.qbo
-                          ? "billid"
-                          : "id"
-                      ]
-                  )
-                ),
-              ]);
-            }
           }
         })()
       );
@@ -220,6 +172,8 @@ export function PayableExportAll({
     await Promise.all(proms);
     if (!!completedCallback) completedCallback([]);
     if (!!loadingCallback) loadingCallback(false);
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
+
     setLoading(false);
   };
 

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

@@ -4,35 +4,22 @@ import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { auth, logImEXEvent } from "../../firebase/firebase.utils";
+import { auth } from "../../firebase/firebase.utils";
-import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_BILLS } from "../../graphql/bills.queries";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import client from "../../utils/GraphQLClient";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import { Link } from "react-router-dom";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
 
-function updateBillCache(items) {
-  client.cache.modify({
-    id: "ROOT_QUERY",
-    fields: {
-      bills(existingJobs = []) {
-        return existingJobs.filter(
-          (billRef) => billRef.__ref.includes(items) === false
-        );
-      },
-    },
-  });
-}
-
 export function PayableExportButton({
   bodyshop,
   currentUser,
@@ -172,11 +159,6 @@ export function PayableExportButton({
             key: "billsuccessexport",
             message: t("bills.successes.exported"),
           });
-          updateBillCache(
-            billUpdateResponse.data.update_bills.returning.map(
-              (bill) => bill.id
-            )
-          );
         } else {
           notification["error"]({
             message: t("bills.errors.exporting", {
@@ -185,25 +167,7 @@ export function PayableExportButton({
           });
         }
       }
-      if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
+      if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
-        notification.open({
-          type: "success",
-          key: "billsuccessexport",
-          message: t("bills.successes.exported"),
-        });
-        updateBillCache([
-          ...new Set(
-            successfulTransactions.map(
-              (st) =>
-                st[
-                  bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
-                    ? "billid"
-                    : "id"
-                ]
-            )
-          ),
-        ]);
-      }
 
       if (setSelectedBills) {
         setSelectedBills((selectedBills) => {

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

@@ -1,186 +0,0 @@
-import { useMutation, useQuery } from "@apollo/client";
-import {
-  Button,
-  Descriptions,
-  InputNumber,
-  Modal,
-  Space,
-  notification,
-} from "antd";
-import axios from "axios";
-import moment from "moment";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import {
-  GET_REFUNDABLE_AMOUNT_BY_JOBID,
-  INSERT_PAYMENT_RESPONSE,
-  QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID,
-} from "../../graphql/payment_response.queries";
-import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
-import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { DateTimeFormatter } from "../../utils/DateFormatter";
-
-const { confirm } = Modal;
-
-const openNotificationWithIcon = (type, t) => {
-  notification[type]({
-    message: t("job_payments.notifications.error.title"),
-    description: t("job_payments.notifications.error.description"),
-  });
-};
-
-const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
-  const [refundAmount, setRefundAmount] = useState(0);
-  const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
-  const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
-  const { t } = useTranslation();
-
-  const { loading, error, data } = useQuery(
-    QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID,
-    {
-      variables: {
-        paymentid: record.id,
-        fetchPolicy: "network-only",
-        nextFetchPolicy: "network-only",
-      },
-    }
-  );
-
-  const { data: refundable_amount, refetch } = useQuery(
-    GET_REFUNDABLE_AMOUNT_BY_JOBID,
-    {
-      variables: {
-        jobid: record.jobid,
-      },
-    }
-  );
-
-  const insertPayments = async (payment_response, refund_response) => {
-    await insertPayment({
-      variables: {
-        paymentInput: {
-          amount: -refund_response.data.amount,
-          transactionid: payment_response.response.receiptelements.transid,
-          payer: record.payer,
-          type: "Refund",
-          jobid: payment_response.jobid,
-          date: moment(Date.now()),
-        },
-      },
-      update(cache, { data }) {
-        cache.modify({
-          id: cache.identify({
-            id: payment_response.jobid,
-            __typename: "jobs",
-          }),
-          fields: {
-            payments(payments) {
-              return [...data.insert_payments.returning, ...payments];
-            },
-          },
-        });
-      },
-    });
-
-    await insertPaymentResponse({
-      variables: {
-        paymentResponse: {
-          amount: -refund_response.data.amount,
-          bodyshopid: payment_response.bodyshopid,
-          paymentid: payment_response.paymentid,
-          jobid: payment_response.jobid,
-          declinereason: "Refund",
-          ext_paymentid: payment_response.ext_paymentid,
-          successful: true,
-          response: refund_response.data,
-        },
-      },
-    });
-  };
-
-  const showConfirm = (payment_response) => {
-    confirm({
-      title: "Do you want to refund payment?",
-      content:
-        "The payment will be refunded. Click OK to confirm and Cancel to dismiss.",
-      async onOk() {
-        const refundResponse = await axios.post("/intellipay/payment_refund", {
-          bodyshop,
-          amount: refundAmount,
-          paymentid: payment_response.ext_paymentid,
-        });
-
-        if (refundResponse.data.status < 0) {
-          openNotificationWithIcon("error", t);
-          return;
-        }
-
-        insertPayments(payment_response, refundResponse);
-
-        // refetch refundable amount
-        refetch();
-      },
-      onCancel() {},
-    });
-  };
-
-  if (loading) return null;
-
-  if (error) return <p>Error loading data. Please Reload</p>;
-
-  const payment_response = data.payment_response[0];
-  const max_refundable_amount =
-    refundable_amount?.payment_response_aggregate.aggregate.sum.amount;
-
-  return (
-    <div>
-      <Descriptions
-        title={t("job_payments.titles.descriptions")}
-        contentStyle={{ fontWeight: "600" }}
-        column={4}
-      >
-        <Descriptions.Item label={t("job_payments.titles.payer")}>
-          {record.payer}
-        </Descriptions.Item>
-        <Descriptions.Item label={t("job_payments.titles.payername")}>
-          {payment_response?.response?.nameOnCard ?? ""}
-        </Descriptions.Item>
-        <Descriptions.Item label={t("job_payments.titles.amount")}>
-          <CurrencyFormatter>{record.amount}</CurrencyFormatter>
-        </Descriptions.Item>
-        <Descriptions.Item label={t("job_payments.titles.dateOfPayment")}>
-          {<DateTimeFormatter>{record.created_at}</DateTimeFormatter>}
-        </Descriptions.Item>
-        <Descriptions.Item label={t("job_payments.titles.transactionid")}>
-          {record.transactionid}
-        </Descriptions.Item>
-        <Descriptions.Item label={t("job_payments.titles.paymentid")}>
-          {payment_response?.response?.paymentreferenceid ?? ""}
-        </Descriptions.Item>
-        <Descriptions.Item label={t("job_payments.titles.paymenttype")}>
-          {record.type}
-        </Descriptions.Item>
-        <Descriptions.Item label={t("job_payments.titles.paymentnum")}>
-          {record.paymentnum}
-        </Descriptions.Item>
-        {payment_response && (
-          <Descriptions.Item label={t("job_payments.titles.refundamount")}>
-            <Space>
-              <InputNumber
-                onChange={setRefundAmount}
-                max={max_refundable_amount}
-                min={0}
-              />
-
-              <Button onClick={() => showConfirm(payment_response)}>
-                {t("job_payments.buttons.refundpayment")}
-              </Button>
-            </Space>
-          </Descriptions.Item>
-        )}
-      </Descriptions>
-    </div>
-  );
-};
-
-export default PaymentExpandedRowComponent;

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

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

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,6 +1,6 @@
 import { useMutation } from "@apollo/client";
 
-import { Button, Form, Modal, notification, Space } from "antd";
+import { Button, Form, Modal, notification } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -19,8 +19,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,
@@ -54,7 +52,7 @@ function PaymentModalContainer({
     const { useStripe, sendby, ...paymentObj } = values;
 
     setLoading(true);
-    let updatedPayment; //Moved up from if statement for greater scope.
+
     try {
       if (!context || (context && !context.id)) {
         const newPayment = await insertPayment({
@@ -89,7 +87,7 @@ function PaymentModalContainer({
           );
         }
       } else {
-        updatedPayment = await updatePayment({
+        const updatedPayment = await updatePayment({
           variables: {
             paymentId: context.id,
             payment: paymentObj,
@@ -103,11 +101,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"]);
 
@@ -178,24 +172,12 @@ 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} />
       </Form>

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-export-all-button/payments-export-all-button.component.jsx

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

client/src/components/payments-generate-link/payments-generate-link.component.jsx

@@ -1,156 +0,0 @@
-import { CopyFilled } from "@ant-design/icons";
-import { Button, Form, Popover, Space, message } from "antd";
-import axios from "axios";
-import Dinero from "dinero.js";
-import { parsePhoneNumber } from "libphonenumber-js";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import {
-  openChatByPhone,
-  setMessage,
-} from "../../redux/messaging/messaging.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-  openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
-  setMessage: (text) => dispatch(setMessage(text)),
-});
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(PaymentsGenerateLink);
-
-export function PaymentsGenerateLink({
-  bodyshop,
-  callback,
-  job,
-  openChatByPhone,
-  setMessage,
-}) {
-  const { t } = useTranslation();
-  const [form] = Form.useForm();
-
-  const [visible, setVisible] = useState(false);
-  const [loading, setLoading] = useState(false);
-  const [paymentLink, setPaymentLink] = useState(null);
-
-  const handleFinish = async ({ amount }) => {
-    setLoading(true);
-
-    const p = parsePhoneNumber(job.ownr_ph1, "CA");
-    setLoading(true);
-    const response = await axios.post("/intellipay/generate_payment_url", {
-      bodyshop,
-      amount: amount,
-      account: job.ro_number,
-      invoice: job.id,
-    });
-    setLoading(false);
-    setPaymentLink(response.data.shorUrl);
-
-    openChatByPhone({
-      phone_num: p.formatInternational(),
-      jobid: job.id,
-    });
-    setMessage(
-      t("payments.labels.smspaymentreminder", {
-        shopname: bodyshop.shopname,
-        amount: amount,
-        payment_link: response.data.shorUrl,
-      })
-    );
-
-    //Add in confirmation & errors.
-    if (callback) callback();
-
-    // setVisible(false);
-    setLoading(false);
-  };
-
-  const popContent = (
-    <div>
-      <Form onFinish={handleFinish} layout="vertical" form={form}>
-        <Form.Item
-          label={t("payments.fields.amount")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name="amount"
-        >
-          <CurrencyFormItemComponent />
-        </Form.Item>
-        {paymentLink && (
-          <Space direction="vertical">
-            <Space
-              style={{ cursor: "pointer" }}
-              onClick={() => {
-                navigator.clipboard.writeText(paymentLink);
-                message.success(t("general.actions.copied"));
-              }}
-            >
-              <div
-                onClick={() => {
-                  //Copy the link.
-                }}
-              >
-                {paymentLink}
-              </div>{" "}
-              <CopyFilled />
-            </Space>
-            <Button
-              onClick={() => {
-                const p = parsePhoneNumber(job.ownr_ph1, "CA");
-                openChatByPhone({
-                  phone_num: p.formatInternational(),
-                  jobid: job.id,
-                });
-                setMessage(
-                  t("payments.labels.smspaymentreminder", {
-                    shopname: bodyshop.shopname,
-                    amount: Dinero({
-                      amount: Math.round(form.getFieldValue("amount") * 100),
-                    }).toFormat(),
-                    payment_link: paymentLink,
-                  })
-                );
-              }}
-            >
-              {t("general.actions.sendbysms")}
-            </Button>
-          </Space>
-        )}
-      </Form>
-      <Space>
-        <Button type="primary" onClick={() => form.submit()}>
-          {t("general.actions.submit")}
-        </Button>
-        <Button
-          onClick={() => {
-            form.resetFields();
-            setPaymentLink(null);
-            setVisible(false);
-          }}
-        >
-          {t("general.actions.cancel")}
-        </Button>
-      </Space>
-    </div>
-  );
-
-  return (
-    <Popover content={popContent} visible={visible}>
-      <Button onClick={() => setVisible(true)} loading={loading}>
-        {t("payments.actions.generatepaymentlink")}
-      </Button>
-    </Popover>
-  );
-}

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

@@ -1,23 +1,20 @@
 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 mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -42,10 +39,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 +52,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 +72,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>
         );
       },
@@ -156,34 +146,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 +177,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 +189,6 @@ export function PaymentsListPaginated({
               <Button
                 onClick={() => {
                   delete search.search;
-                  delete search.page;
                   history.push({ search: queryString.stringify(search) });
                 }}
               >
@@ -268,33 +212,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-item/print-center-item.component.jsx

@@ -5,13 +5,11 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setEmailOptions } from "../../redux/email/email.actions";
 import { selectPrintCenter } from "../../redux/modals/modals.selectors";
-import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 const mapStateToProps = createStructuredSelector({
   printCenterModal: selectPrintCenter,
   bodyshop: selectBodyshop,
-  technician: selectTechnician,
 });
 const mapDispatchToProps = (dispatch) => ({
   setEmailOptions: (e) => dispatch(setEmailOptions(e)),
@@ -24,7 +22,6 @@ export function PrintCenterItemComponent({
   id,
   bodyshop,
   disabled,
-  technician,
 }) {
   const [loading, setLoading] = useState(false);
   const { context } = printCenterModal;
@@ -47,24 +44,19 @@ export function PrintCenterItemComponent({
       <Space wrap>
         {item.title}
         <PrinterOutlined onClick={renderToNewWindow} />
-        {!technician ? (
+        <MailOutlined
-          <MailOutlined
+          onClick={() => {
-            onClick={() => {
+            GenerateDocument(
-              GenerateDocument(
+              {
-                {
+                name: item.key,
-                  name: item.key,
+                variables: { id: id },
-                  variables: { id: id },
+              },
-                },
+              { to: context.job && context.job.ownr_ea, subject: item.subject },
-                {
+              "e",
-                  to: context.job && context.job.ownr_ea,
+              id
-                  subject: item.subject,
+            );
-                },
+          }}
-                "e",
+        />
-                id
-              );
-            }}
-          />
-        ) : null}
         {loading && <Spin />}
       </Space>
     </li>

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

@@ -20,7 +20,6 @@ import ProductionBoardCard from "../production-board-kanban-card/production-boar
 import ProductionListDetailComponent from "../production-list-detail/production-list-detail.component";
 import ProductionBoardKanbanCardSettings from "./production-board-kanban.card-settings.component";
 //import "@asseinfo/react-kanban/dist/styles.css";
-import CardColorLegend from "../production-board-kanban-card/production-board-kanban-card-color-legend.component";
 import "./production-board-kanban.styles.scss";
 import { createBoardData } from "./production-board-kanban.utils.js";
 const mapStateToProps = createStructuredSelector({
@@ -153,18 +152,6 @@ export function ProductionBoardKanbanComponent({
       0
     )
     .toFixed(1);
-    const totalLAB = data
-    .reduce(
-      (acc, val) => acc + (val.labhrs?.aggregate?.sum?.mod_lb_hrs || 0),
-      0
-    )
-    .toFixed(1);
-  const totalLAR = data
-    .reduce(
-      (acc, val) => acc + (val.larhrs?.aggregate?.sum?.mod_lb_hrs || 0),
-      0
-    )
-    .toFixed(1);
   const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
     .filter((screen) => !!screen[1])
     .slice(-1)[0];
@@ -234,7 +221,6 @@ export function ProductionBoardKanbanComponent({
           employeeassignments: true,
           scheduled_completion: true,
           stickyheader: false,
-          cardcolor: false,
         };
 
   return (
@@ -248,14 +234,6 @@ export function ProductionBoardKanbanComponent({
               title={t("dashboard.titles.productionhours")}
               value={totalHrs}
             />
-            <Statistic
-              title={t("dashboard.titles.labhours")}
-              value={totalLAB}
-            />
-            <Statistic
-              title={t("dashboard.titles.larhours")}
-              value={totalLAR}
-            />
             <Statistic
               title={t("appointments.labels.inproduction")}
               value={data && data.length}
@@ -278,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>
       ),
     },
     {
@@ -455,8 +453,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
-          bodyshop.employees?.find((e) => e.id === a.employee_body)?.first_name,
+          bodyshop.employees.find((e) => e.id === a.employee_body)?.first_name,
-          bodyshop.employees?.find((e) => e.id === b.employee_body)?.first_name
+          bodyshop.employees.find((e) => e.id === b.employee_body)?.first_name
         ),
       render: (text, record) => (
         <ProductionListEmployeeAssignment
@@ -474,8 +472,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
-          bodyshop.employees?.find((e) => e.id === a.employee_prep)?.first_name,
+          bodyshop.employees.find((e) => e.id === a.employee_prep)?.first_name,
-          bodyshop.employees?.find((e) => e.id === b.employee_prep)?.first_name
+          bodyshop.employees.find((e) => e.id === b.employee_prep)?.first_name
         ),
       render: (text, record) => (
         <ProductionListEmployeeAssignment
@@ -492,8 +490,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         state.sortedInfo.columnKey === "employee_csr" && state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
-          bodyshop.employees?.find((e) => e.id === a.employee_csr)?.first_name,
+          bodyshop.employees.find((e) => e.id === a.employee_csr)?.first_name,
-          bodyshop.employees?.find((e) => e.id === b.employee_csr)?.first_name
+          bodyshop.employees.find((e) => e.id === b.employee_csr)?.first_name
         ),
       render: (text, record) => (
         <ProductionListEmployeeAssignment record={record} type="employee_csr" />
@@ -508,9 +506,9 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
-          bodyshop.employees?.find((e) => e.id === a.employee_refinish)
+          bodyshop.employees.find((e) => e.id === a.employee_refinish)
             ?.first_name,
-          bodyshop.employees?.find((e) => e.id === b.employee_refinish)
+          bodyshop.employees.find((e) => e.id === b.employee_refinish)
             ?.first_name
         ),
       render: (text, record) => (

client/src/components/production-list-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",