IO-2208 removed subscriptions to the message

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

@@ -24,15 +24,8 @@ function ChatConversationListComponent({
   conversationList,
   selectedConversation,
   setSelectedConversation,
-  subscribeToMoreConversations,
   loadMoreConversations,
 }) {
-  useEffect(
-    () => subscribeToMoreConversations(),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
-  );
-
   const rowRenderer = ({ index, key, style }) => {
     const item = conversationList[index];
 

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

@@ -4,7 +4,7 @@ import {
   ShrinkOutlined,
   SyncOutlined,
 } from "@ant-design/icons";
-import { useLazyQuery, useSubscription } from "@apollo/client";
+import { useLazyQuery, useQuery } from "@apollo/client";
 import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
 import React, { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -13,7 +13,7 @@ import { createStructuredSelector } from "reselect";
 import {
   CONVERSATION_LIST_QUERY,
   CONVERSATION_LIST_SUBSCRIPTION,
-  UNREAD_CONVERSATION_COUNT_SUBSCRIPTION,
+  UNREAD_CONVERSATION_COUNT,
 } from "../../graphql/conversations.queries";
 import { toggleChatVisible } from "../../redux/messaging/messaging.actions";
 import {
@@ -42,19 +42,20 @@ export function ChatPopupComponent({
   const { t } = useTranslation();
   const [pollInterval, setpollInterval] = useState(0);
 
-  const { data: unreadData } = useSubscription(
-    UNREAD_CONVERSATION_COUNT_SUBSCRIPTION
-  );
-
-  const [
-    getConversations,
-    { loading, data, called, refetch, fetchMore, subscribeToMore },
-  ] = useLazyQuery(CONVERSATION_LIST_QUERY, {
+  const { data: unreadData } = useQuery(UNREAD_CONVERSATION_COUNT, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
-    skip: !chatVisible,
+    ...(pollInterval > 0 ? { pollInterval } : {}),
   });
 
+  const [getConversations, { loading, data, refetch, fetchMore }] =
+    useLazyQuery(CONVERSATION_LIST_QUERY, {
+      fetchPolicy: "network-only",
+      nextFetchPolicy: "network-only",
+      skip: !chatVisible,
+      ...(pollInterval > 0 ? { pollInterval } : {}),
+    });
+
   const fcmToken = sessionStorage.getItem("fcmtoken");
 
   useEffect(() => {
@@ -66,13 +67,13 @@ export function ChatPopupComponent({
   }, [fcmToken]);
 
   useEffect(() => {
-    if (called && chatVisible)
+    if (chatVisible)
       getConversations({
         variables: {
           offset: 0,
         },
       });
-  }, [chatVisible, called, getConversations]);
+  }, [chatVisible, getConversations]);
 
   const loadMoreConversations = useCallback(() => {
     if (data)
@@ -119,43 +120,6 @@ export function ChatPopupComponent({
                   <ChatConversationListComponent
                     conversationList={data ? data.conversations : []}
                     loadMoreConversations={loadMoreConversations}
-                    subscribeToMoreConversations={() =>
-                      subscribeToMore({
-                        document: CONVERSATION_LIST_SUBSCRIPTION,
-                        variables: { offset: 0 },
-                        updateQuery: (prev, { subscriptionData }) => {
-                          if (
-                            !subscriptionData.data ||
-                            subscriptionData.data.conversations.length === 0
-                          )
-                            return prev;
-
-                          let conversations = [...prev.conversations];
-                          const newConversations =
-                            subscriptionData.data.conversations;
-
-                          for (const conversation of newConversations) {
-                            const index = conversations.findIndex(
-                              (prevConversation) =>
-                                prevConversation.id === conversation.id
-                            );
-
-                            if (index !== -1) {
-                              conversations.splice(index, 1);
-                              conversations.unshift(conversation);
-
-                              continue;
-                            }
-
-                            conversations.unshift(conversation);
-                          }
-
-                          return Object.assign({}, prev, {
-                            conversations: conversations,
-                          });
-                        },
-                      })
-                    }
                   />
                 )}
               </Col>

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
-        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"
-      >
+      <Form.Item label={t("emails.fields.cc")} name="cc">
         <Select mode="tags" tokenSeparators={[",", ";"]} />
       </Form.Item>
       <Form.Item

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

@@ -99,7 +99,7 @@ export function JobPayments({
       render: (text, record) => (
         <Space wrap>
           <Button
-            // disabled={record.exportedat}
+            disabled={record.exportedat}
             onClick={() => {
               setPaymentContext({
                 actions: { refetch: refetch },

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

@@ -219,15 +219,13 @@ export function JobsConvertButton({
             </Select>
           </Form.Item>
         )}
-        {bodyshop.region_config.toLowerCase().startsWith("ca") && (
-          <Form.Item
-            label={t("jobs.fields.ca_gst_registrant")}
-            name="ca_gst_registrant"
-            valuePropName="checked"
-          >
-            <Switch />
-          </Form.Item>
-        )}
+        <Form.Item
+          label={t("jobs.fields.ca_gst_registrant")}
+          name="ca_gst_registrant"
+          valuePropName="checked"
+        >
+          <Switch />
+        </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
-                label={t("jobs.fields.ca_gst_registrant")}
-                name="ca_gst_registrant"
-                valuePropName="checked"
-              >
-                <Switch />
-              </Form.Item>
-            )}
+            <Form.Item
+              label={t("jobs.fields.ca_gst_registrant")}
+              name="ca_gst_registrant"
+              valuePropName="checked"
+            >
+              <Switch />
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.other_amount_payable")}
               name="other_amount_payable"

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")}>
-            <Form.Item
-              label={t("jobs.fields.ca_customer_gst")}
-              name="ca_customer_gst"
-            >
-              <CurrencyInput
-                disabled={jobRO}
-                min={0}
-                max={
-                  Math.round(
-                    (job.job_totals &&
-                      job.job_totals.totals.federal_tax.amount) ||
-                      0
-                  ) / 100
-                }
-              />
-            </Form.Item>
-          </Tooltip>
-        )}
+        <Tooltip title={t("jobs.labels.ca_gst_all_if_null")}>
+          <Form.Item
+            label={t("jobs.fields.ca_customer_gst")}
+            name="ca_customer_gst"
+          >
+            <CurrencyInput
+              disabled={jobRO}
+              min={0}
+              max={
+                Math.round(
+                  (job.job_totals &&
+                    job.job_totals.totals.federal_tax.amount) ||
+                    0
+                ) / 100
+              }
+            />
+          </Form.Item>
+        </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="center">
-            <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
-              <CurrencyInput disabled={jobRO} min={0} />
-            </Form.Item>
-            <CABCpvrtCalculator form={form} disabled={jobRO} />
-          </Space>
-        )}
+        <Space align="center">
+          <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
+            <CurrencyInput disabled={jobRO} min={0} />
+          </Form.Item>
+          <CABCpvrtCalculator form={form} disabled={jobRO} />
+        </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
-            label={t("jobs.fields.ca_gst_registrant")}
-            name="ca_gst_registrant"
-            valuePropName="checked"
-          >
-            <Switch disabled={jobRO} />
-          </Form.Item>
-        )}
+        <Form.Item
+          label={t("jobs.fields.ca_gst_registrant")}
+          name="ca_gst_registrant"
+          valuePropName="checked"
+        >
+          <Switch disabled={jobRO} />
+        </Form.Item>
       </FormRow>
       <Divider
         orientation="left"

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/labor-allocations-table/labor-allocations-table.component.jsx

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

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

@@ -1,14 +1,4 @@
-import {
-  Checkbox,
-  Col,
-  Form,
-  Input,
-  Row,
-  Select,
-  Space,
-  Switch,
-  Tag,
-} from "antd";
+import { Checkbox, Col, Form, Input, Row, 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/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)
-        actions.refetch(
-          updatedPayment && updatedPayment.data.update_payments.returning[0]
-        );
-
+      if (actions.refetch) actions.refetch();
       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-list-paginated/payment-list-paginated.component.jsx

@@ -156,7 +156,7 @@ export function PaymentsListPaginated({
       render: (text, record) => (
         <Space>
           <Button
-            // disabled={record.exportedat}
+            disabled={record.exportedat}
             onClick={async () => {
               let apolloResults;
               if (search.search) {
@@ -169,20 +169,7 @@ export function PaymentsListPaginated({
                 apolloResults = data.payments_by_pk;
               }
               setPaymentContext({
-                actions: {
-                  refetch: apolloResults
-                    ? (updatedRecord) => {
-                        setOpenSearchResults((results) =>
-                          results.map((result) => {
-                            if (result.id !== record.id) {
-                              return result;
-                            }
-                            return updatedRecord;
-                          })
-                        );
-                      }
-                    : refetch,
-                },
+                actions: { refetch: refetch },
                 context: apolloResults ? apolloResults : record,
               });
             }}

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

@@ -29,10 +29,7 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
     })
     .filter(
       (temp) =>
-        !temp.regions ||
-        (temp.regions && temp.regions[bodyshop.region_config]) ||
-        (temp.regions &&
-          bodyshop.region_config.includes(Object.keys(temp.regions)) === true)
+        !temp.regions || (temp.regions && temp.regions[bodyshop.region_config])
     );
 
   const filteredJobsReportsList =

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"]}
-      onVisibleChange={(v) => setVisible(v)}
+      //trigger={["click"]}
       visible={visible}
       style={{
         height: "19px",

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

@@ -21,7 +21,6 @@ import ScheduleVerifyIntegrity from "../schedule-verify-integrity/schedule-verif
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import _ from "lodash";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -40,39 +39,9 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
     employeevacation: true,
     ins_co_nm: null,
   });
-  const [estimatorsFilter, setEstimatiorsFilter] = useLocalStorage(
-    "estimators",
-    []
-  );
-
-  const estimators = useMemo(() => {
-    return _.uniq([
-      ...data
-        .filter((d) => d.__typename === "appointments")
-        .map((app) =>
-          `${app.job?.est_ct_fn || ""} ${app.job?.est_ct_ln || ""}`.trim()
-        )
-        .filter((e) => e.length > 0),
-      ...bodyshop.md_estimators.map((e) =>
-        `${e.est_ct_fn || ""} ${e.est_ct_ln || ""}`.trim()
-      ),
-    ]);
-  }, [data, bodyshop.md_estimators]);
-
   const filteredData = useMemo(() => {
-    return data.filter((d) => {
-      const estFilter =
-        d.__typename === "appointments"
-          ? estimatorsFilter.length === 0
-            ? true
-            : !!estimatorsFilter.find(
-                (e) =>
-                  e ===
-                  `${d.job?.est_ct_fn || ""} ${d.job?.est_ct_ln || ""}`.trim()
-              )
-          : true;
-
-      return (
+    return data.filter(
+      (d) =>
         (d.block ||
           (filter.intake && d.isintake) ||
           (filter.manual && !d.isintake && d.block === false) ||
@@ -81,11 +50,9 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
             !!d.employee)) &&
         (filter.ins_co_nm && filter.ins_co_nm.length > 0
           ? filter.ins_co_nm.includes(d.job?.ins_co_nm)
-          : true) &&
-        estFilter
-      );
-    });
-  }, [data, filter, estimatorsFilter]);
+          : true)
+    );
+  }, [data, filter]);
 
   return (
     <Row gutter={[16, 16]}>
@@ -96,21 +63,6 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
           extra={
             <Space wrap>
               <ScheduleAtsSummary appointments={filteredData} />
-              <Select
-                style={{ minWidth: "15rem" }}
-                mode="multiple"
-                placeholder={t("schedule.labels.estimators")}
-                allowClear
-                onClear={() => setEstimatiorsFilter([])}
-                value={[...estimatorsFilter]}
-                onChange={(e) => {
-                  setEstimatiorsFilter(e);
-                }}
-                options={estimators.map((e) => ({
-                  label: e,
-                  value: e,
-                }))}
-              />
               <Select
                 style={{ minWidth: "15rem" }}
                 mode="multiple"

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

@@ -1,6 +1,5 @@
-import { Card } from "antd";
 import Dinero from "dinero.js";
-import _ from "lodash";
+import { Card } from "antd";
 import moment from "moment";
 import React from "react";
 import { connect } from "react-redux";
@@ -19,6 +18,7 @@ import {
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import * as Utils from "../scoreboard-targets-table/scoreboard-targets-table.util";
+import _ from "lodash";
 import CustomTooltip from "./chart-custom-tooltip";
 
 const graphProps = {
@@ -71,9 +71,7 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) {
           bodyshop.scoreboard_target.dailyBodyTarget +
             bodyshop.scoreboard_target.dailyPaintTarget,
           val
-        ) +
-          bodyshop.scoreboard_target.dailyBodyTarget +
-          bodyshop.scoreboard_target.dailyPaintTarget,
+        ),
         1
       ),
       accHrs: _.round(

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

@@ -15,8 +15,6 @@ import ShopInfoResponsibilityCenterComponent from "./shop-info.responsibilitycen
 import ShopInfoROStatusComponent from "./shop-info.rostatus.component";
 import ShopInfoSchedulingComponent from "./shop-info.scheduling.component";
 import ShopInfoSpeedPrint from "./shop-info.speedprint.component";
-import { useHistory, useLocation } from "react-router-dom";
-import queryString from "query-string";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -33,10 +31,6 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
     bodyshop.imexshopid
   );
   const { t } = useTranslation();
-  const history = useHistory();
-  const location = useLocation();
-  const search = queryString.parse(location.search);
-
   return (
     <Card
       extra={
@@ -49,12 +43,7 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
         </Button>
       }
     >
-      <Tabs
-        defaultActiveKey={search.subtab}
-        onChange={(key) =>
-          history.push({ search: `?tab=${search.tab}&subtab=${key}` })
-        }
-      >
+      <Tabs>
         <Tabs.TabPane key="general" tab={t("bodyshop.labels.shopinfo")}>
           <ShopInfoGeneral form={form} />
         </Tabs.TabPane>

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

@@ -24,13 +24,9 @@ const timeZonesList = momentTZ.tz.names();
 
 export default function ShopInfoGeneral({ form }) {
   const { t } = useTranslation();
-
   return (
     <div>
-      <LayoutFormRow
-        header={t("bodyshop.labels.businessinformation")}
-        id="businessinformation"
-      >
+      <LayoutFormRow header={t("bodyshop.labels.businessinformation")}>
         <Form.Item
           label={t("bodyshop.fields.shopname")}
           name="shopname"
@@ -159,10 +155,7 @@ export default function ShopInfoGeneral({ form }) {
           <InputNumber min={0} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow
-        header={t("bodyshop.labels.accountingsetup")}
-        id="accountingsetup"
-      >
+      <LayoutFormRow header={t("bodyshop.labels.accountingsetup")}>
         <Form.Item
           label={t("bodyshop.labels.qbo")}
           valuePropName="checked"
@@ -393,10 +386,7 @@ export default function ShopInfoGeneral({ form }) {
           <Select mode="tags" />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow
-        header={t("bodyshop.labels.scoreboardsetup")}
-        id="scoreboardsetup"
-      >
+      <LayoutFormRow header={t("bodyshop.labels.scoreboardsetup")}>
         <Form.Item
           label={t("bodyshop.fields.dailypainttarget")}
           name={["scoreboard_target", "dailyPaintTarget"]}
@@ -455,10 +445,7 @@ export default function ShopInfoGeneral({ form }) {
           <InputNumber min={1} precision={1} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow
-        header={t("bodyshop.labels.systemsettings")}
-        id="systemsettings"
-      >
+      <LayoutFormRow header={t("bodyshop.labels.systemsettings")}>
         <Form.Item
           name={["md_referral_sources"]}
           label={t("bodyshop.fields.md_referral_sources")}
@@ -668,11 +655,7 @@ export default function ShopInfoGeneral({ form }) {
           <Input />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow
-        grow
-        header={t("bodyshop.labels.messagingpresets")}
-        id="messagingpresets"
-      >
+      <LayoutFormRow grow header={t("bodyshop.labels.messagingpresets")}>
         <Form.List name={["md_messaging_presets"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -737,11 +720,7 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow
-        grow
-        header={t("bodyshop.labels.notespresets")}
-        id="notespresets"
-      >
+      <LayoutFormRow grow header={t("bodyshop.labels.notespresets")}>
         <Form.List name={["md_notes_presets"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -806,11 +785,7 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow
-        grow
-        header={t("bodyshop.labels.partslocations")}
-        id="partslocations"
-      >
+      <LayoutFormRow grow header={t("bodyshop.labels.partslocations")}>
         <Form.List name={["md_parts_locations"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -864,11 +839,7 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow
-        grow
-        header={t("bodyshop.labels.insurancecos")}
-        id="insurancecos"
-      >
+      <LayoutFormRow grow header={t("bodyshop.labels.insurancecos")}>
         <Form.List name={["md_ins_cos"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -964,11 +935,7 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow
-        grow
-        header={t("bodyshop.labels.estimators")}
-        id="estimators"
-      >
+      <LayoutFormRow grow header={t("bodyshop.labels.estimators")}>
         <Form.List name={["md_estimators"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1057,11 +1024,7 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow
-        grow
-        header={t("bodyshop.labels.filehandlers")}
-        id="filehandlers"
-      >
+      <LayoutFormRow grow header={t("bodyshop.labels.filehandlers")}>
         <Form.List name={["md_filehandlers"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1143,11 +1106,7 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow
-        grow
-        header={t("bodyshop.fields.md_ccc_rates")}
-        id="md_ccc_rates"
-      >
+      <LayoutFormRow grow header={t("bodyshop.fields.md_ccc_rates")}>
         <Form.List name={["md_ccc_rates"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1264,11 +1223,7 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow
-        grow
-        header={t("bodyshop.fields.md_jobline_presets")}
-        id="md_jobline_presets"
-      >
+      <LayoutFormRow grow header={t("bodyshop.fields.md_jobline_presets")}>
         <Form.List name={["md_jobline_presets"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1449,11 +1404,7 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow
-        grow
-        header={t("bodyshop.fields.md_parts_order_comment")}
-        id="md_parts_order_comment"
-      >
+      <LayoutFormRow grow header={t("bodyshop.fields.md_parts_order_comment")}>
         <Form.List name={["md_parts_order_comment"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1519,11 +1470,7 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow
-        grow
-        header={t("bodyshop.labels.md_to_emails")}
-        id="md_to_emails"
-      >
+      <LayoutFormRow grow header={t("bodyshop.labels.md_to_emails")}>
         <Form.List name={["md_to_emails"]}>
           {(fields, { add, remove, move }) => {
             return (

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

@@ -20,10 +20,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
   const TemplateListGenerated = TemplateList();
   return (
     <div>
-      <LayoutFormRow
-        header={t("bodyshop.labels.intakechecklist")}
-        id="intakechecklist"
-      >
+      <LayoutFormRow header={t("bodyshop.labels.intakechecklist")}>
         <Form.List name={["intakechecklist", "form"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -191,10 +188,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
         </Form.Item>
       </SelectorDiv>
 
-      <LayoutFormRow
-        header={t("bodyshop.labels.deliverchecklist")}
-        id="deliverchecklist"
-      >
+      <LayoutFormRow header={t("bodyshop.labels.deliverchecklist")}>
         <Form.List name={["deliverchecklist", "form"]}>
           {(fields, { add, remove, move }) => {
             return (

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

@@ -95,6 +95,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
               {form.getFieldValue("pbs_serialnumber")}
             </DataLabel>
           )}
+
           <LayoutFormRow>
             <Form.Item
               label={t("bodyshop.fields.dms.default_journal")}
@@ -314,10 +315,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </DataLabel>
         </>
       )}
-      <LayoutFormRow
-        header={t("bodyshop.labels.responsibilitycenters.costs")}
-        id="costs"
-      >
+      <LayoutFormRow header={t("bodyshop.labels.responsibilitycenters.costs")}>
         <Form.List name={["md_responsibility_centers", "costs"]}>
           {(fields, { add, remove }) => {
             return (
@@ -464,7 +462,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
 
       <LayoutFormRow
         header={t("bodyshop.labels.responsibilitycenters.profits")}
-        id="profits"
       >
         <Form.List name={["md_responsibility_centers", "profits"]}>
           {(fields, { add, remove }) => {
@@ -604,7 +601,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                     {fields.map((field, index) => (
                       <Form.Item key={field.key}>
                         <div>
-                          <LayoutFormRow id="mappingname">
+                          <LayoutFormRow>
                             <Form.Item
                               label={t("bodyshop.fields.dms.mappingname")}
                               key={`${index}name`}
@@ -634,7 +631,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                           </LayoutFormRow>
                           <LayoutFormRow
                             header={t("bodyshop.labels.defaultcostsmapping")}
-                            id="defaultcostsmapping"
                           >
                             <Form.Item
                               label={t(
@@ -4092,7 +4088,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
 
       <LayoutFormRow
         header={t("bodyshop.labels.responsibilitycenters.tax_accounts")}
-        id="tax_accounts"
       >
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.federal_tax")}
@@ -4207,7 +4202,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         </Form.Item>
       </LayoutFormRow>
       {DmsAp.treatment === "on" && (
-        <LayoutFormRow id="federal_tax_itc">
+        <LayoutFormRow>
           <Form.Item
             label={t("bodyshop.fields.responsibilitycenters.federal_tax_itc")}
             rules={[
@@ -4321,7 +4316,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </Form.Item>
         </LayoutFormRow>
       )}
-      <LayoutFormRow id="state_tax">
+      <LayoutFormRow>
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.state_tax")}
           rules={[
@@ -4419,7 +4414,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           <InputNumber precision={2} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow id="local_tax">
+      <LayoutFormRow>
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.local_tax")}
           rules={[
@@ -4517,7 +4512,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           <InputNumber precision={2} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow header={<div>AR</div>} id="AR">
+      <LayoutFormRow header={<div>AR</div>}>
         {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.ar")}
           rules={[
@@ -4581,10 +4576,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
       </LayoutFormRow>
 
       {DmsAp.treatment === "on" && (
-        <LayoutFormRow
-          header={t("bodyshop.fields.responsibilitycenters.ap")}
-          id="ap"
-        >
+        <LayoutFormRow header={t("bodyshop.fields.responsibilitycenters.ap")}>
           {/* <Form.Item
             label={t("bodyshop.fields.responsibilitycenters.ap")}
             rules={[
@@ -4647,7 +4639,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </Form.Item>
         </LayoutFormRow>
       )}
-      <LayoutFormRow header={<div>Refund</div>} id="refund">
+      <LayoutFormRow header={<div>Refund</div>}>
         {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.refund")}
           rules={[
@@ -4710,10 +4702,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         </Form.Item>
       </LayoutFormRow>
       {Qb_Multi_Ar.treatment === "on" && (
-        <LayoutFormRow
-          header={<div>Multiple Payers Item</div>}
-          id="accountitem"
-        >
+        <LayoutFormRow header={<div>Multiple Payers Item</div>}>
           <Form.Item
             label={t("bodyshop.fields.responsibilitycenter_accountitem")}
             rules={[
@@ -4741,7 +4730,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
             <div>
               {fields.map((field, index) => (
                 <Form.Item key={field.key}>
-                  <LayoutFormRow id="sales_tax_codes">
+                  <LayoutFormRow>
                     <Form.Item
                       label={t(
                         "bodyshop.fields.responsibilitycenters.sales_tax_codes.description"

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

@@ -44,7 +44,7 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
   };
 
   return (
-    <SelectorDiv id="jobstatus">
+    <SelectorDiv>
       <Form.Item
         name={["md_ro_statuses", "statuses"]}
         label={t("bodyshop.labels.alljobstatuses")}
@@ -322,7 +322,6 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
         <LayoutFormRow
           grow
           header={t("bodyshop.fields.statuses.production_colors")}
-          id="production_colors"
         >
           <Form.List name={["md_ro_statuses", "production_colors"]}>
             {(fields, { add, remove, move }) => {

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

@@ -92,7 +92,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
         </Form.Item>
       </LayoutFormRow>
       <Divider orientation="left">{t("bodyshop.labels.workingdays")}</Divider>
-      <Space wrap size="large" id="workingdays">
+      <Space wrap size="large">
         <Form.Item
           label={t("general.labels.sunday")}
           name={["workingdays", "sunday"]}
@@ -143,7 +143,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
           <Switch />
         </Form.Item>
       </Space>
-      <LayoutFormRow header={t("bodyshop.labels.apptcolors")} id="apptcolors">
+      <LayoutFormRow header={t("bodyshop.labels.apptcolors")}>
         <Form.List name={["appt_colors"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -208,7 +208,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow header={t("bodyshop.labels.ssbuckets")} id="ssbuckets">
+      <LayoutFormRow header={t("bodyshop.labels.ssbuckets")}>
         <Form.List name={["ssbuckets"]}>
           {(fields, { add, remove, move }) => {
             return (

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

@@ -96,9 +96,8 @@ export function TimeTicketModalComponent({
               ]}
             >
               <JobSearchSelect
-                convertedOnly={true}
+                convertedOnly={!bodyshop.tt_allow_post_to_invoiced}
                 notExported={!bodyshop.tt_allow_post_to_invoiced}
-                notInvoiced={!bodyshop.tt_allow_post_to_invoiced}
               />
             </Form.Item>
           )}

client/src/graphql/appointments.queries.js

@@ -57,8 +57,6 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
         v_model_yr
         v_make_desc
         v_model_desc
-        est_ct_fn
-        est_ct_ln
         labhrs: joblines_aggregate(
           where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
         ) {

client/src/graphql/conversations.queries.js

@@ -1,37 +1,5 @@
 import { gql } from "@apollo/client";
 
-export const CONVERSATION_LIST_SUBSCRIPTION = gql`
-  subscription CONVERSATION_LIST_SUBSCRIPTION($offset: Int!) {
-    conversations(
-      order_by: { updated_at: desc }
-      limit: 1
-      offset: $offset
-      where: { archived: { _eq: false } }
-    ) {
-      phone_num
-      id
-      updated_at
-      unreadcnt
-      messages_aggregate(
-        where: { read: { _eq: false }, isoutbound: { _eq: false } }
-      ) {
-        aggregate {
-          count
-        }
-      }
-      job_conversations {
-        job {
-          id
-          ro_number
-          ownr_fn
-          ownr_ln
-          ownr_co_nm
-        }
-      }
-    }
-  }
-`;
-
 export const UNREAD_CONVERSATION_COUNT = gql`
   query UNREAD_CONVERSATION_COUNT {
     messages_aggregate(
@@ -44,18 +12,6 @@ export const UNREAD_CONVERSATION_COUNT = gql`
   }
 `;
 
-export const UNREAD_CONVERSATION_COUNT_SUBSCRIPTION = gql`
-  subscription UNREAD_CONVERSATION_COUNT_SUBSCRIPTION {
-    messages_aggregate(
-      where: { read: { _eq: false }, isoutbound: { _eq: false } }
-    ) {
-      aggregate {
-        count
-      }
-    }
-  }
-`;
-
 export const CONVERSATION_LIST_QUERY = gql`
   query CONVERSATION_LIST_QUERY($offset: Int!) {
     conversations(

client/src/graphql/jobs.queries.js

@@ -1075,9 +1075,6 @@ export const UPDATE_JOB = gql`
         lbr_adjustments
         suspended
         queued_for_parts
-        scheduled_completion
-        actual_in
-        date_repairstarted
       }
     }
   }

client/src/graphql/notes.queries.js

@@ -13,7 +13,6 @@ export const INSERT_NEW_NOTE = gql`
         text
         updated_at
         audit
-        type
       }
     }
   }
@@ -42,7 +41,6 @@ export const QUERY_NOTES_BY_JOB_PK = gql`
         text
         updated_at
         audit
-        type
       }
     }
   }
@@ -62,7 +60,6 @@ export const UPDATE_NOTE = gql`
         text
         updated_at
         audit
-        type
       }
     }
   }

client/src/graphql/payments.queries.js

@@ -16,15 +16,19 @@ export const QUERY_ALL_PAYMENTS_PAGINATED = gql`
     $limit: Int
     $order: [payments_order_by!]!
   ) {
-    payments(offset: $offset, limit: $limit, order_by: $order) {
+    payments(
+      offset: $offset
+      limit: $limit
+      order_by: $order
+    ) {
       id
-      amount
       created_at
-      date
-      exportedat
       jobid
+      paymentnum
+      date
       job {
         id
+        ro_number
         ownerid
         ownr_co_nm
         ownr_fn
@@ -35,14 +39,15 @@ export const QUERY_ALL_PAYMENTS_PAGINATED = gql`
           ownr_fn
           ownr_ln
         }
-        ro_number
       }
-      memo
-      payer
-      paymentnum
-      stripeid
       transactionid
+      memo
       type
+      amount
+      stripeid
+      exportedat
+      stripeid
+      payer
     }
     payments_aggregate {
       aggregate {
@@ -57,31 +62,16 @@ export const UPDATE_PAYMENT = gql`
     update_payments(where: { id: { _eq: $paymentId } }, _set: $payment) {
       returning {
         id
-        amount
-        created_at
-        date
-        exportedat
-        jobid
-        job {
-          id
-          ownerid
-          ownr_co_nm
-          ownr_fn
-          ownr_ln
-          owner {
-            id
-            ownr_co_nm
-            ownr_fn
-            ownr_ln
-          }
-          ro_number
-        }
+        transactionid
         memo
+        type
+        amount
+        stripeid
+        exportedat
+        stripeid
         payer
         paymentnum
-        stripeid
-        transactionid
-        type
+        date
       }
     }
   }
@@ -95,31 +85,17 @@ export const UPDATE_PAYMENTS = gql`
     update_payments(where: { id: { _in: $paymentIdList } }, _set: $payment) {
       returning {
         id
-        amount
-        created_at
-        date
         exportedat
-        jobid
-        job {
-          id
-          ownerid
-          ownr_co_nm
-          ownr_fn
-          ownr_ln
-          owner {
-            id
-            ownr_co_nm
-            ownr_fn
-            ownr_ln
-          }
-          ro_number
-        }
+        transactionid
         memo
+        type
+        amount
+        stripeid
+        exportedat
+        stripeid
         payer
         paymentnum
-        stripeid
-        transactionid
-        type
+        date
       }
     }
   }
@@ -139,35 +115,36 @@ export const QUERY_JOB_PAYMENT_TOTALS = gql`
   }
 `;
 
-export const QUERY_PAYMENT_BY_ID = gql`
-  query QUERY_PAYMENT_BY_ID($paymentId: uuid!) {
-    payments_by_pk(id: $paymentId) {
+
+export const QUERY_PAYMENT_BY_ID = gql`query QUERY_PAYMENT_BY_ID($paymentId: uuid!) {
+  payments_by_pk(id: $paymentId) {
+    id
+    created_at
+    jobid
+    paymentnum
+    date
+    job {
       id
-      amount
-      created_at
-      exportedat
-      date
-      jobid
-      job {
+      ro_number
+      ownerid
+      ownr_co_nm
+      ownr_fn
+      ownr_ln
+      owner {
         id
-        ownerid
         ownr_co_nm
         ownr_fn
         ownr_ln
-        owner {
-          id
-          ownr_co_nm
-          ownr_fn
-          ownr_ln
-        }
-        ro_number
       }
-      memo
-      payer
-      paymentnum
-      stripeid
-      transactionid
-      type
     }
+    transactionid
+    memo
+    type
+    amount
+    stripeid
+    exportedat
+    stripeid
+    payer
   }
-`;
+}
+`

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

@@ -1,7 +1,5 @@
 import { Tabs } from "antd";
 import React, { useEffect } from "react";
-import { useHistory, useLocation } from "react-router-dom";
-import queryString from "query-string";
 import { useTranslation } from "react-i18next";
 import ShopEmployeesContainer from "../../components/shop-employees/shop-employees.container";
 import ShopInfoContainer from "../../components/shop-info/shop-info.container";
@@ -26,9 +24,6 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
   const { t } = useTranslation();
-  const history = useHistory();
-  const search = queryString.parse(useLocation().search);
-
   useEffect(() => {
     document.title = t("titles.shop");
     setSelectedHeader("shop");
@@ -42,10 +37,7 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
 
   return (
     <RbacWrapper action="shop:config">
-      <Tabs
-        defaultActiveKey={search.tab}
-        onChange={(key) => history.push({ search: `?tab=${key}` })}
-      >
+      <Tabs>
         <Tabs.TabPane tab={t("bodyshop.labels.shopinfo")} key="info">
           <ShopInfoContainer />
         </Tabs.TabPane>

client/src/translations/en_us/common.json

@@ -63,7 +63,6 @@
 				"scheduledfor": "Scheduled appointment for: ",
 				"severalerrorsfound": "Several jobs have issues which may prevent accurate smart scheduling. Click to expand.",
 				"smartscheduling": "Smart Scheduling",
-				"smspaymentreminder": "",
 				"suggesteddates": "Suggested Dates"
 			},
 			"successes": {
@@ -104,7 +103,6 @@
 				"admin_jobunvoid": "ADMIN: Job has been unvoided.",
 				"billposted": "Bill with invoice number {{invoice_number}} posted.",
 				"billupdated": "Bill with invoice number {{invoice_number}} updated.",
-				"failedpayment": "",
 				"jobassignmentchange": "Employee {{name}} assigned to {{operation}}",
 				"jobassignmentremoved": "Employee assignment removed for {{operation}}",
 				"jobchecklist": "Checklist type \"{{type}}\" completed.  In production set to {{inproduction}}.  Status set to {{status}}.",
@@ -229,7 +227,6 @@
 		},
 		"bodyshop": {
 			"actions": {
-				"add_task_preset": "",
 				"addapptcolor": "Add Appointment Color",
 				"addbucket": "Add Definition",
 				"addpartslocation": "Add Parts Location",
@@ -342,12 +339,6 @@
 				},
 				"md_payment_types": "Payment Types",
 				"md_referral_sources": "Referral Sources",
-				"md_tasks_presets": {
-					"hourstype": "",
-					"memo": "",
-					"name": "",
-					"percent": ""
-				},
 				"messaginglabel": "Messaging Preset Label",
 				"messagingtext": "Messaging Preset Text",
 				"noteslabel": "Note Label",
@@ -383,9 +374,6 @@
 						"export": "CSI -> Export",
 						"page": "CSI -> Page"
 					},
-					"employee_teams": {
-						"page": ""
-					},
 					"employees": {
 						"page": "Employees -> List"
 					},
@@ -444,15 +432,10 @@
 					},
 					"timetickets": {
 						"edit": "Time Tickets -> Edit",
-						"editcommitted": "",
 						"enter": "Time Tickets -> Enter",
 						"list": "Time Tickets -> List",
 						"shiftedit": "Time Tickets -> Shift Edit"
 					},
-					"ttapprovals": {
-						"approve": "",
-						"view": ""
-					},
 					"users": {
 						"editaccess": "Users -> Edit access"
 					}
@@ -470,8 +453,6 @@
 					"federal_tax": "Federal Tax",
 					"federal_tax_itc": "Federal Tax Credit",
 					"gst_override": "GST Override Account #",
-					"invoiceexemptcode": "",
-					"itemexemptcode": "",
 					"la1": "LA1",
 					"la2": "LA2",
 					"la3": "LA3",
@@ -523,12 +504,12 @@
 					"dailyhrslimit": "Daily Incoming Hours Limit"
 				},
 				"ssbuckets": {
-					"color": "Job Color",
 					"gte": "Greater Than/Equal to (hrs)",
 					"id": "ID",
 					"label": "Label",
 					"lt": "Less than (hrs)",
-					"target": "Target (count)"
+					"target": "Target (count)",
+					"color": "Job Color"
 				},
 				"state": "Province/State",
 				"state_tax_id": "Provincial/State Tax ID (PST,  QST)",
@@ -594,7 +575,6 @@
 					"title": "DMS"
 				},
 				"emaillater": "Email Later",
-				"employee_teams": "",
 				"employees": "Employees",
 				"estimators": "Estimators",
 				"filehandlers": "File Handlers",
@@ -603,7 +583,6 @@
 				"jobstatuses": "Job Statuses",
 				"laborrates": "Labor Rates",
 				"licensing": "Licensing",
-				"md_tasks_presets": "",
 				"md_to_emails": "Preset To Emails",
 				"md_to_emails_emails": "Emails",
 				"messagingpresets": "Messaging Presets",
@@ -630,7 +609,6 @@
 				"speedprint": "Speed Print Configuration",
 				"ssbuckets": "Job Size Definitions",
 				"systemsettings": "System Settings",
-				"task-presets": "",
 				"workingdays": "Working Days"
 			},
 			"successes": {
@@ -930,18 +908,6 @@
 				"sent": "Email sent successfully."
 			}
 		},
-		"employee_teams": {
-			"actions": {
-				"new": "",
-				"newmember": ""
-			},
-			"fields": {
-				"active": "",
-				"employeeid": "",
-				"name": "",
-				"percentage": ""
-			}
-		},
 		"employees": {
 			"actions": {
 				"addvacation": "Add Vacation",
@@ -1181,30 +1147,6 @@
 				"updated": "Inventory line updated."
 			}
 		},
-		"job_payments": {
-			"buttons": {
-				"goback": "",
-				"proceedtopayment": "",
-				"refundpayment": ""
-			},
-			"notifications": {
-				"error": {
-					"description": "",
-					"title": ""
-				}
-			},
-			"titles": {
-				"amount": "",
-				"dateOfPayment": "",
-				"descriptions": "",
-				"payer": "",
-				"payername": "",
-				"paymentid": "",
-				"paymenttype": "",
-				"refundamount": "",
-				"transactionid": ""
-			}
-		},
 		"joblines": {
 			"actions": {
 				"converttolabor": "Convert amount to Labor.",
@@ -1437,7 +1379,7 @@
 				"ded_amt": "Deductible",
 				"ded_note": "Deductible Note",
 				"ded_status": "Deductible Status",
-				"depreciation_taxes": "Betterment/Depreciation/Taxes",
+				"depreciation_taxes": "Depreciation/Taxes",
 				"dms": {
 					"address": "Customer Address",
 					"amount": "Amount",
@@ -1637,7 +1579,6 @@
 				"scheddates": "Schedule Dates"
 			},
 			"labels": {
-				"act_price_ppc": "",
 				"actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).",
 				"actual_delivery_inferred": "$t(jobs.fields.actual_delivery) inferred using $t(jobs.fields.scheduled_delivery).",
 				"actual_in_inferred": "$t(jobs.fields.actual_in) inferred using $t(jobs.fields.scheduled_in).",
@@ -1774,7 +1715,6 @@
 					"partstotal": "This is the total of all parts and sublet amounts on the vehicle (some of these may require an in-house invoice).<br/>\nItems such as shop and paint materials, labor online lines, etc. are not included in this total.",
 					"totalreturns": "The total <b>retail</b> amount of returns created for this job."
 				},
-				"ppc": "",
 				"profileadjustments": "",
 				"prt_dsmk_total": "Line Item Adjustment",
 				"rates": "Rates",
@@ -1915,7 +1855,6 @@
 				"customers": "Customers",
 				"dashboard": "Dashboard",
 				"enterbills": "Enter Bills",
-				"entercardpayment": "",
 				"enterpayment": "Enter Payments",
 				"entertimeticket": "Enter Time Tickets",
 				"export": "Export",
@@ -1927,7 +1866,6 @@
 				"newjob": "Create New Job",
 				"owners": "Owners",
 				"parts-queue": "Parts Queue",
-				"paymentremindersms": "",
 				"phonebook": "Phonebook",
 				"productionboard": "Production Board - Visual",
 				"productionlist": "Production Board - List",
@@ -1953,7 +1891,6 @@
 				"shop_vendors": "Vendors",
 				"temporarydocs": "Temporary Documents",
 				"timetickets": "Time Tickets",
-				"ttapprovals": "",
 				"vehicles": "Vehicles"
 			},
 			"jobsactions": {
@@ -2037,16 +1974,6 @@
 				"critical": "Critical",
 				"private": "Private",
 				"text": "Contents",
-				"type": "Type",
-				"types": {
-					"customer": "Customer",
-					"general": "General",
-					"office": "Office",
-					"paint": "Paint",
-					"parts": "Parts",
-					"shop": "Shop",
-					"supplement": "Supplement"
-				},
 				"updatedat": "Updated At"
 			},
 			"labels": {
@@ -2217,13 +2144,10 @@
 				"new": "New Payment",
 				"signup": "Please contact support to sign up for electronic payments.",
 				"title": "Payments",
-				"totalpayments": "Total Payments",
-				"markexported": "Mark Exported",
-				"markforreexport": "Mark for Re-export"
+				"totalpayments": "Total Payments"
 			},
 			"successes": {
 				"exported": "Payment(s) exported successfully.",
-				"markreexported": "Payment marked for re-export successfully",
 				"markexported": "Payment(s) marked exported.",
 				"payment": "Payment created successfully. ",
 				"stripe": "Credit card transaction charged successfully."
@@ -2319,7 +2243,7 @@
 				"folder_label_multiple": "Folder Label - Multi",
 				"glass_express_checklist": "Glass Express Checklist",
 				"guarantee": "Repair Guarantee",
-				"individual_job_note": "RO Job Note",
+				"individual_job_note": "Job Note RO # {{ro_number}}",
 				"invoice_customer_payable": "Invoice (Customer Payable)",
 				"invoice_total_payable": "Invoice (Total Payable)",
 				"iou_form": "IOU Form",
@@ -2335,8 +2259,7 @@
 				"mechanical_authorization": "Mechanical Authorization",
 				"mpi_animal_checklist": "MPI - Animal Checklist",
 				"mpi_eglass_auth": "MPI - eGlass Auth",
-				"mpi_final_acct_sheet": "MPI - Final Accounting Sheet (Direct Repair)",
-				"mpi_final_repair_acct_sheet": "MPI - Final Accounting Sheet",
+				"mpi_final_acct_sheet": "MPI - Final Accounting Sheet",
 				"paint_grid": "Paint Grid",
 				"parts_invoice_label_single": "Parts Label Single",
 				"parts_label_multiple": "Parts Label - Multi",
@@ -2398,7 +2321,6 @@
 			},
 			"subjects": {
 				"jobs": {
-					"individual_job_note": "Job Note RO: {{ro_number}}",
 					"parts_order": "Parts Order PO: {{ro_number}} - {{name}}",
 					"sublet_order": "Sublet Order PO: {{ro_number}} - {{name}}"
 				}
@@ -2442,7 +2364,6 @@
 						"qbo_usa": "QBO USA"
 					}
 				},
-				"cardcolor": "Card Colors",
 				"cardsettings": "Card Settings",
 				"clm_no": "Claim Number",
 				"comment": "Comment",
@@ -2453,7 +2374,6 @@
 				"ins_co_nm": "Insurance Company Name",
 				"jobdetail": "Job Details",
 				"laborhrs": "Labor Hours",
-				"legend": "Legend:",
 				"note": "Production Note",
 				"ownr_nm": "Owner Name",
 				"paintpriority": "P/P",
@@ -2466,7 +2386,9 @@
 				"sublets": "Sublets",
 				"totalhours": "Total Hrs ",
 				"touchtime": "T/T",
-				"viewname": "View Name"
+				"viewname": "View Name",
+				"legend": "Legend:",
+				"cardcolor": "Card Colors"
 			},
 			"successes": {
 				"removed": "Job removed from production."
@@ -2624,7 +2546,6 @@
 				"atssummary": "ATS Summary",
 				"employeevacation": "Employee Vacations",
 				"ins_co_nm_filter": "Filter by Insurance Company",
-				"estimators": "Filter by Writer/Customer Rep.",
 				"intake": "Intake Events",
 				"manual": "Manual Events",
 				"manualevent": "Add Manual Event"
@@ -2693,7 +2614,6 @@
 		},
 		"timetickets": {
 			"actions": {
-				"claimtasks": "",
 				"clockin": "Clock In",
 				"clockout": "Clock Out",
 				"enter": "Enter New Time Ticket",
@@ -2714,12 +2634,10 @@
 				"clockhours": "Clock Hours",
 				"clockoff": "Clock Off",
 				"clockon": "Clocked In",
-				"committed": "",
 				"cost_center": "Cost Center",
 				"date": "Ticket Date",
 				"efficiency": "Efficiency",
 				"employee": "Employee",
-				"employee_team": "",
 				"flat_rate": "Flat Rate?",
 				"memo": "Memo",
 				"productivehrs": "Productive Hours",
@@ -2806,7 +2724,6 @@
 				"shop-vendors": "Vendors",
 				"temporarydocs": "Temporary Documents",
 				"timetickets": "Time Tickets",
-				"ttapprovals": "",
 				"vehicle-details": "Vehicle: {{vehicle}}",
 				"vehicles": "Vehicles"
 			},
@@ -2852,15 +2769,9 @@
 			"shop_vendors": "Vendors | $t(titles.app)",
 			"temporarydocs": "Temporary Documents | $t(titles.app)",
 			"timetickets": "Time Tickets | $t(titles.app)",
-			"ttapprovals": "",
 			"vehicledetail": "Vehicle Details {{vehicle}} | $t(titles.app)",
 			"vehicles": "All Vehicles | $t(titles.app)"
 		},
-		"tt_approvals": {
-			"actions": {
-				"approveselected": ""
-			}
-		},
 		"user": {
 			"actions": {
 				"changepassword": "Change Password",

client/src/translations/es/common.json

@@ -63,7 +63,6 @@
 				"scheduledfor": "Cita programada para:",
 				"severalerrorsfound": "",
 				"smartscheduling": "",
-				"smspaymentreminder": "",
 				"suggesteddates": ""
 			},
 			"successes": {
@@ -104,7 +103,6 @@
 				"admin_jobunvoid": "",
 				"billposted": "",
 				"billupdated": "",
-				"failedpayment": "",
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
@@ -229,7 +227,6 @@
 		},
 		"bodyshop": {
 			"actions": {
-				"add_task_preset": "",
 				"addapptcolor": "",
 				"addbucket": "",
 				"addpartslocation": "",
@@ -342,12 +339,6 @@
 				},
 				"md_payment_types": "",
 				"md_referral_sources": "",
-				"md_tasks_presets": {
-					"hourstype": "",
-					"memo": "",
-					"name": "",
-					"percent": ""
-				},
 				"messaginglabel": "",
 				"messagingtext": "",
 				"noteslabel": "",
@@ -383,9 +374,6 @@
 						"export": "",
 						"page": ""
 					},
-					"employee_teams": {
-						"page": ""
-					},
 					"employees": {
 						"page": ""
 					},
@@ -444,15 +432,10 @@
 					},
 					"timetickets": {
 						"edit": "",
-						"editcommitted": "",
 						"enter": "",
 						"list": "",
 						"shiftedit": ""
 					},
-					"ttapprovals": {
-						"approve": "",
-						"view": ""
-					},
 					"users": {
 						"editaccess": ""
 					}
@@ -470,8 +453,6 @@
 					"federal_tax": "",
 					"federal_tax_itc": "",
 					"gst_override": "",
-					"invoiceexemptcode": "",
-					"itemexemptcode": "",
 					"la1": "",
 					"la2": "",
 					"la3": "",
@@ -523,7 +504,6 @@
 					"dailyhrslimit": ""
 				},
 				"ssbuckets": {
-					"color": "",
 					"gte": "",
 					"id": "",
 					"label": "",
@@ -594,7 +574,6 @@
 					"title": ""
 				},
 				"emaillater": "",
-				"employee_teams": "",
 				"employees": "",
 				"estimators": "",
 				"filehandlers": "",
@@ -603,7 +582,6 @@
 				"jobstatuses": "",
 				"laborrates": "",
 				"licensing": "",
-				"md_tasks_presets": "",
 				"md_to_emails": "",
 				"md_to_emails_emails": "",
 				"messagingpresets": "",
@@ -630,7 +608,6 @@
 				"speedprint": "",
 				"ssbuckets": "",
 				"systemsettings": "",
-				"task-presets": "",
 				"workingdays": ""
 			},
 			"successes": {
@@ -930,18 +907,6 @@
 				"sent": "Correo electrónico enviado con éxito."
 			}
 		},
-		"employee_teams": {
-			"actions": {
-				"new": "",
-				"newmember": ""
-			},
-			"fields": {
-				"active": "",
-				"employeeid": "",
-				"name": "",
-				"percentage": ""
-			}
-		},
 		"employees": {
 			"actions": {
 				"addvacation": "",
@@ -1181,30 +1146,6 @@
 				"updated": ""
 			}
 		},
-		"job_payments": {
-			"buttons": {
-				"goback": "",
-				"proceedtopayment": "",
-				"refundpayment": ""
-			},
-			"notifications": {
-				"error": {
-					"description": "",
-					"title": ""
-				}
-			},
-			"titles": {
-				"amount": "",
-				"dateOfPayment": "",
-				"descriptions": "",
-				"payer": "",
-				"payername": "",
-				"paymentid": "",
-				"paymenttype": "",
-				"refundamount": "",
-				"transactionid": ""
-			}
-		},
 		"joblines": {
 			"actions": {
 				"converttolabor": "",
@@ -1637,7 +1578,6 @@
 				"scheddates": ""
 			},
 			"labels": {
-				"act_price_ppc": "",
 				"actual_completion_inferred": "",
 				"actual_delivery_inferred": "",
 				"actual_in_inferred": "",
@@ -1774,7 +1714,6 @@
 					"partstotal": "",
 					"totalreturns": ""
 				},
-				"ppc": "",
 				"profileadjustments": "",
 				"prt_dsmk_total": "",
 				"rates": "Tarifas",
@@ -1915,7 +1854,6 @@
 				"customers": "Clientes",
 				"dashboard": "",
 				"enterbills": "",
-				"entercardpayment": "",
 				"enterpayment": "",
 				"entertimeticket": "",
 				"export": "",
@@ -1927,7 +1865,6 @@
 				"newjob": "",
 				"owners": "propietarios",
 				"parts-queue": "",
-				"paymentremindersms": "",
 				"phonebook": "",
 				"productionboard": "",
 				"productionlist": "",
@@ -1953,7 +1890,6 @@
 				"shop_vendors": "Vendedores",
 				"temporarydocs": "",
 				"timetickets": "",
-				"ttapprovals": "",
 				"vehicles": "Vehículos"
 			},
 			"jobsactions": {
@@ -2037,16 +1973,6 @@
 				"critical": "Crítico",
 				"private": "Privado",
 				"text": "Contenido",
-				"type": "",
-				"types": {
-					"customer": "",
-					"general": "",
-					"office": "",
-					"paint": "",
-					"parts": "",
-					"shop": "",
-					"supplement": ""
-				},
 				"updatedat": "Actualizado en"
 			},
 			"labels": {
@@ -2333,7 +2259,6 @@
 				"mpi_animal_checklist": "",
 				"mpi_eglass_auth": "",
 				"mpi_final_acct_sheet": "",
-				"mpi_final_repair_acct_sheet": "",
 				"paint_grid": "",
 				"parts_invoice_label_single": "",
 				"parts_label_multiple": "",
@@ -2395,7 +2320,6 @@
 			},
 			"subjects": {
 				"jobs": {
-					"individual_job_note": "",
 					"parts_order": "",
 					"sublet_order": ""
 				}
@@ -2439,7 +2363,6 @@
 						"qbo_usa": ""
 					}
 				},
-				"cardcolor": "",
 				"cardsettings": "",
 				"clm_no": "",
 				"comment": "",
@@ -2450,7 +2373,6 @@
 				"ins_co_nm": "",
 				"jobdetail": "",
 				"laborhrs": "",
-				"legend": "",
 				"note": "",
 				"ownr_nm": "",
 				"paintpriority": "",
@@ -2689,7 +2611,6 @@
 		},
 		"timetickets": {
 			"actions": {
-				"claimtasks": "",
 				"clockin": "",
 				"clockout": "",
 				"enter": "",
@@ -2710,12 +2631,10 @@
 				"clockhours": "",
 				"clockoff": "",
 				"clockon": "",
-				"committed": "",
 				"cost_center": "",
 				"date": "",
 				"efficiency": "",
 				"employee": "",
-				"employee_team": "",
 				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
@@ -2802,7 +2721,6 @@
 				"shop-vendors": "",
 				"temporarydocs": "",
 				"timetickets": "",
-				"ttapprovals": "",
 				"vehicle-details": "",
 				"vehicles": ""
 			},
@@ -2848,15 +2766,9 @@
 			"shop_vendors": "Vendedores | $t(titles.app)",
 			"temporarydocs": "",
 			"timetickets": "",
-			"ttapprovals": "",
 			"vehicledetail": "Detalles del vehículo {{vehicle}} | $t(titles.app)",
 			"vehicles": "Todos los vehiculos | $t(titles.app)"
 		},
-		"tt_approvals": {
-			"actions": {
-				"approveselected": ""
-			}
-		},
 		"user": {
 			"actions": {
 				"changepassword": "",

client/src/translations/fr/common.json

@@ -63,7 +63,6 @@
 				"scheduledfor": "Rendez-vous prévu pour:",
 				"severalerrorsfound": "",
 				"smartscheduling": "",
-				"smspaymentreminder": "",
 				"suggesteddates": ""
 			},
 			"successes": {
@@ -104,7 +103,6 @@
 				"admin_jobunvoid": "",
 				"billposted": "",
 				"billupdated": "",
-				"failedpayment": "",
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
@@ -229,7 +227,6 @@
 		},
 		"bodyshop": {
 			"actions": {
-				"add_task_preset": "",
 				"addapptcolor": "",
 				"addbucket": "",
 				"addpartslocation": "",
@@ -342,12 +339,6 @@
 				},
 				"md_payment_types": "",
 				"md_referral_sources": "",
-				"md_tasks_presets": {
-					"hourstype": "",
-					"memo": "",
-					"name": "",
-					"percent": ""
-				},
 				"messaginglabel": "",
 				"messagingtext": "",
 				"noteslabel": "",
@@ -383,9 +374,6 @@
 						"export": "",
 						"page": ""
 					},
-					"employee_teams": {
-						"page": ""
-					},
 					"employees": {
 						"page": ""
 					},
@@ -444,15 +432,10 @@
 					},
 					"timetickets": {
 						"edit": "",
-						"editcommitted": "",
 						"enter": "",
 						"list": "",
 						"shiftedit": ""
 					},
-					"ttapprovals": {
-						"approve": "",
-						"view": ""
-					},
 					"users": {
 						"editaccess": ""
 					}
@@ -470,8 +453,6 @@
 					"federal_tax": "",
 					"federal_tax_itc": "",
 					"gst_override": "",
-					"invoiceexemptcode": "",
-					"itemexemptcode": "",
 					"la1": "",
 					"la2": "",
 					"la3": "",
@@ -523,7 +504,6 @@
 					"dailyhrslimit": ""
 				},
 				"ssbuckets": {
-					"color": "",
 					"gte": "",
 					"id": "",
 					"label": "",
@@ -594,7 +574,6 @@
 					"title": ""
 				},
 				"emaillater": "",
-				"employee_teams": "",
 				"employees": "",
 				"estimators": "",
 				"filehandlers": "",
@@ -603,7 +582,6 @@
 				"jobstatuses": "",
 				"laborrates": "",
 				"licensing": "",
-				"md_tasks_presets": "",
 				"md_to_emails": "",
 				"md_to_emails_emails": "",
 				"messagingpresets": "",
@@ -630,7 +608,6 @@
 				"speedprint": "",
 				"ssbuckets": "",
 				"systemsettings": "",
-				"task-presets": "",
 				"workingdays": ""
 			},
 			"successes": {
@@ -930,18 +907,6 @@
 				"sent": "E-mail envoyé avec succès."
 			}
 		},
-		"employee_teams": {
-			"actions": {
-				"new": "",
-				"newmember": ""
-			},
-			"fields": {
-				"active": "",
-				"employeeid": "",
-				"name": "",
-				"percentage": ""
-			}
-		},
 		"employees": {
 			"actions": {
 				"addvacation": "",
@@ -1181,30 +1146,6 @@
 				"updated": ""
 			}
 		},
-		"job_payments": {
-			"buttons": {
-				"goback": "",
-				"proceedtopayment": "",
-				"refundpayment": ""
-			},
-			"notifications": {
-				"error": {
-					"description": "",
-					"title": ""
-				}
-			},
-			"titles": {
-				"amount": "",
-				"dateOfPayment": "",
-				"descriptions": "",
-				"payer": "",
-				"payername": "",
-				"paymentid": "",
-				"paymenttype": "",
-				"refundamount": "",
-				"transactionid": ""
-			}
-		},
 		"joblines": {
 			"actions": {
 				"converttolabor": "",
@@ -1637,7 +1578,6 @@
 				"scheddates": ""
 			},
 			"labels": {
-				"act_price_ppc": "",
 				"actual_completion_inferred": "",
 				"actual_delivery_inferred": "",
 				"actual_in_inferred": "",
@@ -1774,7 +1714,6 @@
 					"partstotal": "",
 					"totalreturns": ""
 				},
-				"ppc": "",
 				"profileadjustments": "",
 				"prt_dsmk_total": "",
 				"rates": "Les taux",
@@ -1915,7 +1854,6 @@
 				"customers": "Les clients",
 				"dashboard": "",
 				"enterbills": "",
-				"entercardpayment": "",
 				"enterpayment": "",
 				"entertimeticket": "",
 				"export": "",
@@ -1927,7 +1865,6 @@
 				"newjob": "",
 				"owners": "Propriétaires",
 				"parts-queue": "",
-				"paymentremindersms": "",
 				"phonebook": "",
 				"productionboard": "",
 				"productionlist": "",
@@ -1953,7 +1890,6 @@
 				"shop_vendors": "Vendeurs",
 				"temporarydocs": "",
 				"timetickets": "",
-				"ttapprovals": "",
 				"vehicles": "Véhicules"
 			},
 			"jobsactions": {
@@ -2037,16 +1973,6 @@
 				"critical": "Critique",
 				"private": "privé",
 				"text": "Contenu",
-				"type": "",
-				"types": {
-					"customer": "",
-					"general": "",
-					"office": "",
-					"paint": "",
-					"parts": "",
-					"shop": "",
-					"supplement": ""
-				},
 				"updatedat": "Mis à jour à"
 			},
 			"labels": {
@@ -2333,7 +2259,6 @@
 				"mpi_animal_checklist": "",
 				"mpi_eglass_auth": "",
 				"mpi_final_acct_sheet": "",
-				"mpi_final_repair_acct_sheet": "",
 				"paint_grid": "",
 				"parts_invoice_label_single": "",
 				"parts_label_multiple": "",
@@ -2395,7 +2320,6 @@
 			},
 			"subjects": {
 				"jobs": {
-					"individual_job_note": "",
 					"parts_order": "",
 					"sublet_order": ""
 				}
@@ -2439,7 +2363,6 @@
 						"qbo_usa": ""
 					}
 				},
-				"cardcolor": "",
 				"cardsettings": "",
 				"clm_no": "",
 				"comment": "",
@@ -2450,7 +2373,6 @@
 				"ins_co_nm": "",
 				"jobdetail": "",
 				"laborhrs": "",
-				"legend": "",
 				"note": "",
 				"ownr_nm": "",
 				"paintpriority": "",
@@ -2689,7 +2611,6 @@
 		},
 		"timetickets": {
 			"actions": {
-				"claimtasks": "",
 				"clockin": "",
 				"clockout": "",
 				"enter": "",
@@ -2710,12 +2631,10 @@
 				"clockhours": "",
 				"clockoff": "",
 				"clockon": "",
-				"committed": "",
 				"cost_center": "",
 				"date": "",
 				"efficiency": "",
 				"employee": "",
-				"employee_team": "",
 				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
@@ -2802,7 +2721,6 @@
 				"shop-vendors": "",
 				"temporarydocs": "",
 				"timetickets": "",
-				"ttapprovals": "",
 				"vehicle-details": "",
 				"vehicles": ""
 			},
@@ -2848,15 +2766,9 @@
 			"shop_vendors": "Vendeurs | $t(titles.app)",
 			"temporarydocs": "",
 			"timetickets": "",
-			"ttapprovals": "",
 			"vehicledetail": "Détails du véhicule {{vehicle} | $t(titles.app)",
 			"vehicles": "Tous les véhicules | $t(titles.app)"
 		},
-		"tt_approvals": {
-			"actions": {
-				"approveselected": ""
-			}
-		},
 		"user": {
 			"actions": {
 				"changepassword": "",

client/src/utils/TemplateConstants.js

@@ -7,24 +7,22 @@ export const EmailSettings = {
 
 export const TemplateList = (type, context) => {
   //const { bodyshop } = store.getState().user;
+
   return {
     //If there's no type or the type is job, send it back.
     ...(!type || type === "job"
       ? {
           casl_authorization: {
             title: i18n.t("printcenter.jobs.casl_authorization"),
-            description: "",
+            description: "CASL Authorization",
             subject: i18n.t("printcenter.jobs.casl_authorization"),
             key: "casl_authorization",
             disabled: false,
             group: "authorization",
-            regions: {
-              CA: true,
-            },
           },
           fippa_authorization: {
             title: i18n.t("printcenter.jobs.fippa_authorization"),
-            description: "",
+            description: "CASL Authorization",
             subject: i18n.t("printcenter.jobs.fippa_authorization"),
             key: "fippa_authorization",
             disabled: false,
@@ -32,7 +30,7 @@ export const TemplateList = (type, context) => {
           },
           diagnostic_authorization: {
             title: i18n.t("printcenter.jobs.diagnostic_authorization"),
-            description: "",
+            description: "Diagnostic Authorization",
             subject: i18n.t("printcenter.jobs.diagnostic_authorization"),
             key: "diagnostic_authorization",
             disabled: false,
@@ -40,7 +38,7 @@ export const TemplateList = (type, context) => {
           },
           mechanical_authorization: {
             title: i18n.t("printcenter.jobs.mechanical_authorization"),
-            description: "",
+            description: "Diagnostic Authorization",
             subject: i18n.t("printcenter.jobs.mechanical_authorization"),
             key: "mechanical_authorization",
             disabled: false,
@@ -48,7 +46,7 @@ export const TemplateList = (type, context) => {
           },
           appointment_reminder: {
             title: i18n.t("printcenter.jobs.appointment_reminder"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.appointment_reminder"),
             key: "appointment_reminder",
             disabled: false,
@@ -56,7 +54,7 @@ export const TemplateList = (type, context) => {
           },
           estimate_followup: {
             title: i18n.t("printcenter.jobs.estimate_followup"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.estimate_followup"),
             key: "estimate_followup",
             disabled: false,
@@ -64,7 +62,7 @@ export const TemplateList = (type, context) => {
           },
           express_repair_checklist: {
             title: i18n.t("printcenter.jobs.express_repair_checklist"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.express_repair_checklist"),
             key: "express_repair_checklist",
             disabled: false,
@@ -72,7 +70,7 @@ export const TemplateList = (type, context) => {
           },
           glass_express_checklist: {
             title: i18n.t("printcenter.jobs.glass_express_checklist"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.glass_express_checklist"),
             key: "glass_express_checklist",
             disabled: false,
@@ -80,7 +78,7 @@ export const TemplateList = (type, context) => {
           },
           stolen_recovery_checklist: {
             title: i18n.t("printcenter.jobs.stolen_recovery_checklist"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.stolen_recovery_checklist"),
             key: "stolen_recovery_checklist",
             disabled: false,
@@ -88,7 +86,7 @@ export const TemplateList = (type, context) => {
           },
           vehicle_check_in: {
             title: i18n.t("printcenter.jobs.vehicle_check_in"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.vehicle_check_in"),
             key: "vehicle_check_in",
             disabled: false,
@@ -96,7 +94,7 @@ export const TemplateList = (type, context) => {
           },
           parts_order_history: {
             title: i18n.t("printcenter.jobs.parts_order_history"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.parts_order_history"),
             key: "parts_order_history",
             disabled: false,
@@ -104,7 +102,7 @@ export const TemplateList = (type, context) => {
           },
           job_notes: {
             title: i18n.t("printcenter.jobs.job_notes"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.job_notes"),
             key: "job_notes",
             disabled: false,
@@ -112,7 +110,7 @@ export const TemplateList = (type, context) => {
           },
           ro_with_description: {
             title: i18n.t("printcenter.jobs.ro_with_description"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.ro_with_description"),
             key: "ro_with_description",
             disabled: false,
@@ -120,7 +118,7 @@ export const TemplateList = (type, context) => {
           },
           window_tag: {
             title: i18n.t("printcenter.jobs.window_tag"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.window_tag"),
             key: "window_tag",
             disabled: false,
@@ -128,7 +126,7 @@ export const TemplateList = (type, context) => {
           },
           supplement_request: {
             title: i18n.t("printcenter.jobs.supplement_request"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.supplement_request"),
             key: "supplement_request",
             disabled: false,
@@ -136,7 +134,7 @@ export const TemplateList = (type, context) => {
           },
           estimate: {
             title: i18n.t("printcenter.jobs.estimate"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.estimate"),
             key: "estimate",
             disabled: false,
@@ -144,7 +142,7 @@ export const TemplateList = (type, context) => {
           },
           parts_list: {
             title: i18n.t("printcenter.jobs.parts_list"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.parts_list"),
             key: "parts_list",
             disabled: false,
@@ -152,7 +150,7 @@ export const TemplateList = (type, context) => {
           },
           coversheet_portrait: {
             title: i18n.t("printcenter.jobs.coversheet_portrait"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.coversheet_portrait"),
             key: "coversheet_portrait",
             disabled: false,
@@ -160,7 +158,7 @@ export const TemplateList = (type, context) => {
           },
           coversheet_landscape: {
             title: i18n.t("printcenter.jobs.coversheet_landscape"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.coversheet_landscape"),
             key: "coversheet_landscape",
             disabled: false,
@@ -168,7 +166,7 @@ export const TemplateList = (type, context) => {
           },
           key_tag: {
             title: i18n.t("printcenter.jobs.key_tag"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.key_tag"),
             key: "key_tag",
             disabled: false,
@@ -176,7 +174,7 @@ export const TemplateList = (type, context) => {
           },
           paint_grid: {
             title: i18n.t("printcenter.jobs.paint_grid"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.paint_grid"),
             key: "paint_grid",
             disabled: false,
@@ -184,7 +182,7 @@ export const TemplateList = (type, context) => {
           },
           worksheet_by_line_number: {
             title: i18n.t("printcenter.jobs.worksheet_by_line_number"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.worksheet_by_line_number"),
             key: "worksheet_by_line_number",
             disabled: false,
@@ -194,7 +192,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_type"
             ),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_type"
             ),
@@ -204,7 +202,7 @@ export const TemplateList = (type, context) => {
           },
           worksheet_sorted_by_operation: {
             title: i18n.t("printcenter.jobs.worksheet_sorted_by_operation"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.worksheet_sorted_by_operation"),
             key: "worksheet_sorted_by_operation",
             disabled: false,
@@ -214,7 +212,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_no_hours"
             ),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_no_hours"
             ),
@@ -226,7 +224,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_part_type"
             ),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_part_type"
             ),
@@ -236,7 +234,7 @@ export const TemplateList = (type, context) => {
           },
           payments_by_job: {
             title: i18n.t("printcenter.jobs.payments_by_job"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.payments_by_job"),
             key: "payments_by_job",
             disabled: false,
@@ -244,7 +242,7 @@ export const TemplateList = (type, context) => {
           },
           final_invoice: {
             title: i18n.t("printcenter.jobs.final_invoice"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.final_invoice"),
             key: "final_invoice",
             disabled: false,
@@ -252,7 +250,7 @@ export const TemplateList = (type, context) => {
           },
           payment_request: {
             title: i18n.t("printcenter.jobs.payment_request"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.payment_request"),
             key: "payment_request",
             disabled: false,
@@ -260,7 +258,7 @@ export const TemplateList = (type, context) => {
           },
           invoice_total_payable: {
             title: i18n.t("printcenter.jobs.invoice_total_payable"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.invoice_total_payable"),
             key: "invoice_total_payable",
             disabled: false,
@@ -268,7 +266,7 @@ export const TemplateList = (type, context) => {
           },
           invoice_customer_payable: {
             title: i18n.t("printcenter.jobs.invoice_customer_payable"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.invoice_customer_payable"),
             key: "invoice_customer_payable",
             disabled: false,
@@ -276,7 +274,7 @@ export const TemplateList = (type, context) => {
           },
           ro_totals: {
             title: i18n.t("printcenter.jobs.ro_totals"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.ro_totals"),
             key: "ro_totals",
             disabled: false,
@@ -284,7 +282,7 @@ export const TemplateList = (type, context) => {
           },
           job_costing_ro: {
             title: i18n.t("printcenter.jobs.job_costing_ro"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.job_costing_ro"),
             key: "job_costing_ro",
             disabled: false,
@@ -292,7 +290,7 @@ export const TemplateList = (type, context) => {
           },
           purchases_by_ro_detail: {
             title: i18n.t("printcenter.jobs.purchases_by_ro_detail"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.purchases_by_ro_detail"),
             key: "purchases_by_ro_detail",
             disabled: false,
@@ -300,7 +298,7 @@ export const TemplateList = (type, context) => {
           },
           purchases_by_ro_summary: {
             title: i18n.t("printcenter.jobs.purchases_by_ro_summary"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.purchases_by_ro_summary"),
             key: "purchases_by_ro_summary",
             disabled: false,
@@ -308,7 +306,7 @@ export const TemplateList = (type, context) => {
           },
           filing_coversheet_portrait: {
             title: i18n.t("printcenter.jobs.filing_coversheet_portrait"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.filing_coversheet_portrait"),
             key: "filing_coversheet_portrait",
             disabled: false,
@@ -316,7 +314,7 @@ export const TemplateList = (type, context) => {
           },
           filing_coversheet_landscape: {
             title: i18n.t("printcenter.jobs.filing_coversheet_landscape"),
-            description: "",
+            description: "CASL Authorization",
             subject: i18n.t("printcenter.jobs.filing_coversheet_landscape"),
             key: "filing_coversheet_landscape",
             disabled: false,
@@ -324,7 +322,7 @@ export const TemplateList = (type, context) => {
           },
           qc_sheet: {
             title: i18n.t("printcenter.jobs.qc_sheet"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.qc_sheet"),
             key: "qc_sheet",
             disabled: false,
@@ -332,7 +330,7 @@ export const TemplateList = (type, context) => {
           },
           vehicle_delivery_check: {
             title: i18n.t("printcenter.jobs.vehicle_delivery_check"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.vehicle_delivery_check"),
             key: "vehicle_delivery_check",
             disabled: false,
@@ -340,7 +338,7 @@ export const TemplateList = (type, context) => {
           },
           guarantee: {
             title: i18n.t("printcenter.jobs.guarantee"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.guarantee"),
             key: "guarantee",
             disabled: false,
@@ -348,7 +346,7 @@ export const TemplateList = (type, context) => {
           },
           csi_invitation: {
             title: i18n.t("printcenter.jobs.csi_invitation"),
-            description: "",
+            description: "CSI invite",
             key: "csi_invitation",
             subject: i18n.t("printcenter.jobs.csi_invitation"),
             disabled: false,
@@ -356,7 +354,7 @@ export const TemplateList = (type, context) => {
           },
           window_tag_sublet: {
             title: i18n.t("printcenter.jobs.window_tag_sublet"),
-            description: "",
+            description: "Window Tag Sublet",
             key: "window_tag_sublet",
             subject: i18n.t("printcenter.jobs.window_tag_sublet"),
             disabled: false,
@@ -364,7 +362,7 @@ export const TemplateList = (type, context) => {
           },
           thank_you_ro: {
             title: i18n.t("printcenter.jobs.thank_you_ro"),
-            description: "",
+            description: "Thank You Letter by RO",
             key: "thank_you_ro",
             subject: i18n.t("printcenter.jobs.thank_you_ro"),
             disabled: false,
@@ -372,7 +370,7 @@ export const TemplateList = (type, context) => {
           },
           parts_label_single: {
             title: i18n.t("printcenter.jobs.parts_label_single"),
-            description: "",
+            description: "Thank You Letter by RO",
             key: "parts_label_single",
             subject: i18n.t("printcenter.jobs.parts_label_single"),
             disabled: false,
@@ -381,7 +379,7 @@ export const TemplateList = (type, context) => {
           },
           envelope_return_address: {
             title: i18n.t("printcenter.jobs.envelope_return_address"),
-            description: "",
+            description: "All Jobs Notes",
             subject: i18n.t("printcenter.jobs.envelope_return_address"),
             key: "envelope_return_address",
             disabled: false,
@@ -390,7 +388,7 @@ export const TemplateList = (type, context) => {
           },
           sgi_certificate_of_repairs: {
             title: i18n.t("printcenter.jobs.sgi_certificate_of_repairs"),
-            description: "",
+            description: "Thank You Letter by RO",
             key: "sgi_certificate_of_repairs",
             subject: i18n.t("printcenter.jobs.sgi_certificate_of_repairs"),
             disabled: false,
@@ -401,7 +399,7 @@ export const TemplateList = (type, context) => {
           },
           sgi_windshield_auth: {
             title: i18n.t("printcenter.jobs.sgi_windshield_auth"),
-            description: "",
+            description: "Thank You Letter by RO",
             key: "sgi_windshield_auth",
             subject: i18n.t("printcenter.jobs.sgi_windshield_auth"),
             disabled: false,
@@ -412,7 +410,7 @@ export const TemplateList = (type, context) => {
           },
           mpi_final_acct_sheet: {
             title: i18n.t("printcenter.jobs.mpi_final_acct_sheet"),
-            description: "",
+            description: "Thank You Letter by RO",
             key: "mpi_final_acct_sheet",
             subject: i18n.t("printcenter.jobs.mpi_final_acct_sheet"),
             disabled: false,
@@ -421,20 +419,9 @@ export const TemplateList = (type, context) => {
               CA_MB: true,
             },
           },
-          mpi_final_repair_acct_sheet: {
-            title: i18n.t("printcenter.jobs.mpi_final_repair_acct_sheet"),
-            description: "",
-            key: "mpi_final_repair_acct_sheet",
-            subject: i18n.t("printcenter.jobs.mpi_final_repair_acct_sheet"),
-            disabled: false,
-            group: "post",
-            regions: {
-              CA_MB: true,
-            },
-          },
           mpi_eglass_auth: {
             title: i18n.t("printcenter.jobs.mpi_eglass_auth"),
-            description: "",
+            description: "Thank You Letter by RO",
             key: "mpi_eglass_auth",
             subject: i18n.t("printcenter.jobs.mpi_eglass_auth"),
             disabled: false,
@@ -445,7 +432,7 @@ export const TemplateList = (type, context) => {
           },
           mpi_animal_checklist: {
             title: i18n.t("printcenter.jobs.mpi_animal_checklist"),
-            description: "",
+            description: "Thank You Letter by RO",
             key: "mpi_animal_checklist",
             subject: i18n.t("printcenter.jobs.mpi_animal_checklist"),
             disabled: false,
@@ -456,7 +443,7 @@ export const TemplateList = (type, context) => {
           },
           ab_proof_of_loss: {
             title: i18n.t("printcenter.jobs.ab_proof_of_loss"),
-            description: "",
+            description: "Thank You Letter by RO",
             key: "ab_proof_of_loss",
             subject: i18n.t("printcenter.jobs.ab_proof_of_loss"),
             disabled: false,
@@ -467,7 +454,7 @@ export const TemplateList = (type, context) => {
           },
           // parts_label_multi: {
           //   title: i18n.t("printcenter.jobs.parts_label_multi"),
-          //   description: "",
+          //   description: "Thank You Letter by RO",
           //   key: "parts_label_multi",
           //   subject: i18n.t("printcenter.jobs.parts_label_multi"),
           //   disabled: false,
@@ -475,7 +462,7 @@ export const TemplateList = (type, context) => {
           // },
           iou_form: {
             title: i18n.t("printcenter.jobs.iou_form"),
-            description: "",
+            description: "CASL Authorization",
             subject: i18n.t("printcenter.jobs.iou_form"),
             key: "iou_form",
             disabled: false,
@@ -483,7 +470,7 @@ export const TemplateList = (type, context) => {
           },
           lag_time_ro: {
             title: i18n.t("printcenter.jobs.lag_time_ro"),
-            description: "",
+            description: "CASL Authorization",
             subject: i18n.t("printcenter.jobs.lag_time_ro"),
             key: "lag_time_ro",
             disabled: false,
@@ -491,7 +478,7 @@ export const TemplateList = (type, context) => {
           },
           rental_reservation: {
             title: i18n.t("printcenter.jobs.rental_reservation"),
-            description: "",
+            description: "CASL Authorization",
             subject: i18n.t("printcenter.jobs.rental_reservation"),
             key: "rental_reservation",
             disabled: false,
@@ -499,7 +486,7 @@ export const TemplateList = (type, context) => {
           },
           timetickets_ro: {
             title: i18n.t("printcenter.jobs.timetickets_ro"),
-            description: "",
+            description: "CASL Authorization",
             subject: i18n.t("printcenter.jobs.timetickets_ro"),
             key: "timetickets_ro",
             disabled: false,
@@ -507,7 +494,7 @@ export const TemplateList = (type, context) => {
           },
           dms_posting_sheet: {
             title: i18n.t("printcenter.jobs.dms_posting_sheet"),
-            description: "",
+            description: "DMS Posting Sheet",
             subject: i18n.t("printcenter.jobs.dms_posting_sheet"),
             key: "dms_posting_sheet",
             disabled: false,
@@ -519,41 +506,41 @@ export const TemplateList = (type, context) => {
       ? {
           special_thirdpartypayer: {
             title: i18n.t("printcenter.jobs.thirdpartypayer"),
-            description: "",
+            description: "CSI invite",
             key: "special_thirdpartypayer",
             disabled: false,
           },
           folder_label_multiple: {
             title: i18n.t("printcenter.jobs.folder_label_multiple"),
-            description: "",
+            description: "Folder Label Multiple",
             key: "folder_label_multiple",
             disabled: false,
           },
           parts_label_multiple: {
             title: i18n.t("printcenter.jobs.parts_label_multiple"),
-            description: "",
+            description: "Parts Label Multiple",
             key: "parts_label_multiple",
             disabled: false,
           },
           parts_invoice_label_single: {
             title: i18n.t("printcenter.jobs.parts_invoice_label_single"),
-            description: "",
+            description: "Parts Label Multiple",
             key: "parts_invoice_label_single",
             disabled: false,
             ignoreCustomMargins: true,
           },
           csi_invitation_action: {
             title: i18n.t("printcenter.jobs.csi_invitation_action"),
-            description: "",
+            description: "CSI invite",
             key: "csi_invitation_action",
             subject: i18n.t("printcenter.jobs.csi_invitation_action"),
             disabled: false,
           },
           individual_job_note: {
             title: i18n.t("printcenter.jobs.individual_job_note"),
-            description: "",
+            description: "CSI invite",
             key: "individual_job_note",
-            subject: i18n.t("printcenter.subjects.jobs.individual_job_note", {
+            subject: i18n.t("printcenter.jobs.individual_job_note", {
               ro_number: (context && context.ro_number) || "",
             }),
             disabled: false,
@@ -564,7 +551,7 @@ export const TemplateList = (type, context) => {
       ? {
           appointment_confirmation: {
             title: i18n.t("printcenter.appointments.appointment_confirmation"),
-            description: "",
+            description: "Appointment Confirmation",
             subject: i18n.t(
               "printcenter.appointments.appointment_confirmation"
             ),
@@ -577,7 +564,7 @@ export const TemplateList = (type, context) => {
       ? {
           parts_order: {
             title: i18n.t("printcenter.jobs.parts_order"),
-            description: "",
+            description: "Parts Order",
             key: "parts_order",
             subject: i18n.t("printcenter.subjects.jobs.parts_order", {
               ro_number: context && context.job && context.job.ro_number,
@@ -591,7 +578,7 @@ export const TemplateList = (type, context) => {
           },
           sublet_order: {
             title: i18n.t("printcenter.jobs.sublet_order"),
-            description: "",
+            description: "Parts Order",
             key: "sublet_order",
             subject: i18n.t("printcenter.subjects.jobs.sublet_order", {
               ro_number: context && context.job && context.job.ro_number,
@@ -606,7 +593,7 @@ export const TemplateList = (type, context) => {
           parts_return_slip: {
             title: i18n.t("printcenter.jobs.parts_return_slip"),
             subject: i18n.t("printcenter.jobs.parts_return_slip"),
-            description: "",
+            description: "Parts Return",
             key: "parts_return_slip",
             disabled: false,
           },
@@ -616,7 +603,7 @@ export const TemplateList = (type, context) => {
       ? {
           payment_receipt: {
             title: i18n.t("printcenter.jobs.payment_receipt"),
-            description: "",
+            description: "Payment Receipt",
             subject: i18n.t("printcenter.jobs.payment_receipt"),
             key: "payment_receipt",
             disabled: false,
@@ -1904,7 +1891,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_contract"
             ),
-            description: "",
+            description: "Est Detail",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_contract"
             ),
@@ -1913,7 +1900,7 @@ export const TemplateList = (type, context) => {
           },
           courtesy_car_terms: {
             title: i18n.t("printcenter.courtesycarcontract.courtesy_car_terms"),
-            description: "",
+            description: "Est Detail",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_terms"
             ),
@@ -1924,7 +1911,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_impound"
             ),
-            description: "",
+            description: "Est Detail",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_impound"
             ),
@@ -1939,7 +1926,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_inventory"
             ),
-            description: "",
+            description: "Est Detail",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_inventory"
             ),
@@ -1952,7 +1939,7 @@ export const TemplateList = (type, context) => {
       ? {
           inhouse_invoice: {
             title: i18n.t("printcenter.bills.inhouse_invoice"),
-            description: "",
+            description: "Est Detail",
             subject: i18n.t("printcenter.bills.inhouse_invoice"),
             key: "inhouse_invoice",
             disabled: false,
@@ -1963,7 +1950,7 @@ export const TemplateList = (type, context) => {
       ? {
           // timetickets: {
           //   title: i18n.t("printcenter.timetickets.timetickets"),
-          //   description: "",
+          //   description: "Est Detail",
           //   subject: `${i18n.t("printcenter.timetickets.timetickets")} - ${
           //     context && context.job && context.job.ro_number
           //   }`,
@@ -1976,14 +1963,14 @@ export const TemplateList = (type, context) => {
       ? {
           purchases_by_vendor_detailed: {
             title: i18n.t("printcenter.vendors.purchases_by_vendor_detailed"),
-            description: "",
+            description: "Est Detail",
             subject: i18n.t("printcenter.vendors.purchases_by_vendor_detailed"),
             key: "purchases_by_vendor_detailed",
             disabled: false,
           },
           purchases_by_vendor_summary: {
             title: i18n.t("printcenter.vendors.purchases_by_vendor_summary"),
-            description: "",
+            description: "Est Detail",
             subject: i18n.t("printcenter.vendors.purchases_by_vendor_summary"),
             key: "purchases_by_vendor_summary",
             disabled: false,
@@ -2056,21 +2043,21 @@ export const TemplateList = (type, context) => {
       ? {
           ca_bc_etf_table: {
             title: i18n.t("printcenter.payments.ca_bc_etf_table"),
-            description: "",
+            description: "Est Detail",
             subject: i18n.t("printcenter.payments.ca_bc_etf_table"),
             key: "ca_bc_etf_table",
             disabled: false,
           },
           exported_payroll: {
             title: i18n.t("printcenter.payments.exported_payroll"),
-            description: "",
+            description: "Est Detail",
             subject: i18n.t("printcenter.payments.exported_payroll"),
             key: "exported_payroll",
             disabled: false,
           },
           attendance_detail_csv: {
             title: i18n.t("printcenter.special.attendance_detail_csv"),
-            description: "",
+            description: "Est Detail",
             subject: i18n.t("printcenter.special.attendance_detail_csv"),
             key: "attendance_detail_csv",
             disabled: false,

hasura/metadata/tables.yaml

@@ -941,7 +941,6 @@
           - md_referral_sources
           - md_responsibility_centers
           - md_ro_statuses
-          - md_tasks_presets
           - md_to_emails
           - messagingservicesid
           - pbs_configuration
@@ -1039,7 +1038,6 @@
           - md_referral_sources
           - md_responsibility_centers
           - md_ro_statuses
-          - md_tasks_presets
           - md_to_emails
           - pbs_configuration
           - phone
@@ -4333,7 +4331,6 @@
           - jobid
           - private
           - text
-          - type
           - updated_at
   select_permissions:
     - role: user
@@ -4347,7 +4344,6 @@
           - jobid
           - private
           - text
-          - type
           - updated_at
         filter:
           job:
@@ -4371,7 +4367,6 @@
           - jobid
           - private
           - text
-          - type
           - updated_at
         filter:
           job:

hasura/migrations/1684251223317_alter_table_public_bodyshops_add_column_md_tasks_presets/down.sql

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

hasura/migrations/1684251223317_alter_table_public_bodyshops_add_column_md_tasks_presets/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."bodyshops" add column "md_tasks_presets" jsonb
- not null default jsonb_build_object();

hasura/migrations/1684353031975_alter_table_public_notes_add_column_type/down.sql

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

hasura/migrations/1684353031975_alter_table_public_notes_add_column_type/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."notes" add column "type" text
- not null default 'general';

server/cdk/cdk-job-export.js

@@ -224,7 +224,7 @@ async function CdkSelectedCustomer(socket, selectedCustomerId) {
   } finally {
     //Ensure we always insert logEvents
     //GQL to insert logevents.
-
+  
     CdkBase.createLogEvent(
       socket,
       "DEBUG",
@@ -432,7 +432,7 @@ async function QueryDmsCustomerById(socket, JobData, CustomerId) {
 
 async function QueryDmsCustomerByName(socket, JobData) {
   const ownerName = (
-    JobData.ownr_co_nm && JobData.ownr_co_nm.trim() !== ""
+    JobData.ownr_co_nm && JobData.ownr_co_nm !== ""
       ? JobData.ownr_co_nm
       : `${JobData.ownr_ln},${JobData.ownr_fn}`
   ).replace(replaceSpecialRegex, "");
@@ -642,8 +642,7 @@ async function InsertDmsCustomer(socket, newCustomerNumber) {
                   .toUpperCase(),
               middleName: null,
               nameType:
-                socket.JobData.ownr_co_nm &&
-                String(socket.JobData.ownr_co_nm).trim() !== ""
+                socket.JobData.ownr_co_nm && socket.JobData.ownr_co_nm
                   ? "Business"
                   : "Person",
               suffix: null,
@@ -729,9 +728,7 @@ async function InsertDmsVehicle(socket) {
             deliveryDate: moment()
               // .tz(socket.JobData.bodyshop.timezone)
               .format("YYYYMMDD"),
-            licensePlateNo: String(socket.JobData.plate_no)
-              .replace(/([^\w]|_)/g, "")
-              .toUpperCase(),
+            licensePlateNo: socket.JobData.plate_no,
             make: socket.txEnvelope.dms_make,
             modelAbrev: socket.txEnvelope.dms_model,
             modelYear: socket.JobData.v_model_yr,

server/data/autohouse.js

@@ -265,20 +265,20 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         }${job.est_ct_fn ? job.est_ct_fn : ""}`,
       },
       CustomerInformation: {
-        FirstName: "",
-        LastName: "",
-        Street: "",
-        City: "",
-        State: "",
+        FirstName: job.ownr_fn || "",
+        LastName: job.ownr_ln || "",
+        Street: job.ownr_addr1 || "",
+        City: job.ownr_city || "",
+        State: job.ownr_st || "",
         Zip: (job.ownr_zip && job.ownr_zip.substring(0, 3)) || "",
-        Phone1: "",
+        Phone1: job.ownr_ph1 || "",
         Phone2: null,
         Phone2Extension: null,
         Phone3: null,
         Phone3Extension: null,
         FileComments: null,
         Source: null,
-        Email: "",
+        Email: job.ownr_ea || "",
         RetWhsl: null,
         Cat: null,
         InsuredorClaimantFlag: null,
@@ -762,12 +762,7 @@ const CreateCosts = (job) => {
   }, {});
 
   //If the hourly rates for job costing are set, add them in.
-  if (
-    job.bodyshop.jc_hourly_rates &&
-    (job.bodyshop.jc_hourly_rates.mapa ||
-      typeof job.bodyshop.jc_hourly_rates.mapa === "number" ||
-      isNaN(job.bodyshop.jc_hourly_rates.mapa) === false)
-  ) {
+  if (job.bodyshop.jc_hourly_rates && job.bodyshop.jc_hourly_rates.mapa) {
     if (
       !billTotalsByCostCenters[
         job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
@@ -792,11 +787,10 @@ const CreateCosts = (job) => {
           job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
         ].add(
           Dinero({
-            amount: Math.round(
+            amount:
               (job.bodyshop.jc_hourly_rates &&
                 job.bodyshop.jc_hourly_rates.mapa * 100) ||
-                0
-            ),
+              0,
           }).multiply(job.job_totals.rates.mapa.hours)
         );
       }
@@ -807,11 +801,10 @@ const CreateCosts = (job) => {
         job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
       ].add(
         Dinero({
-          amount: Math.round(
+          amount:
             (job.bodyshop.jc_hourly_rates &&
               job.bodyshop.jc_hourly_rates.mapa * 100) ||
-              0
-          ),
+            0,
         }).multiply(job.job_totals.rates.mapa.hours)
       );
     }
@@ -831,11 +824,10 @@ const CreateCosts = (job) => {
       job.bodyshop.md_responsibility_centers.defaults.costs.MASH
     ].add(
       Dinero({
-        amount: Math.round(
+        amount:
           (job.bodyshop.jc_hourly_rates &&
             job.bodyshop.jc_hourly_rates.mash * 100) ||
-            0
-        ),
+          0,
       }).multiply(job.job_totals.rates.mash.hours)
     );
   }

server/job/job-costing.js

@@ -612,12 +612,7 @@ function GenerateCostingData(job) {
 
   //If the hourly rates for job costing are set, add them in.
 
-  if (
-    job.bodyshop.jc_hourly_rates &&
-    (job.bodyshop.jc_hourly_rates.mapa ||
-      typeof job.bodyshop.jc_hourly_rates.mapa === "number" ||
-      isNaN(job.bodyshop.jc_hourly_rates.mapa) === false)
-  ) {
+  if (job.bodyshop.jc_hourly_rates && job.bodyshop.jc_hourly_rates.mapa) {
     if (
       !billTotalsByCostCenters.additionalCosts[
         job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
@@ -631,9 +626,7 @@ function GenerateCostingData(job) {
         billTotalsByCostCenters.additionalCosts[
           job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
         ] = Dinero({
-          amount: Math.round(
-            ((job.mixdata[0] && job.mixdata[0].totalliquidcost) || 0) * 100
-          ),
+          amount: Math.round((job.mixdata[0] && job.mixdata[0].totalliquidcost || 0) * 100)
         });
       } else {
         billTotalsByCostCenters.additionalCosts[
@@ -642,11 +635,10 @@ function GenerateCostingData(job) {
           job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
         ].add(
           Dinero({
-            amount: Math.round(
+            amount:
               (job.bodyshop.jc_hourly_rates &&
                 job.bodyshop.jc_hourly_rates.mapa * 100) ||
-                0
-            ),
+              0,
           }).multiply(materialsHours.mapaHrs)
         );
       }
@@ -657,11 +649,10 @@ function GenerateCostingData(job) {
         job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
       ].add(
         Dinero({
-          amount: Math.round(
+          amount:
             (job.bodyshop.jc_hourly_rates &&
               job.bodyshop.jc_hourly_rates.mapa * 100) ||
-              0
-          ),
+            0,
         }).multiply(materialsHours.mapaHrs)
       );
     }
@@ -682,11 +673,10 @@ function GenerateCostingData(job) {
       job.bodyshop.md_responsibility_centers.defaults.costs.MASH
     ].add(
       Dinero({
-        amount: Math.round(
+        amount:
           (job.bodyshop.jc_hourly_rates &&
             job.bodyshop.jc_hourly_rates.mash * 100) ||
-            0
-        ),
+          0,
       }).multiply(materialsHours.mashHrs)
     );
   }
@@ -843,9 +833,7 @@ function GenerateCostingData(job) {
   //Push adjustments to bottom line.
   if (job.adjustment_bottom_line) {
     //Add to totals.
-    const Adjustment = Dinero({
-      amount: Math.round(job.adjustment_bottom_line * 100),
-    }); //Need to invert, since this is being assigned as a cost.
+    const Adjustment = Dinero({ amount: job.adjustment_bottom_line * 100 }); //Need to invert, since this is being assigned as a cost.
     summaryData.totalLaborSales = summaryData.totalLaborSales.add(Adjustment);
     summaryData.totalSales = summaryData.totalSales.add(Adjustment);
     //Add to lines.

yarn.lock

@@ -4312,9 +4312,9 @@ tslib@^1.11.1:
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
 tslib@^2.0.1, tslib@^2.1.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.2.tgz#1b6f07185c881557b0ffa84b111a0106989e8338"
-  integrity sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913"
+  integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==
 
 tslib@^2.3.1, tslib@^2.5.0:
   version "2.5.0"