IO-2370 Work In Progress Jobs

Release/2023 07 28

client/package.json

@@ -51,6 +51,7 @@
     "react-i18next": "^12.2.0",
     "react-icons": "^4.7.1",
     "react-image-lightbox": "^5.1.4",
+    "react-intersection-observer": "^9.4.3",
     "react-number-format": "^5.1.3",
     "react-redux": "^8.0.5",
     "react-resizable": "^3.0.4",

client/src/App/App.styles.scss

@@ -145,7 +145,11 @@
 
 //Update row highlighting on production board.
 .ant-table-tbody > tr.ant-table-row:hover > td {
-  background: #eaeaea !important;
+  background: #e7f3ff !important;
+}
+
+.ant-table-tbody > tr.ant-table-row-selected > td {
+  background: #e6f7ff !important;
 }
 
 .job-line-manual {
@@ -156,3 +160,11 @@
 td.ant-table-column-sort {
   background-color: transparent;
 }
+
+.ant-table-tbody > tr.ant-table-row:nth-child(2n) > td {
+  background-color: #f4f4f4;
+}
+
+.rowWithColor > td {
+  background-color: var(--bgColor) !important;
+}

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

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

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

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

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

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

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

@@ -4,9 +4,9 @@ import {
   ShrinkOutlined,
   SyncOutlined,
 } from "@ant-design/icons";
-import { useQuery } from "@apollo/client";
+import { useLazyQuery, useQuery } from "@apollo/client";
 import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
-import React, { useEffect, useState } from "react";
+import React, { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -47,12 +47,13 @@ export function ChatPopupComponent({
     ...(pollInterval > 0 ? { pollInterval } : {}),
   });
 
-  const { loading, data, refetch, called } = useQuery(CONVERSATION_LIST_QUERY, {
-    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");
 
@@ -65,15 +66,22 @@ export function ChatPopupComponent({
   }, [fcmToken]);
 
   useEffect(() => {
-    if (called && chatVisible) refetch();
-  }, [chatVisible, called, refetch]);
+    if (chatVisible)
+      getConversations({
+        variables: {
+          offset: 0,
+        },
+      });
+  }, [chatVisible, getConversations]);
 
-  // const unreadCount = data
-  //   ? data.conversations.reduce(
-  //       (acc, val) => val.messages_aggregate.aggregate.count + acc,
-  //       0
-  //     )
-  //   : 0;
+  const loadMoreConversations = useCallback(() => {
+    if (data)
+      fetchMore({
+        variables: {
+          offset: data.conversations.length,
+        },
+      });
+  }, [data, fetchMore]);
 
   const unreadCount = unreadData?.messages_aggregate.aggregate.count || 0;
 
@@ -110,6 +118,7 @@ export function ChatPopupComponent({
                 ) : (
                   <ChatConversationListComponent
                     conversationList={data ? data.conversations : []}
+                    loadMoreConversations={loadMoreConversations}
                   />
                 )}
               </Col>

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,28 +1,28 @@
 import { UploadOutlined, UserAddOutlined } from "@ant-design/icons";
 import {
+  Button,
   Divider,
+  Dropdown,
   Form,
   Input,
+  Menu,
   Select,
+  Space,
   Tabs,
   Upload,
-  Space,
-  Menu,
-  Dropdown,
-  Button,
 } from "antd";
+import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import EmailDocumentsComponent from "../email-documents/email-documents.component";
-import _ from "lodash";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { selectEmailConfig } from "../../redux/email/email.selectors";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import { CreateExplorerLinkForJob } from "../../utils/localmedia";
-import { selectEmailConfig } from "../../redux/email/email.selectors";
+import EmailDocumentsComponent from "../email-documents/email-documents.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -54,6 +54,15 @@ 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>
@@ -74,6 +83,25 @@ 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
@@ -122,7 +150,23 @@ export function EmailOverlayComponent({
       >
         <Select mode="tags" tokenSeparators={[",", ";"]} />
       </Form.Item>
-      <Form.Item label={t("emails.fields.cc")} name="cc">
+      <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"
+      >
         <Select mode="tags" tokenSeparators={[",", ";"]} />
       </Form.Item>
       <Form.Item

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

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

client/src/components/job-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-admin-dates/jobs-admin-dates.component.jsx

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

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

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

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

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

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

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

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

@@ -224,13 +224,15 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
             >
               <CurrencyInput />
             </Form.Item>
-            <Form.Item
-              label={t("jobs.fields.ca_gst_registrant")}
-              name="ca_gst_registrant"
-              valuePropName="checked"
-            >
-              <Switch />
-            </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.other_amount_payable")}
               name="other_amount_payable"

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

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

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

@@ -5,10 +5,10 @@ import {
   Dropdown,
   Form,
   Menu,
-  notification,
   Popconfirm,
   Popover,
   Select,
+  notification,
 } from "antd";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
@@ -24,6 +24,7 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import JobsDetailHeaderActionsAddevent from "./jobs-detail-header-actions.addevent";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import JobsDetaiLheaderCsi from "./jobs-detail-header-actions.csi.component";
@@ -461,54 +462,57 @@ export function JobsDetailHeaderActions({
       )}
       <JobsDetailHeaderActionsAddevent jobid={job.id} />
       {!jobRO && job.converted && (
-        <Menu.Item>
-          <Popconfirm
-            title={t("jobs.labels.voidjob")}
-            okText="Yes"
-            cancelText="No"
-            onClick={(e) => e.stopPropagation()}
-            onConfirm={async () => {
-              //delete the job.
-              const result = await voidJob({
-                variables: {
-                  jobId: job.id,
-                  job: {
-                    status: bodyshop.md_ro_statuses.default_void,
-                    voided: true,
-                    scheduled_in: null,
-                    scheduled_completion: null,
-                    inproduction: false,
-                  },
-                  note: [
-                    {
-                      jobid: job.id,
-                      created_by: currentUser.email,
-                      audit: true,
-                      text: t("jobs.labels.voidnote"),
+        <RbacWrapper action="jobs:void" noauth>
+          <Menu.Item>
+            <Popconfirm
+              title={t("jobs.labels.voidjob")}
+              okText="Yes"
+              cancelText="No"
+              onClick={(e) => e.stopPropagation()}
+              onConfirm={async () => {
+                //delete the job.
+                const result = await voidJob({
+                  variables: {
+                    jobId: job.id,
+                    job: {
+                      status: bodyshop.md_ro_statuses.default_void,
+                      voided: true,
+                      scheduled_in: null,
+                      scheduled_completion: null,
+                      inproduction: false,
+                      date_void: new Date(),
                     },
-                  ],
-                },
-              });
+                    note: [
+                      {
+                        jobid: job.id,
+                        created_by: currentUser.email,
+                        audit: true,
+                        text: t("jobs.labels.voidnote"),
+                      },
+                    ],
+                  },
+                });
 
-              if (!!!result.errors) {
-                notification["success"]({
-                  message: t("jobs.successes.voided"),
-                });
-                //go back to jobs list.
-                history.push(`/manage/`);
-              } else {
-                notification["error"]({
-                  message: t("jobs.errors.voiding", {
-                    error: JSON.stringify(result.errors),
-                  }),
-                });
-              }
-            }}
-            getPopupContainer={(trigger) => trigger.parentNode}
-          >
-            {t("menus.jobsactions.void")}
-          </Popconfirm>
-        </Menu.Item>
+                if (!!!result.errors) {
+                  notification["success"]({
+                    message: t("jobs.successes.voided"),
+                  });
+                  //go back to jobs list.
+                  history.push(`/manage/`);
+                } else {
+                  notification["error"]({
+                    message: t("jobs.errors.voiding", {
+                      error: JSON.stringify(result.errors),
+                    }),
+                  });
+                }
+              }}
+              getPopupContainer={(trigger) => trigger.parentNode}
+            >
+              {t("menus.jobsactions.void")}
+            </Popconfirm>
+          </Menu.Item>
+        </RbacWrapper>
       )}
     </Menu>
   );

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

@@ -40,24 +40,26 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
         >
           <CurrencyInput disabled={jobRO} min={0} />
         </Form.Item>
-        <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>
+        {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>
+        )}
         <Form.Item
           label={t("jobs.fields.other_amount_payable")}
           name="other_amount_payable"
@@ -82,12 +84,14 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
         >
           <CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} />
         </Form.Item>
-        <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>
+        {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>
+        )}
         <Form.Item
           label={t("jobs.fields.auto_add_ats")}
           name="auto_add_ats"
@@ -141,13 +145,15 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
         >
           <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
         </Form.Item>
-        <Form.Item
-          label={t("jobs.fields.ca_gst_registrant")}
-          name="ca_gst_registrant"
-          valuePropName="checked"
-        >
-          <Switch 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>
+        )}
       </FormRow>
       <Divider
         orientation="left"

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

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

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

@@ -75,6 +75,27 @@ 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",
@@ -106,7 +127,7 @@ export function JobNotesComponent({
       title: t("notes.actions.actions"),
       dataIndex: "actions",
       key: "actions",
-      width: 150,
+      width: 200,
       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="cost_center"
+            rowKey={(record) => `${record.cost_center} ${record.mod_lbr_ty}`}
             pagination={false}
             onChange={handleTableChange}
             dataSource={totals}

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

@@ -1,4 +1,14 @@
-import { Checkbox, Col, Form, Input, Row, Space, Switch, Tag } from "antd";
+import {
+  Checkbox,
+  Col,
+  Form,
+  Input,
+  Row,
+  Select,
+  Space,
+  Switch,
+  Tag,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -46,6 +56,28 @@ 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

@@ -0,0 +1,100 @@
+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 } from "antd";
+import { Button, Form, Modal, notification, Space } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -19,6 +19,8 @@ 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,
@@ -52,7 +54,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({
@@ -87,7 +89,7 @@ function PaymentModalContainer({
           );
         }
       } else {
-        const updatedPayment = await updatePayment({
+        updatedPayment = await updatePayment({
           variables: {
             paymentId: context.id,
             payment: paymentObj,
@@ -101,7 +103,11 @@ function PaymentModalContainer({
         }
       }
 
-      if (actions.refetch) actions.refetch();
+      if (actions.refetch)
+        actions.refetch(
+          updatedPayment && updatedPayment.data.update_payments.returning[0]
+        );
+
       if (enterAgain) {
         const prev = form.getFieldsValue(["date"]);
 
@@ -172,12 +178,24 @@ 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

@@ -0,0 +1,66 @@
+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,7 +169,20 @@ export function PaymentsListPaginated({
                 apolloResults = data.payments_by_pk;
               }
               setPaymentContext({
-                actions: { refetch: refetch },
+                actions: {
+                  refetch: apolloResults
+                    ? (updatedRecord) => {
+                        setOpenSearchResults((results) =>
+                          results.map((result) => {
+                            if (result.id !== record.id) {
+                              return result;
+                            }
+                            return updatedRecord;
+                          })
+                        );
+                      }
+                    : refetch,
+                },
                 context: apolloResults ? apolloResults : record,
               });
             }}

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

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

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

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

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

@@ -246,11 +246,21 @@ export function ProductionListTable({
                 (x) => x.status === record.status
               );
 
-              if (!color) return null;
+              if (!color) {
+                if (index % 2 === 0)
+                  return {
+                    style: {
+                      backgroundColor: `rgb(236, 236, 236)`,
+                    },
+                  };
+
+                return null;
+              }
 
               return {
+                className: "rowWithColor",
                 style: {
-                  backgroundColor: `rgb(${color.color.r},${color.color.g},${color.color.b},${color.color.a})`,
+                  "--bgColor": `rgb(${color.color.r},${color.color.g},${color.color.b},${color.color.a})`,
                 },
               };
             },

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

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

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

@@ -12,7 +12,8 @@ import "./schedule-calendar.styles.scss";
 import JobDetailCards from "../job-detail-cards/job-detail-cards.component";
 import { selectProblemJobs } from "../../redux/application/application.selectors";
 import { Alert, Collapse } from "antd";
-import { useTranslation } from "react-i18next";
+import { useTranslation, Trans } from "react-i18next";
+import { Link } from "react-router-dom";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -66,10 +67,21 @@ export function ScheduleCalendarWrapperComponent({
               <Alert
                 key={problem.id}
                 type="error"
-                message={t("appointments.labels.dataconsistency", {
-                  ro_number: problem.ro_number,
-                  code: problem.code,
-                })}
+                message={
+                  <Trans
+                    i18nKey="appointments.labels.dataconsistency"
+                    components={[
+                      <Link
+                        to={`/manage/jobs/${problem.id}`}
+                        target="_blank"
+                      />,
+                    ]}
+                    values={{
+                      ro_number: problem.ro_number,
+                      code: problem.code,
+                    }}
+                  />
+                }
               />
             ))}
           </Collapse.Panel>
@@ -79,10 +91,18 @@ export function ScheduleCalendarWrapperComponent({
           <Alert
             key={problem.id}
             type="error"
-            message={t("appointments.labels.dataconsistency", {
-              ro_number: problem.ro_number,
-              code: problem.code,
-            })}
+            message={
+              <Trans
+                i18nKey="appointments.labels.dataconsistency"
+                components={[
+                  <Link to={`/manage/jobs/${problem.id}`} target="_blank" />,
+                ]}
+                values={{
+                  ro_number: problem.ro_number,
+                  code: problem.code,
+                }}
+              />
+            }
           />
         ))
       )}

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

@@ -21,6 +21,7 @@ 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,
 });
@@ -39,9 +40,39 @@ 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) =>
+    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 (
         (d.block ||
           (filter.intake && d.isintake) ||
           (filter.manual && !d.isintake && d.block === false) ||
@@ -50,9 +81,11 @@ 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)
-    );
-  }, [data, filter]);
+          : true) &&
+        estFilter
+      );
+    });
+  }, [data, filter, estimatorsFilter]);
 
   return (
     <Row gutter={[16, 16]}>
@@ -63,6 +96,21 @@ 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,5 +1,6 @@
-import Dinero from "dinero.js";
 import { Card } from "antd";
+import Dinero from "dinero.js";
+import _ from "lodash";
 import moment from "moment";
 import React from "react";
 import { connect } from "react-redux";
@@ -18,7 +19,6 @@ 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 = {
@@ -47,9 +47,7 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) {
             bodyhrs: dayAcc.bodyhrs + dayVal.bodyhrs,
             painthrs: dayAcc.painthrs + dayVal.painthrs,
             sales:
-              dayAcc.painthrs +
-              dayVal.job.job_totals.totals.subtotal.amount / 100 +
-              2500,
+              dayAcc.sales + dayVal.job.job_totals.totals.subtotal.amount / 100,
           };
         },
         { bodyhrs: 0, painthrs: 0, sales: 0 }
@@ -71,7 +69,9 @@ 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,6 +15,8 @@ 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,
@@ -31,6 +33,10 @@ 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={
@@ -43,7 +49,14 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
         </Button>
       }
     >
-      <Tabs>
+      <Tabs
+        defaultActiveKey={search.subtab}
+        onChange={(key) =>
+          history.push({
+            search: `?tab=${search.tab}&subtab=${key}`,
+          })
+        }
+      >
         <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,9 +24,13 @@ const timeZonesList = momentTZ.tz.names();
 
 export default function ShopInfoGeneral({ form }) {
   const { t } = useTranslation();
+
   return (
     <div>
-      <LayoutFormRow header={t("bodyshop.labels.businessinformation")}>
+      <LayoutFormRow
+        header={t("bodyshop.labels.businessinformation")}
+        id="businessinformation"
+      >
         <Form.Item
           label={t("bodyshop.fields.shopname")}
           name="shopname"
@@ -155,7 +159,10 @@ export default function ShopInfoGeneral({ form }) {
           <InputNumber min={0} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow header={t("bodyshop.labels.accountingsetup")}>
+      <LayoutFormRow
+        header={t("bodyshop.labels.accountingsetup")}
+        id="accountingsetup"
+      >
         <Form.Item
           label={t("bodyshop.labels.qbo")}
           valuePropName="checked"
@@ -386,7 +393,10 @@ export default function ShopInfoGeneral({ form }) {
           <Select mode="tags" />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow header={t("bodyshop.labels.scoreboardsetup")}>
+      <LayoutFormRow
+        header={t("bodyshop.labels.scoreboardsetup")}
+        id="scoreboardsetup"
+      >
         <Form.Item
           label={t("bodyshop.fields.dailypainttarget")}
           name={["scoreboard_target", "dailyPaintTarget"]}
@@ -445,7 +455,10 @@ export default function ShopInfoGeneral({ form }) {
           <InputNumber min={1} precision={1} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow header={t("bodyshop.labels.systemsettings")}>
+      <LayoutFormRow
+        header={t("bodyshop.labels.systemsettings")}
+        id="systemsettings"
+      >
         <Form.Item
           name={["md_referral_sources"]}
           label={t("bodyshop.fields.md_referral_sources")}
@@ -589,6 +602,18 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Select mode="tags" />
         </Form.Item>
+        <Form.Item
+          name={["md_email_cc", "parts_return_slip"]}
+          label={t("bodyshop.fields.md_email_cc", { template: "parts_return_slip" })}
+          rules={[
+            {
+              //message: t("general.validation.required"),
+              type: "array",
+            },
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
         <Form.Item
           name={["tt_allow_post_to_invoiced"]}
           label={t("bodyshop.fields.tt_allow_post_to_invoiced")}
@@ -655,7 +680,11 @@ export default function ShopInfoGeneral({ form }) {
           <Input />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.messagingpresets")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.labels.messagingpresets")}
+        id="messagingpresets"
+      >
         <Form.List name={["md_messaging_presets"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -720,7 +749,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.notespresets")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.labels.notespresets")}
+        id="notespresets"
+      >
         <Form.List name={["md_notes_presets"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -785,7 +818,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.partslocations")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.labels.partslocations")}
+        id="partslocations"
+      >
         <Form.List name={["md_parts_locations"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -839,7 +876,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.insurancecos")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.labels.insurancecos")}
+        id="insurancecos"
+      >
         <Form.List name={["md_ins_cos"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -935,7 +976,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.estimators")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.labels.estimators")}
+        id="estimators"
+      >
         <Form.List name={["md_estimators"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1024,7 +1069,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.filehandlers")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.labels.filehandlers")}
+        id="filehandlers"
+      >
         <Form.List name={["md_filehandlers"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1106,7 +1155,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.fields.md_ccc_rates")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.fields.md_ccc_rates")}
+        id="md_ccc_rates"
+      >
         <Form.List name={["md_ccc_rates"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1223,7 +1276,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.fields.md_jobline_presets")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.fields.md_jobline_presets")}
+        id="md_jobline_presets"
+      >
         <Form.List name={["md_jobline_presets"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1404,7 +1461,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.fields.md_parts_order_comment")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.fields.md_parts_order_comment")}
+        id="md_parts_order_comment"
+      >
         <Form.List name={["md_parts_order_comment"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1470,7 +1531,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.md_to_emails")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.labels.md_to_emails")}
+        id="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,7 +20,10 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
   const TemplateListGenerated = TemplateList();
   return (
     <div>
-      <LayoutFormRow header={t("bodyshop.labels.intakechecklist")}>
+      <LayoutFormRow
+        header={t("bodyshop.labels.intakechecklist")}
+        id="intakechecklist"
+      >
         <Form.List name={["intakechecklist", "form"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -188,7 +191,10 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
         </Form.Item>
       </SelectorDiv>
 
-      <LayoutFormRow header={t("bodyshop.labels.deliverchecklist")}>
+      <LayoutFormRow
+        header={t("bodyshop.labels.deliverchecklist")}
+        id="deliverchecklist"
+      >
         <Form.List name={["deliverchecklist", "form"]}>
           {(fields, { add, remove, move }) => {
             return (

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

@@ -1,12 +1,12 @@
+import { useTreatments } from "@splitsoftware/splitio-react";
 import { Form, InputNumber } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
-import { useTreatments } from "@splitsoftware/splitio-react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -316,6 +316,18 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.jobs.void")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "jobs:void"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.bills.enter")}
           rules={[

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

@@ -95,7 +95,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
               {form.getFieldValue("pbs_serialnumber")}
             </DataLabel>
           )}
-
           <LayoutFormRow>
             <Form.Item
               label={t("bodyshop.fields.dms.default_journal")}
@@ -163,6 +162,32 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                 <Switch />
               </Form.Item>
             )}
+            {bodyshop.pbs_serialnumber && (
+              <Form.Item
+                label={t("bodyshop.fields.dms.appostingaccount")}
+                name={["pbs_configuration", "appostingaccount"]}
+              >
+                <Select
+                  options={[
+                    { value: "wip", label: "WIP" },
+                    { value: "cogs", label: "COGS" },
+                  ]}
+                />
+              </Form.Item>
+            )}
+            {bodyshop.pbs_serialnumber && (
+              <Form.Item
+                label={t("bodyshop.fields.dms.apcontrol")}
+                name={["pbs_configuration", "apcontrol"]}
+              >
+                <Select
+                  options={[
+                    { value: "ro", label: "RO Number" },
+                    { value: "vendordmsid", label: "Vendor DMS ID" },
+                  ]}
+                />
+              </Form.Item>
+            )}
           </LayoutFormRow>
           <LayoutFormRow header={t("bodyshop.labels.dms.cdk.payers")}>
             <Form.List name={["cdk_configuration", "payers"]}>
@@ -315,7 +340,10 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </DataLabel>
         </>
       )}
-      <LayoutFormRow header={t("bodyshop.labels.responsibilitycenters.costs")}>
+      <LayoutFormRow
+        header={t("bodyshop.labels.responsibilitycenters.costs")}
+        id="costs"
+      >
         <Form.List name={["md_responsibility_centers", "costs"]}>
           {(fields, { add, remove }) => {
             return (
@@ -462,6 +490,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
 
       <LayoutFormRow
         header={t("bodyshop.labels.responsibilitycenters.profits")}
+        id="profits"
       >
         <Form.List name={["md_responsibility_centers", "profits"]}>
           {(fields, { add, remove }) => {
@@ -601,7 +630,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                     {fields.map((field, index) => (
                       <Form.Item key={field.key}>
                         <div>
-                          <LayoutFormRow>
+                          <LayoutFormRow id="mappingname">
                             <Form.Item
                               label={t("bodyshop.fields.dms.mappingname")}
                               key={`${index}name`}
@@ -631,6 +660,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                           </LayoutFormRow>
                           <LayoutFormRow
                             header={t("bodyshop.labels.defaultcostsmapping")}
+                            id="defaultcostsmapping"
                           >
                             <Form.Item
                               label={t(
@@ -4088,6 +4118,7 @@ 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")}
@@ -4202,7 +4233,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         </Form.Item>
       </LayoutFormRow>
       {DmsAp.treatment === "on" && (
-        <LayoutFormRow>
+        <LayoutFormRow id="federal_tax_itc">
           <Form.Item
             label={t("bodyshop.fields.responsibilitycenters.federal_tax_itc")}
             rules={[
@@ -4316,7 +4347,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </Form.Item>
         </LayoutFormRow>
       )}
-      <LayoutFormRow>
+      <LayoutFormRow id="state_tax">
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.state_tax")}
           rules={[
@@ -4414,7 +4445,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           <InputNumber precision={2} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow>
+      <LayoutFormRow id="local_tax">
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.local_tax")}
           rules={[
@@ -4512,7 +4543,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           <InputNumber precision={2} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow header={<div>AR</div>}>
+      <LayoutFormRow header={<div>AR</div>} id="AR">
         {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.ar")}
           rules={[
@@ -4576,7 +4607,10 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
       </LayoutFormRow>
 
       {DmsAp.treatment === "on" && (
-        <LayoutFormRow header={t("bodyshop.fields.responsibilitycenters.ap")}>
+        <LayoutFormRow
+          header={t("bodyshop.fields.responsibilitycenters.ap")}
+          id="ap"
+        >
           {/* <Form.Item
             label={t("bodyshop.fields.responsibilitycenters.ap")}
             rules={[
@@ -4639,7 +4673,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </Form.Item>
         </LayoutFormRow>
       )}
-      <LayoutFormRow header={<div>Refund</div>}>
+      <LayoutFormRow header={<div>Refund</div>} id="refund">
         {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.refund")}
           rules={[
@@ -4702,7 +4736,10 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         </Form.Item>
       </LayoutFormRow>
       {Qb_Multi_Ar.treatment === "on" && (
-        <LayoutFormRow header={<div>Multiple Payers Item</div>}>
+        <LayoutFormRow
+          header={<div>Multiple Payers Item</div>}
+          id="accountitem"
+        >
           <Form.Item
             label={t("bodyshop.fields.responsibilitycenter_accountitem")}
             rules={[
@@ -4730,7 +4767,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
             <div>
               {fields.map((field, index) => (
                 <Form.Item key={field.key}>
-                  <LayoutFormRow>
+                  <LayoutFormRow id="sales_tax_codes">
                     <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>
+    <SelectorDiv id="jobstatus">
       <Form.Item
         name={["md_ro_statuses", "statuses"]}
         label={t("bodyshop.labels.alljobstatuses")}
@@ -322,6 +322,7 @@ 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">
+      <Space wrap size="large" id="workingdays">
         <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")}>
+      <LayoutFormRow header={t("bodyshop.labels.apptcolors")} id="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")}>
+      <LayoutFormRow header={t("bodyshop.labels.ssbuckets")} id="ssbuckets">
         <Form.List name={["ssbuckets"]}>
           {(fields, { add, remove, move }) => {
             return (

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

@@ -33,6 +33,7 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
           <JobSearchSelect
             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/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx

@@ -5,10 +5,10 @@ import {
   Col,
   Form,
   InputNumber,
-  notification,
   Popover,
   Row,
   Select,
+  notification,
 } from "antd";
 import axios from "axios";
 import React, { useState } from "react";
@@ -16,13 +16,14 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { GET_LINE_TICKET_BY_PK } from "../../graphql/jobs-lines.queries";
+import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
 import { UPDATE_TIME_TICKET } from "../../graphql/timetickets.queries";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
 import TechJobClockoutDelete from "../tech-job-clock-out-delete/tech-job-clock-out-delete.component";
 import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component";
-import { GET_LINE_TICKET_BY_PK } from "../../graphql/jobs-lines.queries";
-import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -40,6 +41,7 @@ export function TechClockOffButton({
 }) {
   const [loading, setLoading] = useState(false);
   const [updateTimeticket] = useMutation(UPDATE_TIME_TICKET);
+  const [updateJobStatus] = useMutation(UPDATE_JOB_STATUS);
   const [form] = Form.useForm();
   const { queryLoading, data: lineTicketData } = useQuery(
     GET_LINE_TICKET_BY_PK,
@@ -59,7 +61,8 @@ export function TechClockOffButton({
 
   const handleFinish = async (values) => {
     logImEXEvent("tech_clock_out_job");
-
+    const status = values.status;
+    delete values.status;
     setLoading(true);
     const result = await updateTimeticket({
       variables: {
@@ -98,6 +101,26 @@ export function TechClockOffButton({
         message: t("timetickets.successes.clockedout"),
       });
     }
+    if (!isShiftTicket) {
+      const job_update_result = await updateJobStatus({
+        variables: {
+          jobId: jobId,
+          status: status,
+        },
+      });
+
+      if (!!job_update_result.errors) {
+        notification["error"]({
+          message: t("jobs.errors.updating", {
+            message: JSON.stringify(result.errors),
+          }),
+        });
+      } else {
+        notification["success"]({
+          message: t("jobs.successes.updated"),
+        });
+      }
+    }
     setLoading(false);
     if (completedCallback) completedCallback();
   };
@@ -195,7 +218,6 @@ export function TechClockOffButton({
                   </Form.Item>
                 </div>
               ) : null}
-
               <Form.Item
                 name="cost_center"
                 label={t("timetickets.fields.cost_center")}
@@ -228,6 +250,29 @@ export function TechClockOffButton({
                 </Select>
               </Form.Item>
 
+              {isShiftTicket ? (
+                <div></div>
+              ) : (
+                <Form.Item
+                  name="status"
+                  label={t("jobs.fields.status")}
+                  initialValue={
+                    lineTicketData && lineTicketData.jobs_by_pk.status
+                  }
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <Select>
+                    {bodyshop.md_ro_statuses.production_statuses.map((item) => (
+                      <Select.Option key={item}></Select.Option>
+                    ))}
+                  </Select>
+                </Form.Item>
+              )}
               <Button type="primary" htmlType="submit" loading={loading}>
                 {t("general.actions.save")}
               </Button>

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

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

client/src/components/update-alert/update-alert.component.jsx

@@ -0,0 +1,78 @@
+import { Alert, Button, Col, Row, Space } from "antd";
+import i18n from "i18next";
+import React from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectUpdateAvailable } from "../../redux/application/application.selectors";
+import { AlertOutlined } from "@ant-design/icons";
+import { useTranslation } from "react-i18next";
+import { setUpdateAvailable } from "../../redux/application/application.actions";
+import { store } from "../../redux/store";
+import * as serviceWorkerRegistration from "../../serviceWorkerRegistration";
+
+let globalRegistration;
+
+const mapStateToProps = createStructuredSelector({
+  updateAvailable: selectUpdateAvailable,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(UpdateAlert);
+
+export function UpdateAlert({ updateAvailable }) {
+  const { t } = useTranslation();
+  if (!updateAvailable) return null;
+  return (
+    <Alert
+      message={t("general.messages.newversiontitle")}
+      showIcon
+      icon={<AlertOutlined />}
+      description={
+        <Row gutter={[16, 16]}>
+          <Col sm={24} md={16} lg={18}>
+            {t("general.messages.newversionmessage")}
+          </Col>
+          <Col sm={24} md={8} lg={6}>
+            <Space wrap>
+              <Button
+                onClick={async () => {
+                  window.open("https://imex-online.noticeable.news/", "_blank");
+                }}
+              >
+                {i18n.t("general.actions.viewreleasenotes")}
+              </Button>
+              <Button
+                type="primary"
+                onClick={async () => {
+                  if (globalRegistration && globalRegistration.waiting) {
+                    await globalRegistration.unregister();
+                    // Makes Workbox call skipWaiting()
+                    globalRegistration.waiting.postMessage({
+                      type: "SKIP_WAITING",
+                    });
+                    // Once the service worker is unregistered, we can reload the page to let
+                    // the browser download a fresh copy of our app (invalidating the cache)
+                    window.location.reload();
+                  }
+                }}
+              >
+                {i18n.t("general.actions.refresh")}
+              </Button>
+            </Space>
+          </Col>
+        </Row>
+      }
+      closable={false}
+      type="warning"
+    />
+  );
+}
+
+const onServiceWorkerUpdate = (registration) => {
+  console.log("onServiceWorkerUpdate", registration);
+  globalRegistration = registration;
+  store.dispatch(setUpdateAvailable(true));
+};
+
+serviceWorkerRegistration.register({ onUpdate: onServiceWorkerUpdate });

client/src/graphql/appointments.queries.js

@@ -57,6 +57,8 @@ 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,36 +1,5 @@
 import { gql } from "@apollo/client";
 
-// export const CONVERSATION_LIST_SUBSCRIPTION = gql`
-//   subscription CONVERSATION_LIST_SUBSCRIPTION {
-//     conversations(
-//       order_by: { updated_at: desc }
-//       limit: 50
-//       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,10 +13,11 @@ export const UNREAD_CONVERSATION_COUNT = gql`
 `;
 
 export const CONVERSATION_LIST_QUERY = gql`
-  query CONVERSATION_LIST_QUERY {
+  query CONVERSATION_LIST_QUERY($offset: Int!) {
     conversations(
       order_by: { updated_at: desc }
       limit: 50
+      offset: $offset
       where: { archived: { _eq: false } }
     ) {
       phone_num

client/src/graphql/jobs-lines.queries.js

@@ -34,6 +34,7 @@ export const GET_LINE_TICKET_BY_PK = gql`
       id
       lbr_adjustments
       converted
+      status
     }
     joblines(where: { jobid: { _eq: $id }, removed: { _eq: false } }) {
       id

client/src/graphql/jobs.queries.js

@@ -682,6 +682,7 @@ export const GET_JOB_BY_PK = gql`
       date_rentalresp
       date_exported
       date_repairstarted
+      date_void
       status
       owner_owing
       tax_registration_number
@@ -1075,6 +1076,10 @@ export const UPDATE_JOB = gql`
         lbr_adjustments
         suspended
         queued_for_parts
+        scheduled_completion
+        actual_in
+        date_repairstarted
+        date_void
       }
     }
   }
@@ -1122,6 +1127,7 @@ export const VOID_JOB = gql`
     update_jobs_by_pk(_set: $job, pk_columns: { id: $jobId }) {
       id
       date_exported
+      date_void
       status
       alt_transport
       ro_number
@@ -1216,10 +1222,10 @@ export const ACTIVE_JOBS_FOR_AUTOCOMPLETE = gql`
   query ACTIVE_JOBS_FOR_AUTOCOMPLETE($statuses: [String!]!) {
     jobs(where: { status: { _in: $statuses } }) {
       id
+      ownr_co_nm
       ownr_fn
       ownr_ln
       ro_number
-
       vehicleid
       v_make_desc
       v_model_desc
@@ -1247,6 +1253,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
       }
     ) {
       id
+      ownr_co_nm
       ownr_fn
       ownr_ln
       ro_number
@@ -1263,6 +1270,7 @@ export const SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE = gql`
   query SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE($id: uuid!) {
     jobs_by_pk(id: $id) {
       id
+      ownr_co_nm
       ownr_fn
       ownr_ln
       ro_number
@@ -1281,6 +1289,7 @@ export const SEARCH_FOR_JOBS = gql`
     search_jobs(args: { search: $search }, limit: 25) {
       id
       ro_number
+      ownr_co_nm
       ownr_fn
       ownr_ln
     }

client/src/graphql/notes.queries.js

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

client/src/graphql/payments.queries.js

@@ -16,19 +16,15 @@ 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
-      jobid
-      paymentnum
       date
+      exportedat
+      jobid
       job {
         id
-        ro_number
         ownerid
         ownr_co_nm
         ownr_fn
@@ -39,15 +35,14 @@ export const QUERY_ALL_PAYMENTS_PAGINATED = gql`
           ownr_fn
           ownr_ln
         }
+        ro_number
       }
-      transactionid
       memo
-      type
-      amount
-      stripeid
-      exportedat
-      stripeid
       payer
+      paymentnum
+      stripeid
+      transactionid
+      type
     }
     payments_aggregate {
       aggregate {
@@ -62,16 +57,31 @@ export const UPDATE_PAYMENT = gql`
     update_payments(where: { id: { _eq: $paymentId } }, _set: $payment) {
       returning {
         id
-        transactionid
-        memo
-        type
         amount
-        stripeid
+        created_at
+        date
         exportedat
-        stripeid
+        jobid
+        job {
+          id
+          ownerid
+          ownr_co_nm
+          ownr_fn
+          ownr_ln
+          owner {
+            id
+            ownr_co_nm
+            ownr_fn
+            ownr_ln
+          }
+          ro_number
+        }
+        memo
         payer
         paymentnum
-        date
+        stripeid
+        transactionid
+        type
       }
     }
   }
@@ -85,17 +95,31 @@ export const UPDATE_PAYMENTS = gql`
     update_payments(where: { id: { _in: $paymentIdList } }, _set: $payment) {
       returning {
         id
-        exportedat
-        transactionid
-        memo
-        type
         amount
-        stripeid
+        created_at
+        date
         exportedat
-        stripeid
+        jobid
+        job {
+          id
+          ownerid
+          ownr_co_nm
+          ownr_fn
+          ownr_ln
+          owner {
+            id
+            ownr_co_nm
+            ownr_fn
+            ownr_ln
+          }
+          ro_number
+        }
+        memo
         payer
         paymentnum
-        date
+        stripeid
+        transactionid
+        type
       }
     }
   }
@@ -115,36 +139,35 @@ 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) {
-    id
-    created_at
-    jobid
-    paymentnum
-    date
-    job {
+export const QUERY_PAYMENT_BY_ID = gql`
+  query QUERY_PAYMENT_BY_ID($paymentId: uuid!) {
+    payments_by_pk(id: $paymentId) {
       id
-      ro_number
-      ownerid
-      ownr_co_nm
-      ownr_fn
-      ownr_ln
-      owner {
+      amount
+      created_at
+      exportedat
+      date
+      jobid
+      job {
         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/dms/dms.container.jsx

@@ -13,7 +13,7 @@ import queryString from "query-string";
 import React, { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useHistory, useLocation, Link } from "react-router-dom";
+import { Link, useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import SocketIO from "socket.io-client";
 import AlertComponent from "../../components/alert/alert.component";
@@ -22,6 +22,7 @@ import DmsCustomerSelector from "../../components/dms-customer-selector/dms-cust
 import DmsLogEvents from "../../components/dms-log-events/dms-log-events.component";
 import DmsPostForm from "../../components/dms-post-form/dms-post-form.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
+import { OwnerNameDisplayFunction } from "../../components/owner-name-display/owner-name-display.component";
 import { auth } from "../../firebase/firebase.utils";
 import { QUERY_JOB_EXPORT_DMS } from "../../graphql/jobs.queries";
 import {
@@ -29,7 +30,6 @@ import {
   setSelectedHeader,
 } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { OwnerNameDisplayFunction } from "../../components/owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -46,6 +46,7 @@ export const socket = SocketIO(
   process.env.NODE_ENV === "production"
     ? process.env.REACT_APP_AXIOS_BASE_API_URL
     : window.location.origin,
+    // "http://localhost:4000",  // for dev testing,
   {
     path: "/ws",
     withCredentials: true,

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

@@ -25,6 +25,7 @@ import {
 import * as Sentry from "@sentry/react";
 
 import "./manage.page.styles.scss";
+import UpdateAlert from "../../components/update-alert/update-alert.component";
 
 const ManageRootPage = lazy(() =>
   import("../manage-root/manage-root.page.container")
@@ -394,6 +395,7 @@ export function Manage({ match, conflict, bodyshop }) {
     <>
       <ChatAffixContainer />
       <Layout className="layout-container">
+        <UpdateAlert />
         <HeaderContainer />
 
         <Content className="content-container">

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

@@ -6,7 +6,7 @@ import AlertComponent from "../../components/alert/alert.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import { QUERY_BODYSHOP } from "../../graphql/bodyshop.queries";
 import { setBodyshop } from "../../redux/user/user.actions";
-import "../../utils/RegisterSw";
+//import "../../utils/RegisterSw";
 import ManagePage from "./manage.page.component";
 
 const mapDispatchToProps = (dispatch) => ({

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

@@ -1,5 +1,7 @@
 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";
@@ -24,6 +26,9 @@ 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");
@@ -35,9 +40,16 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
     ]);
   }, [t, setSelectedHeader, setBreadcrumbs, bodyshop.shopname]);
 
+  useEffect(() => {
+    if (!search.tab) history.push({ search: "?tab=info" });
+  }, [history, search]);
+
   return (
     <RbacWrapper action="shop:config">
-      <Tabs>
+      <Tabs
+        defaultActiveKey={search.tab}
+        onChange={(key) => history.push({ search: `?tab=${key}` })}
+      >
         <Tabs.TabPane tab={t("bodyshop.labels.shopinfo")} key="info">
           <ShopInfoContainer />
         </Tabs.TabPane>

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

@@ -12,6 +12,7 @@ import TechSider from "../../components/tech-sider/tech-sider.component";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import FeatureWrapper from "../../components/feature-wrapper/feature-wrapper.component";
 import "./tech.page.styles.scss";
+import UpdateAlert from "../../components/update-alert/update-alert.component";
 const TimeTicketModalContainer = lazy(() =>
   import("../../components/time-ticket-modal/time-ticket-modal.container")
 );
@@ -56,7 +57,9 @@ export function TechPage({ technician, match }) {
       <TechSider />
       <Layout>
         {technician ? null : <Redirect to={`${match.path}/login`} />}
+        <UpdateAlert />
         <TechHeader />
+
         <Content className="tech-content-container">
           <ErrorBoundary>
             <Suspense

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

@@ -9,7 +9,7 @@ import LoadingSpinner from "../../components/loading-spinner/loading-spinner.com
 import { useTranslation } from "react-i18next";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { createStructuredSelector } from "reselect";
-import "../../utils/RegisterSw";
+//import "../../utils/RegisterSw";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,

client/src/redux/application/application.actions.js

@@ -62,3 +62,8 @@ export const setProblemJobs = (problemJobs) => ({
   type: ApplicationActionTypes.SET_PROBLEM_JOBS,
   payload: problemJobs,
 });
+
+export const setUpdateAvailable = (isUpdateAvailable) => ({
+  type: ApplicationActionTypes.SET_UPDATE_AVAILABLE,
+  payload: isUpdateAvailable,
+});

client/src/redux/application/application.reducer.js

@@ -3,6 +3,7 @@ import ApplicationActionTypes from "./application.types";
 const INITIAL_STATE = {
   loading: false,
   online: true,
+  updateAvailable: false,
   breadcrumbs: [],
   recentItems: [],
   selectedHeader: "home",
@@ -18,6 +19,11 @@ const INITIAL_STATE = {
 
 const applicationReducer = (state = INITIAL_STATE, action) => {
   switch (action.type) {
+    case ApplicationActionTypes.SET_UPDATE_AVAILABLE:
+      return {
+        ...state,
+        updateAvailable: action.payload,
+      };
     case ApplicationActionTypes.SET_SELECTED_HEADER:
       return {
         ...state,

client/src/redux/application/application.selectors.js

@@ -48,3 +48,7 @@ export const selectProblemJobs = createSelector(
   [selectApplication],
   (application) => application.problemJobs
 );
+export const selectUpdateAvailable = createSelector(
+  [selectApplication],
+  (application) => application.updateAvailable
+);

client/src/redux/application/application.types.js

@@ -12,5 +12,6 @@ const ApplicationActionTypes = {
   SET_ONLINE_STATUS: "SET_ONLINE_STATUS",
   INSERT_AUDIT_TRAIL: "INSERT_AUDIT_TRAIL",
   SET_PROBLEM_JOBS: "SET_PROBLEM_JOBS",
+  SET_UPDATE_AVAILABLE: "SET_UPDATE_AVAILABLE"
 };
 export default ApplicationActionTypes;

client/src/translations/en_us/common.json

@@ -49,7 +49,7 @@
 				"blocked": "Blocked",
 				"cancelledappointment": "Canceled appointment for: ",
 				"completingjobs": "Completing Jobs",
-				"dataconsistency": "{{ro_number}} has a data consistency issue. It may have been excluded for scheduling purposes. CODE: {{code}}.",
+				"dataconsistency": "<0>{{ro_number}}</0> has a data consistency issue. It may have been excluded for scheduling purposes. CODE: {{code}}.",
 				"expectedjobs": "Expected Jobs in Production: ",
 				"expectedprodhrs": "Expected Production Hours:",
 				"history": "History",
@@ -63,6 +63,7 @@
 				"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": {
@@ -100,9 +101,11 @@
 			"messages": {
 				"admin_jobmarkexported": "ADMIN: Job marked as exported.",
 				"admin_jobmarkforreexport": "ADMIN: Job marked for re-export.",
+				"admin_jobuninvoice": "ADMIN: Job has been uninvoiced.",
 				"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}}.",
@@ -227,6 +230,7 @@
 		},
 		"bodyshop": {
 			"actions": {
+				"add_task_preset": "",
 				"addapptcolor": "Add Appointment Color",
 				"addbucket": "Add Definition",
 				"addpartslocation": "Add Parts Location",
@@ -266,6 +270,8 @@
 					"templates": "Delivery Templates"
 				},
 				"dms": {
+					"apcontrol": "AP Control Number",
+					"appostingaccount": "AP Posting Account",
 					"cashierid": "Cashier ID",
 					"default_journal": "Default Journal",
 					"disablebillwip": "Disable bill WIP for A/P Posting",
@@ -339,6 +345,12 @@
 				},
 				"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",
@@ -374,6 +386,9 @@
 						"export": "CSI -> Export",
 						"page": "CSI -> Page"
 					},
+					"employee_teams": {
+						"page": ""
+					},
 					"employees": {
 						"page": "Employees -> List"
 					},
@@ -393,7 +408,8 @@
 						"list-active": "Jobs -> List Active",
 						"list-all": "Jobs -> List All",
 						"list-ready": "Jobs -> List Ready",
-						"partsqueue": "Jobs -> Parts Queue"
+						"partsqueue": "Jobs -> Parts Queue",
+						"void": "Jobs -> Void"
 					},
 					"owners": {
 						"detail": "Owners -> Detail",
@@ -432,10 +448,15 @@
 					},
 					"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"
 					}
@@ -453,6 +474,8 @@
 					"federal_tax": "Federal Tax",
 					"federal_tax_itc": "Federal Tax Credit",
 					"gst_override": "GST Override Account #",
+					"invoiceexemptcode": "",
+					"itemexemptcode": "",
 					"la1": "LA1",
 					"la2": "LA2",
 					"la3": "LA3",
@@ -504,12 +527,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)",
-					"color": "Job Color"
+					"target": "Target (count)"
 				},
 				"state": "Province/State",
 				"state_tax_id": "Provincial/State Tax ID (PST,  QST)",
@@ -575,6 +598,7 @@
 					"title": "DMS"
 				},
 				"emaillater": "Email Later",
+				"employee_teams": "",
 				"employees": "Employees",
 				"estimators": "Estimators",
 				"filehandlers": "File Handlers",
@@ -583,6 +607,7 @@
 				"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",
@@ -609,6 +634,7 @@
 				"speedprint": "Speed Print Configuration",
 				"ssbuckets": "Job Size Definitions",
 				"systemsettings": "System Settings",
+				"task-presets": "",
 				"workingdays": "Working Days"
 			},
 			"successes": {
@@ -835,7 +861,9 @@
 				"prodhrssummary": "Production Hours Summary",
 				"productiondollars": "Total dollars in Production",
 				"productionhours": "Total hours in Production",
-				"projectedmonthlysales": "Projected Monthly Sales"
+				"projectedmonthlysales": "Projected Monthly Sales",
+				"scheduledintoday": "Sheduled In Today: {{date}}",
+				"scheduledouttoday": "Sheduled Out Today: {{date}}"
 			}
 		},
 		"dms": {
@@ -908,6 +936,18 @@
 				"sent": "Email sent successfully."
 			}
 		},
+		"employee_teams": {
+			"actions": {
+				"new": "",
+				"newmember": ""
+			},
+			"fields": {
+				"active": "",
+				"employeeid": "",
+				"name": "",
+				"percentage": ""
+			}
+		},
 		"employees": {
 			"actions": {
 				"addvacation": "Add Vacation",
@@ -1083,7 +1123,7 @@
 			},
 			"messages": {
 				"exception": "$t(titles.app) has encountered an error. Please try again. If the problem persists, please submit a support ticket or contact us.",
-				"newversionmessage": "Click refresh below to update to the latest available version of ImEX Online.  Please make sure all other tabs and windows are closed.",
+				"newversionmessage": "Click refresh to update to the latest available version of ImEX Online.  Please make sure all other tabs and windows are closed.",
 				"newversiontitle": "New version of ImEX Online Available",
 				"noacctfilepath": "There is no accounting file path set. You will not be able to export any items.",
 				"nofeatureaccess": "You do not have access to this feature of ImEX Online.  Please contact support to request a license for this feature.",
@@ -1147,6 +1187,30 @@
 				"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.",
@@ -1376,10 +1440,11 @@
 				"date_repairstarted": "Repairs Started",
 				"date_scheduled": "Scheduled",
 				"date_towin": "Towed In",
+				"date_void": "Void",
 				"ded_amt": "Deductible",
 				"ded_note": "Deductible Note",
 				"ded_status": "Deductible Status",
-				"depreciation_taxes": "Depreciation/Taxes",
+				"depreciation_taxes": "Betterment/Depreciation/Taxes",
 				"dms": {
 					"address": "Customer Address",
 					"amount": "Amount",
@@ -1391,6 +1456,7 @@
 					"cost_dms_acctnumber": "Cost DMS Acct #",
 					"dms_make": "DMS Make",
 					"dms_model": "DMS Model",
+					"dms_unsold": "New, Unsold Vehicle",
 					"dms_wip_acctnumber": "Cost WIP DMS Acct #",
 					"id": "DMS ID",
 					"inservicedate": "In Service Date",
@@ -1579,6 +1645,7 @@
 				"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).",
@@ -1715,6 +1782,7 @@
 					"partstotal": "This is the total of all parts and sublet amounts on the vehicle (some of these may require an in-house invoice).<br/>\nItems such as shop and paint materials, labor online lines, etc. are not included in this total.",
 					"totalreturns": "The total <b>retail</b> amount of returns created for this job."
 				},
+				"ppc": "",
 				"profileadjustments": "",
 				"prt_dsmk_total": "Line Item Adjustment",
 				"rates": "Rates",
@@ -1855,6 +1923,7 @@
 				"customers": "Customers",
 				"dashboard": "Dashboard",
 				"enterbills": "Enter Bills",
+				"entercardpayment": "",
 				"enterpayment": "Enter Payments",
 				"entertimeticket": "Enter Time Tickets",
 				"export": "Export",
@@ -1866,6 +1935,7 @@
 				"newjob": "Create New Job",
 				"owners": "Owners",
 				"parts-queue": "Parts Queue",
+				"paymentremindersms": "",
 				"phonebook": "Phonebook",
 				"productionboard": "Production Board - Visual",
 				"productionlist": "Production Board - List",
@@ -1891,6 +1961,7 @@
 				"shop_vendors": "Vendors",
 				"temporarydocs": "Temporary Documents",
 				"timetickets": "Time Tickets",
+				"ttapprovals": "",
 				"vehicles": "Vehicles"
 			},
 			"jobsactions": {
@@ -1974,6 +2045,16 @@
 				"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": {
@@ -2141,6 +2222,8 @@
 				"external": "External",
 				"findermodal": "ICBC Payment Finder",
 				"insurance": "Insurance",
+				"markexported": "Mark Exported",
+				"markforreexport": "Mark for Re-export",
 				"new": "New Payment",
 				"signup": "Please contact support to sign up for electronic payments.",
 				"title": "Payments",
@@ -2149,6 +2232,7 @@
 			"successes": {
 				"exported": "Payment(s) exported successfully.",
 				"markexported": "Payment(s) marked exported.",
+				"markreexported": "Payment marked for re-export successfully",
 				"payment": "Payment created successfully. ",
 				"stripe": "Credit card transaction charged successfully."
 			}
@@ -2243,7 +2327,7 @@
 				"folder_label_multiple": "Folder Label - Multi",
 				"glass_express_checklist": "Glass Express Checklist",
 				"guarantee": "Repair Guarantee",
-				"individual_job_note": "Job Note RO # {{ro_number}}",
+				"individual_job_note": "RO Job Note",
 				"invoice_customer_payable": "Invoice (Customer Payable)",
 				"invoice_total_payable": "Invoice (Total Payable)",
 				"iou_form": "IOU Form",
@@ -2259,7 +2343,8 @@
 				"mechanical_authorization": "Mechanical Authorization",
 				"mpi_animal_checklist": "MPI - Animal Checklist",
 				"mpi_eglass_auth": "MPI - eGlass Auth",
-				"mpi_final_acct_sheet": "MPI - Final Accounting Sheet",
+				"mpi_final_acct_sheet": "MPI - Final Accounting Sheet (Direct Repair)",
+				"mpi_final_repair_acct_sheet": "MPI - Final Accounting Sheet",
 				"paint_grid": "Paint Grid",
 				"parts_invoice_label_single": "Parts Label Single",
 				"parts_label_multiple": "Parts Label - Multi",
@@ -2321,7 +2406,9 @@
 			},
 			"subjects": {
 				"jobs": {
+					"individual_job_note": "Job Note RO: {{ro_number}}",
 					"parts_order": "Parts Order PO: {{ro_number}} - {{name}}",
+					"parts_return_slip":"Parts Return PO: {{ro_number}} - {{name}}",
 					"sublet_order": "Sublet Order PO: {{ro_number}} - {{name}}"
 				}
 			},
@@ -2364,6 +2451,7 @@
 						"qbo_usa": "QBO USA"
 					}
 				},
+				"cardcolor": "Card Colors",
 				"cardsettings": "Card Settings",
 				"clm_no": "Claim Number",
 				"comment": "Comment",
@@ -2374,6 +2462,7 @@
 				"ins_co_nm": "Insurance Company Name",
 				"jobdetail": "Job Details",
 				"laborhrs": "Labor Hours",
+				"legend": "Legend:",
 				"note": "Production Note",
 				"ownr_nm": "Owner Name",
 				"paintpriority": "P/P",
@@ -2386,9 +2475,7 @@
 				"sublets": "Sublets",
 				"totalhours": "Total Hrs ",
 				"touchtime": "T/T",
-				"viewname": "View Name",
-				"legend": "Legend:",
-				"cardcolor": "Card Colors"
+				"viewname": "View Name"
 			},
 			"successes": {
 				"removed": "Job removed from production."
@@ -2489,6 +2576,7 @@
 				"jobs_completed_not_invoiced": "Jobs Completed not Invoiced",
 				"jobs_invoiced_not_exported": "Jobs Invoiced not Exported",
 				"jobs_reconcile": "Parts/Sublet/Labor Reconciliation",
+				"jobs_scheduled_completion": "Jobs Scheduled Completion",
 				"lag_time": "Lag Time",
 				"open_orders": "Open Orders by Date",
 				"open_orders_csr": "Open Orders by CSR",
@@ -2537,6 +2625,7 @@
 				"timetickets_summary": "Time Tickets Summary",
 				"unclaimed_hrs": "Unclaimed Hours",
 				"void_ros": "Void ROs",
+				"work_in_progress_jobs": "Work in Progress - Jobs",
 				"work_in_progress_labour": "Work in Progress - Labor",
 				"work_in_progress_payables": "Work in Progress - Payables"
 			}
@@ -2545,6 +2634,7 @@
 			"labels": {
 				"atssummary": "ATS Summary",
 				"employeevacation": "Employee Vacations",
+				"estimators": "Filter by Writer/Customer Rep.",
 				"ins_co_nm_filter": "Filter by Insurance Company",
 				"intake": "Intake Events",
 				"manual": "Manual Events",
@@ -2614,6 +2704,7 @@
 		},
 		"timetickets": {
 			"actions": {
+				"claimtasks": "",
 				"clockin": "Clock In",
 				"clockout": "Clock Out",
 				"enter": "Enter New Time Ticket",
@@ -2634,10 +2725,12 @@
 				"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",
@@ -2724,6 +2817,7 @@
 				"shop-vendors": "Vendors",
 				"temporarydocs": "Temporary Documents",
 				"timetickets": "Time Tickets",
+				"ttapprovals": "",
 				"vehicle-details": "Vehicle: {{vehicle}}",
 				"vehicles": "Vehicles"
 			},
@@ -2769,9 +2863,15 @@
 			"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,6 +63,7 @@
 				"scheduledfor": "Cita programada para:",
 				"severalerrorsfound": "",
 				"smartscheduling": "",
+				"smspaymentreminder": "",
 				"suggesteddates": ""
 			},
 			"successes": {
@@ -100,9 +101,11 @@
 			"messages": {
 				"admin_jobmarkexported": "",
 				"admin_jobmarkforreexport": "",
+				"admin_jobuninvoice": "",
 				"admin_jobunvoid": "",
 				"billposted": "",
 				"billupdated": "",
+				"failedpayment": "",
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
@@ -227,6 +230,7 @@
 		},
 		"bodyshop": {
 			"actions": {
+				"add_task_preset": "",
 				"addapptcolor": "",
 				"addbucket": "",
 				"addpartslocation": "",
@@ -266,6 +270,8 @@
 					"templates": ""
 				},
 				"dms": {
+					"apcontrol": "",
+					"appostingaccount": "",
 					"cashierid": "",
 					"default_journal": "",
 					"disablebillwip": "",
@@ -339,6 +345,12 @@
 				},
 				"md_payment_types": "",
 				"md_referral_sources": "",
+				"md_tasks_presets": {
+					"hourstype": "",
+					"memo": "",
+					"name": "",
+					"percent": ""
+				},
 				"messaginglabel": "",
 				"messagingtext": "",
 				"noteslabel": "",
@@ -374,6 +386,9 @@
 						"export": "",
 						"page": ""
 					},
+					"employee_teams": {
+						"page": ""
+					},
 					"employees": {
 						"page": ""
 					},
@@ -393,7 +408,8 @@
 						"list-active": "",
 						"list-all": "",
 						"list-ready": "",
-						"partsqueue": ""
+						"partsqueue": "",
+						"void": ""
 					},
 					"owners": {
 						"detail": "",
@@ -432,10 +448,15 @@
 					},
 					"timetickets": {
 						"edit": "",
+						"editcommitted": "",
 						"enter": "",
 						"list": "",
 						"shiftedit": ""
 					},
+					"ttapprovals": {
+						"approve": "",
+						"view": ""
+					},
 					"users": {
 						"editaccess": ""
 					}
@@ -453,6 +474,8 @@
 					"federal_tax": "",
 					"federal_tax_itc": "",
 					"gst_override": "",
+					"invoiceexemptcode": "",
+					"itemexemptcode": "",
 					"la1": "",
 					"la2": "",
 					"la3": "",
@@ -504,6 +527,7 @@
 					"dailyhrslimit": ""
 				},
 				"ssbuckets": {
+					"color": "",
 					"gte": "",
 					"id": "",
 					"label": "",
@@ -574,6 +598,7 @@
 					"title": ""
 				},
 				"emaillater": "",
+				"employee_teams": "",
 				"employees": "",
 				"estimators": "",
 				"filehandlers": "",
@@ -582,6 +607,7 @@
 				"jobstatuses": "",
 				"laborrates": "",
 				"licensing": "",
+				"md_tasks_presets": "",
 				"md_to_emails": "",
 				"md_to_emails_emails": "",
 				"messagingpresets": "",
@@ -608,6 +634,7 @@
 				"speedprint": "",
 				"ssbuckets": "",
 				"systemsettings": "",
+				"task-presets": "",
 				"workingdays": ""
 			},
 			"successes": {
@@ -834,7 +861,9 @@
 				"prodhrssummary": "",
 				"productiondollars": "",
 				"productionhours": "",
-				"projectedmonthlysales": ""
+				"projectedmonthlysales": "",
+				"scheduledintoday": "",
+				"scheduledouttoday": ""
 			}
 		},
 		"dms": {
@@ -907,6 +936,18 @@
 				"sent": "Correo electrónico enviado con éxito."
 			}
 		},
+		"employee_teams": {
+			"actions": {
+				"new": "",
+				"newmember": ""
+			},
+			"fields": {
+				"active": "",
+				"employeeid": "",
+				"name": "",
+				"percentage": ""
+			}
+		},
 		"employees": {
 			"actions": {
 				"addvacation": "",
@@ -1146,6 +1187,30 @@
 				"updated": ""
 			}
 		},
+		"job_payments": {
+			"buttons": {
+				"goback": "",
+				"proceedtopayment": "",
+				"refundpayment": ""
+			},
+			"notifications": {
+				"error": {
+					"description": "",
+					"title": ""
+				}
+			},
+			"titles": {
+				"amount": "",
+				"dateOfPayment": "",
+				"descriptions": "",
+				"payer": "",
+				"payername": "",
+				"paymentid": "",
+				"paymenttype": "",
+				"refundamount": "",
+				"transactionid": ""
+			}
+		},
 		"joblines": {
 			"actions": {
 				"converttolabor": "",
@@ -1375,6 +1440,7 @@
 				"date_repairstarted": "",
 				"date_scheduled": "Programado",
 				"date_towin": "",
+				"date_void": "",
 				"ded_amt": "Deducible",
 				"ded_note": "",
 				"ded_status": "Estado deducible",
@@ -1390,6 +1456,7 @@
 					"cost_dms_acctnumber": "",
 					"dms_make": "",
 					"dms_model": "",
+					"dms_unsold": "",
 					"dms_wip_acctnumber": "",
 					"id": "",
 					"inservicedate": "",
@@ -1578,6 +1645,7 @@
 				"scheddates": ""
 			},
 			"labels": {
+				"act_price_ppc": "",
 				"actual_completion_inferred": "",
 				"actual_delivery_inferred": "",
 				"actual_in_inferred": "",
@@ -1714,6 +1782,7 @@
 					"partstotal": "",
 					"totalreturns": ""
 				},
+				"ppc": "",
 				"profileadjustments": "",
 				"prt_dsmk_total": "",
 				"rates": "Tarifas",
@@ -1854,6 +1923,7 @@
 				"customers": "Clientes",
 				"dashboard": "",
 				"enterbills": "",
+				"entercardpayment": "",
 				"enterpayment": "",
 				"entertimeticket": "",
 				"export": "",
@@ -1865,6 +1935,7 @@
 				"newjob": "",
 				"owners": "propietarios",
 				"parts-queue": "",
+				"paymentremindersms": "",
 				"phonebook": "",
 				"productionboard": "",
 				"productionlist": "",
@@ -1890,6 +1961,7 @@
 				"shop_vendors": "Vendedores",
 				"temporarydocs": "",
 				"timetickets": "",
+				"ttapprovals": "",
 				"vehicles": "Vehículos"
 			},
 			"jobsactions": {
@@ -1973,6 +2045,16 @@
 				"critical": "Crítico",
 				"private": "Privado",
 				"text": "Contenido",
+				"type": "",
+				"types": {
+					"customer": "",
+					"general": "",
+					"office": "",
+					"paint": "",
+					"parts": "",
+					"shop": "",
+					"supplement": ""
+				},
 				"updatedat": "Actualizado en"
 			},
 			"labels": {
@@ -2140,6 +2222,8 @@
 				"external": "",
 				"findermodal": "",
 				"insurance": "",
+				"markexported": "",
+				"markforreexport": "",
 				"new": "",
 				"signup": "",
 				"title": "",
@@ -2148,6 +2232,7 @@
 			"successes": {
 				"exported": "",
 				"markexported": "",
+				"markreexported": "",
 				"payment": "",
 				"stripe": ""
 			}
@@ -2259,6 +2344,7 @@
 				"mpi_animal_checklist": "",
 				"mpi_eglass_auth": "",
 				"mpi_final_acct_sheet": "",
+				"mpi_final_repair_acct_sheet": "",
 				"paint_grid": "",
 				"parts_invoice_label_single": "",
 				"parts_label_multiple": "",
@@ -2320,7 +2406,9 @@
 			},
 			"subjects": {
 				"jobs": {
+					"individual_job_note": "",
 					"parts_order": "",
+					"parts_return_slip": "",
 					"sublet_order": ""
 				}
 			},
@@ -2363,6 +2451,7 @@
 						"qbo_usa": ""
 					}
 				},
+				"cardcolor": "",
 				"cardsettings": "",
 				"clm_no": "",
 				"comment": "",
@@ -2373,6 +2462,7 @@
 				"ins_co_nm": "",
 				"jobdetail": "",
 				"laborhrs": "",
+				"legend": "",
 				"note": "",
 				"ownr_nm": "",
 				"paintpriority": "",
@@ -2486,6 +2576,7 @@
 				"jobs_completed_not_invoiced": "",
 				"jobs_invoiced_not_exported": "",
 				"jobs_reconcile": "",
+				"jobs_scheduled_completion": "",
 				"lag_time": "",
 				"open_orders": "",
 				"open_orders_csr": "",
@@ -2534,6 +2625,7 @@
 				"timetickets_summary": "",
 				"unclaimed_hrs": "",
 				"void_ros": "",
+				"work_in_progress_jobs": "",
 				"work_in_progress_labour": "",
 				"work_in_progress_payables": ""
 			}
@@ -2542,6 +2634,7 @@
 			"labels": {
 				"atssummary": "",
 				"employeevacation": "",
+				"estimators": "",
 				"ins_co_nm_filter": "",
 				"intake": "",
 				"manual": "",
@@ -2611,6 +2704,7 @@
 		},
 		"timetickets": {
 			"actions": {
+				"claimtasks": "",
 				"clockin": "",
 				"clockout": "",
 				"enter": "",
@@ -2631,10 +2725,12 @@
 				"clockhours": "",
 				"clockoff": "",
 				"clockon": "",
+				"committed": "",
 				"cost_center": "",
 				"date": "",
 				"efficiency": "",
 				"employee": "",
+				"employee_team": "",
 				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
@@ -2721,6 +2817,7 @@
 				"shop-vendors": "",
 				"temporarydocs": "",
 				"timetickets": "",
+				"ttapprovals": "",
 				"vehicle-details": "",
 				"vehicles": ""
 			},
@@ -2766,9 +2863,15 @@
 			"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,6 +63,7 @@
 				"scheduledfor": "Rendez-vous prévu pour:",
 				"severalerrorsfound": "",
 				"smartscheduling": "",
+				"smspaymentreminder": "",
 				"suggesteddates": ""
 			},
 			"successes": {
@@ -100,9 +101,11 @@
 			"messages": {
 				"admin_jobmarkexported": "",
 				"admin_jobmarkforreexport": "",
+				"admin_jobuninvoice": "",
 				"admin_jobunvoid": "",
 				"billposted": "",
 				"billupdated": "",
+				"failedpayment": "",
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
@@ -227,6 +230,7 @@
 		},
 		"bodyshop": {
 			"actions": {
+				"add_task_preset": "",
 				"addapptcolor": "",
 				"addbucket": "",
 				"addpartslocation": "",
@@ -266,6 +270,8 @@
 					"templates": ""
 				},
 				"dms": {
+					"apcontrol": "",
+					"appostingaccount": "",
 					"cashierid": "",
 					"default_journal": "",
 					"disablebillwip": "",
@@ -339,6 +345,12 @@
 				},
 				"md_payment_types": "",
 				"md_referral_sources": "",
+				"md_tasks_presets": {
+					"hourstype": "",
+					"memo": "",
+					"name": "",
+					"percent": ""
+				},
 				"messaginglabel": "",
 				"messagingtext": "",
 				"noteslabel": "",
@@ -374,6 +386,9 @@
 						"export": "",
 						"page": ""
 					},
+					"employee_teams": {
+						"page": ""
+					},
 					"employees": {
 						"page": ""
 					},
@@ -393,7 +408,8 @@
 						"list-active": "",
 						"list-all": "",
 						"list-ready": "",
-						"partsqueue": ""
+						"partsqueue": "",
+						"void": ""
 					},
 					"owners": {
 						"detail": "",
@@ -432,10 +448,15 @@
 					},
 					"timetickets": {
 						"edit": "",
+						"editcommitted": "",
 						"enter": "",
 						"list": "",
 						"shiftedit": ""
 					},
+					"ttapprovals": {
+						"approve": "",
+						"view": ""
+					},
 					"users": {
 						"editaccess": ""
 					}
@@ -453,6 +474,8 @@
 					"federal_tax": "",
 					"federal_tax_itc": "",
 					"gst_override": "",
+					"invoiceexemptcode": "",
+					"itemexemptcode": "",
 					"la1": "",
 					"la2": "",
 					"la3": "",
@@ -504,6 +527,7 @@
 					"dailyhrslimit": ""
 				},
 				"ssbuckets": {
+					"color": "",
 					"gte": "",
 					"id": "",
 					"label": "",
@@ -574,6 +598,7 @@
 					"title": ""
 				},
 				"emaillater": "",
+				"employee_teams": "",
 				"employees": "",
 				"estimators": "",
 				"filehandlers": "",
@@ -582,6 +607,7 @@
 				"jobstatuses": "",
 				"laborrates": "",
 				"licensing": "",
+				"md_tasks_presets": "",
 				"md_to_emails": "",
 				"md_to_emails_emails": "",
 				"messagingpresets": "",
@@ -608,6 +634,7 @@
 				"speedprint": "",
 				"ssbuckets": "",
 				"systemsettings": "",
+				"task-presets": "",
 				"workingdays": ""
 			},
 			"successes": {
@@ -834,7 +861,9 @@
 				"prodhrssummary": "",
 				"productiondollars": "",
 				"productionhours": "",
-				"projectedmonthlysales": ""
+				"projectedmonthlysales": "",
+				"scheduledintoday": "",
+				"scheduledouttoday": ""
 			}
 		},
 		"dms": {
@@ -907,6 +936,18 @@
 				"sent": "E-mail envoyé avec succès."
 			}
 		},
+		"employee_teams": {
+			"actions": {
+				"new": "",
+				"newmember": ""
+			},
+			"fields": {
+				"active": "",
+				"employeeid": "",
+				"name": "",
+				"percentage": ""
+			}
+		},
 		"employees": {
 			"actions": {
 				"addvacation": "",
@@ -1146,6 +1187,30 @@
 				"updated": ""
 			}
 		},
+		"job_payments": {
+			"buttons": {
+				"goback": "",
+				"proceedtopayment": "",
+				"refundpayment": ""
+			},
+			"notifications": {
+				"error": {
+					"description": "",
+					"title": ""
+				}
+			},
+			"titles": {
+				"amount": "",
+				"dateOfPayment": "",
+				"descriptions": "",
+				"payer": "",
+				"payername": "",
+				"paymentid": "",
+				"paymenttype": "",
+				"refundamount": "",
+				"transactionid": ""
+			}
+		},
 		"joblines": {
 			"actions": {
 				"converttolabor": "",
@@ -1375,6 +1440,7 @@
 				"date_repairstarted": "",
 				"date_scheduled": "Prévu",
 				"date_towin": "",
+				"date_void": "",
 				"ded_amt": "Déductible",
 				"ded_note": "",
 				"ded_status": "Statut de franchise",
@@ -1390,6 +1456,7 @@
 					"cost_dms_acctnumber": "",
 					"dms_make": "",
 					"dms_model": "",
+					"dms_unsold": "",
 					"dms_wip_acctnumber": "",
 					"id": "",
 					"inservicedate": "",
@@ -1578,6 +1645,7 @@
 				"scheddates": ""
 			},
 			"labels": {
+				"act_price_ppc": "",
 				"actual_completion_inferred": "",
 				"actual_delivery_inferred": "",
 				"actual_in_inferred": "",
@@ -1714,6 +1782,7 @@
 					"partstotal": "",
 					"totalreturns": ""
 				},
+				"ppc": "",
 				"profileadjustments": "",
 				"prt_dsmk_total": "",
 				"rates": "Les taux",
@@ -1854,6 +1923,7 @@
 				"customers": "Les clients",
 				"dashboard": "",
 				"enterbills": "",
+				"entercardpayment": "",
 				"enterpayment": "",
 				"entertimeticket": "",
 				"export": "",
@@ -1865,6 +1935,7 @@
 				"newjob": "",
 				"owners": "Propriétaires",
 				"parts-queue": "",
+				"paymentremindersms": "",
 				"phonebook": "",
 				"productionboard": "",
 				"productionlist": "",
@@ -1890,6 +1961,7 @@
 				"shop_vendors": "Vendeurs",
 				"temporarydocs": "",
 				"timetickets": "",
+				"ttapprovals": "",
 				"vehicles": "Véhicules"
 			},
 			"jobsactions": {
@@ -1973,6 +2045,16 @@
 				"critical": "Critique",
 				"private": "privé",
 				"text": "Contenu",
+				"type": "",
+				"types": {
+					"customer": "",
+					"general": "",
+					"office": "",
+					"paint": "",
+					"parts": "",
+					"shop": "",
+					"supplement": ""
+				},
 				"updatedat": "Mis à jour à"
 			},
 			"labels": {
@@ -2140,6 +2222,8 @@
 				"external": "",
 				"findermodal": "",
 				"insurance": "",
+				"markexported": "",
+				"markforreexport": "",
 				"new": "",
 				"signup": "",
 				"title": "",
@@ -2148,6 +2232,7 @@
 			"successes": {
 				"exported": "",
 				"markexported": "",
+				"markreexported": "",
 				"payment": "",
 				"stripe": ""
 			}
@@ -2259,6 +2344,7 @@
 				"mpi_animal_checklist": "",
 				"mpi_eglass_auth": "",
 				"mpi_final_acct_sheet": "",
+				"mpi_final_repair_acct_sheet": "",
 				"paint_grid": "",
 				"parts_invoice_label_single": "",
 				"parts_label_multiple": "",
@@ -2320,7 +2406,9 @@
 			},
 			"subjects": {
 				"jobs": {
+					"individual_job_note": "",
 					"parts_order": "",
+					"parts_return_slip": "",
 					"sublet_order": ""
 				}
 			},
@@ -2363,6 +2451,7 @@
 						"qbo_usa": ""
 					}
 				},
+				"cardcolor": "",
 				"cardsettings": "",
 				"clm_no": "",
 				"comment": "",
@@ -2373,6 +2462,7 @@
 				"ins_co_nm": "",
 				"jobdetail": "",
 				"laborhrs": "",
+				"legend": "",
 				"note": "",
 				"ownr_nm": "",
 				"paintpriority": "",
@@ -2486,6 +2576,7 @@
 				"jobs_completed_not_invoiced": "",
 				"jobs_invoiced_not_exported": "",
 				"jobs_reconcile": "",
+				"jobs_scheduled_completion": "",
 				"lag_time": "",
 				"open_orders": "",
 				"open_orders_csr": "",
@@ -2534,6 +2625,7 @@
 				"timetickets_summary": "",
 				"unclaimed_hrs": "",
 				"void_ros": "",
+				"work_in_progress_jobs": "",
 				"work_in_progress_labour": "",
 				"work_in_progress_payables": ""
 			}
@@ -2542,6 +2634,7 @@
 			"labels": {
 				"atssummary": "",
 				"employeevacation": "",
+				"estimators": "",
 				"ins_co_nm_filter": "",
 				"intake": "",
 				"manual": "",
@@ -2611,6 +2704,7 @@
 		},
 		"timetickets": {
 			"actions": {
+				"claimtasks": "",
 				"clockin": "",
 				"clockout": "",
 				"enter": "",
@@ -2631,10 +2725,12 @@
 				"clockhours": "",
 				"clockoff": "",
 				"clockon": "",
+				"committed": "",
 				"cost_center": "",
 				"date": "",
 				"efficiency": "",
 				"employee": "",
+				"employee_team": "",
 				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
@@ -2721,6 +2817,7 @@
 				"shop-vendors": "",
 				"temporarydocs": "",
 				"timetickets": "",
+				"ttapprovals": "",
 				"vehicle-details": "",
 				"vehicles": ""
 			},
@@ -2766,9 +2863,15 @@
 			"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/AuditTrailMappings.js

@@ -36,6 +36,7 @@ const AuditTrailMapping = {
   jobnoteupdated: () => i18n.t("audit_trail.messages.jobnoteupdated"),
   jobnotedeleted: () => i18n.t("audit_trail.messages.jobnotedeleted"),
   admin_jobunvoid: () => i18n.t("audit_trail.messages.admin_jobunvoid"),
+  admin_jobuninvoice: () => i18n.t("audit_trail.messages.admin_jobuninvoice"),
   admin_jobmarkforreexport: () =>
     i18n.t("audit_trail.messages.admin_jobmarkforreexport"),
   admin_jobmarkexported: () =>

client/src/utils/GraphQLClient.js

@@ -3,7 +3,10 @@ import { setContext } from "@apollo/client/link/context";
 import { HttpLink } from "@apollo/client/link/http"; //"apollo-link-http";
 import { RetryLink } from "@apollo/client/link/retry";
 import { WebSocketLink } from "@apollo/client/link/ws";
-import { getMainDefinition } from "@apollo/client/utilities";
+import {
+  getMainDefinition,
+  offsetLimitPagination,
+} from "@apollo/client/utilities";
 //import { split } from "apollo-link";
 import apolloLogger from "apollo-link-logger";
 //import axios from "axios";
@@ -140,7 +143,15 @@ middlewares.push(
   )
 );
 
-const cache = new InMemoryCache({});
+const cache = new InMemoryCache({
+  typePolicies: {
+    Query: {
+      fields: {
+        conversations: offsetLimitPagination(),
+      },
+    },
+  },
+});
 
 const client = new ApolloClient({
   link: ApolloLink.from(middlewares),

client/src/utils/RegisterSw.js

@@ -3,6 +3,7 @@ import { Button, notification, Space } from "antd";
 import i18n from "i18next";
 import React from "react";
 import * as serviceWorkerRegistration from "../serviceWorkerRegistration";
+import { store } from "../redux/store";
 
 const onServiceWorkerUpdate = (registration) => {
   console.log("onServiceWorkerUpdate", registration);
@@ -33,6 +34,9 @@ const onServiceWorkerUpdate = (registration) => {
       </Button>
     </Space>
   );
+
+  store.dispatch()
+
   notification.open({
     icon: <AlertOutlined />,
     message: i18n.t("general.messages.newversiontitle"),

client/src/utils/TemplateConstants.js

@@ -7,22 +7,24 @@ 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: "CASL Authorization",
+            description: "",
             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: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.fippa_authorization"),
             key: "fippa_authorization",
             disabled: false,
@@ -30,7 +32,7 @@ export const TemplateList = (type, context) => {
           },
           diagnostic_authorization: {
             title: i18n.t("printcenter.jobs.diagnostic_authorization"),
-            description: "Diagnostic Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.diagnostic_authorization"),
             key: "diagnostic_authorization",
             disabled: false,
@@ -38,7 +40,7 @@ export const TemplateList = (type, context) => {
           },
           mechanical_authorization: {
             title: i18n.t("printcenter.jobs.mechanical_authorization"),
-            description: "Diagnostic Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.mechanical_authorization"),
             key: "mechanical_authorization",
             disabled: false,
@@ -46,7 +48,7 @@ export const TemplateList = (type, context) => {
           },
           appointment_reminder: {
             title: i18n.t("printcenter.jobs.appointment_reminder"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.appointment_reminder"),
             key: "appointment_reminder",
             disabled: false,
@@ -54,7 +56,7 @@ export const TemplateList = (type, context) => {
           },
           estimate_followup: {
             title: i18n.t("printcenter.jobs.estimate_followup"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.estimate_followup"),
             key: "estimate_followup",
             disabled: false,
@@ -62,7 +64,7 @@ export const TemplateList = (type, context) => {
           },
           express_repair_checklist: {
             title: i18n.t("printcenter.jobs.express_repair_checklist"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.express_repair_checklist"),
             key: "express_repair_checklist",
             disabled: false,
@@ -70,7 +72,7 @@ export const TemplateList = (type, context) => {
           },
           glass_express_checklist: {
             title: i18n.t("printcenter.jobs.glass_express_checklist"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.glass_express_checklist"),
             key: "glass_express_checklist",
             disabled: false,
@@ -78,7 +80,7 @@ export const TemplateList = (type, context) => {
           },
           stolen_recovery_checklist: {
             title: i18n.t("printcenter.jobs.stolen_recovery_checklist"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.stolen_recovery_checklist"),
             key: "stolen_recovery_checklist",
             disabled: false,
@@ -86,7 +88,7 @@ export const TemplateList = (type, context) => {
           },
           vehicle_check_in: {
             title: i18n.t("printcenter.jobs.vehicle_check_in"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.vehicle_check_in"),
             key: "vehicle_check_in",
             disabled: false,
@@ -94,7 +96,7 @@ export const TemplateList = (type, context) => {
           },
           parts_order_history: {
             title: i18n.t("printcenter.jobs.parts_order_history"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.parts_order_history"),
             key: "parts_order_history",
             disabled: false,
@@ -102,7 +104,7 @@ export const TemplateList = (type, context) => {
           },
           job_notes: {
             title: i18n.t("printcenter.jobs.job_notes"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.job_notes"),
             key: "job_notes",
             disabled: false,
@@ -110,7 +112,7 @@ export const TemplateList = (type, context) => {
           },
           ro_with_description: {
             title: i18n.t("printcenter.jobs.ro_with_description"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.ro_with_description"),
             key: "ro_with_description",
             disabled: false,
@@ -118,7 +120,7 @@ export const TemplateList = (type, context) => {
           },
           window_tag: {
             title: i18n.t("printcenter.jobs.window_tag"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.window_tag"),
             key: "window_tag",
             disabled: false,
@@ -126,7 +128,7 @@ export const TemplateList = (type, context) => {
           },
           supplement_request: {
             title: i18n.t("printcenter.jobs.supplement_request"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.supplement_request"),
             key: "supplement_request",
             disabled: false,
@@ -134,7 +136,7 @@ export const TemplateList = (type, context) => {
           },
           estimate: {
             title: i18n.t("printcenter.jobs.estimate"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.estimate"),
             key: "estimate",
             disabled: false,
@@ -142,7 +144,7 @@ export const TemplateList = (type, context) => {
           },
           parts_list: {
             title: i18n.t("printcenter.jobs.parts_list"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.parts_list"),
             key: "parts_list",
             disabled: false,
@@ -150,7 +152,7 @@ export const TemplateList = (type, context) => {
           },
           coversheet_portrait: {
             title: i18n.t("printcenter.jobs.coversheet_portrait"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.coversheet_portrait"),
             key: "coversheet_portrait",
             disabled: false,
@@ -158,7 +160,7 @@ export const TemplateList = (type, context) => {
           },
           coversheet_landscape: {
             title: i18n.t("printcenter.jobs.coversheet_landscape"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.coversheet_landscape"),
             key: "coversheet_landscape",
             disabled: false,
@@ -166,7 +168,7 @@ export const TemplateList = (type, context) => {
           },
           key_tag: {
             title: i18n.t("printcenter.jobs.key_tag"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.key_tag"),
             key: "key_tag",
             disabled: false,
@@ -174,7 +176,7 @@ export const TemplateList = (type, context) => {
           },
           paint_grid: {
             title: i18n.t("printcenter.jobs.paint_grid"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.paint_grid"),
             key: "paint_grid",
             disabled: false,
@@ -182,7 +184,7 @@ export const TemplateList = (type, context) => {
           },
           worksheet_by_line_number: {
             title: i18n.t("printcenter.jobs.worksheet_by_line_number"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.worksheet_by_line_number"),
             key: "worksheet_by_line_number",
             disabled: false,
@@ -192,7 +194,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_type"
             ),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_type"
             ),
@@ -202,7 +204,7 @@ export const TemplateList = (type, context) => {
           },
           worksheet_sorted_by_operation: {
             title: i18n.t("printcenter.jobs.worksheet_sorted_by_operation"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.worksheet_sorted_by_operation"),
             key: "worksheet_sorted_by_operation",
             disabled: false,
@@ -212,7 +214,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_no_hours"
             ),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_no_hours"
             ),
@@ -224,7 +226,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_part_type"
             ),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t(
               "printcenter.jobs.worksheet_sorted_by_operation_part_type"
             ),
@@ -234,7 +236,7 @@ export const TemplateList = (type, context) => {
           },
           payments_by_job: {
             title: i18n.t("printcenter.jobs.payments_by_job"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.payments_by_job"),
             key: "payments_by_job",
             disabled: false,
@@ -242,7 +244,7 @@ export const TemplateList = (type, context) => {
           },
           final_invoice: {
             title: i18n.t("printcenter.jobs.final_invoice"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.final_invoice"),
             key: "final_invoice",
             disabled: false,
@@ -250,7 +252,7 @@ export const TemplateList = (type, context) => {
           },
           payment_request: {
             title: i18n.t("printcenter.jobs.payment_request"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.payment_request"),
             key: "payment_request",
             disabled: false,
@@ -258,7 +260,7 @@ export const TemplateList = (type, context) => {
           },
           invoice_total_payable: {
             title: i18n.t("printcenter.jobs.invoice_total_payable"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.invoice_total_payable"),
             key: "invoice_total_payable",
             disabled: false,
@@ -266,7 +268,7 @@ export const TemplateList = (type, context) => {
           },
           invoice_customer_payable: {
             title: i18n.t("printcenter.jobs.invoice_customer_payable"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.invoice_customer_payable"),
             key: "invoice_customer_payable",
             disabled: false,
@@ -274,7 +276,7 @@ export const TemplateList = (type, context) => {
           },
           ro_totals: {
             title: i18n.t("printcenter.jobs.ro_totals"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.ro_totals"),
             key: "ro_totals",
             disabled: false,
@@ -282,7 +284,7 @@ export const TemplateList = (type, context) => {
           },
           job_costing_ro: {
             title: i18n.t("printcenter.jobs.job_costing_ro"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.job_costing_ro"),
             key: "job_costing_ro",
             disabled: false,
@@ -290,7 +292,7 @@ export const TemplateList = (type, context) => {
           },
           purchases_by_ro_detail: {
             title: i18n.t("printcenter.jobs.purchases_by_ro_detail"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.purchases_by_ro_detail"),
             key: "purchases_by_ro_detail",
             disabled: false,
@@ -298,7 +300,7 @@ export const TemplateList = (type, context) => {
           },
           purchases_by_ro_summary: {
             title: i18n.t("printcenter.jobs.purchases_by_ro_summary"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.purchases_by_ro_summary"),
             key: "purchases_by_ro_summary",
             disabled: false,
@@ -306,7 +308,7 @@ export const TemplateList = (type, context) => {
           },
           filing_coversheet_portrait: {
             title: i18n.t("printcenter.jobs.filing_coversheet_portrait"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.filing_coversheet_portrait"),
             key: "filing_coversheet_portrait",
             disabled: false,
@@ -314,7 +316,7 @@ export const TemplateList = (type, context) => {
           },
           filing_coversheet_landscape: {
             title: i18n.t("printcenter.jobs.filing_coversheet_landscape"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.filing_coversheet_landscape"),
             key: "filing_coversheet_landscape",
             disabled: false,
@@ -322,7 +324,7 @@ export const TemplateList = (type, context) => {
           },
           qc_sheet: {
             title: i18n.t("printcenter.jobs.qc_sheet"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.qc_sheet"),
             key: "qc_sheet",
             disabled: false,
@@ -330,7 +332,7 @@ export const TemplateList = (type, context) => {
           },
           vehicle_delivery_check: {
             title: i18n.t("printcenter.jobs.vehicle_delivery_check"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.vehicle_delivery_check"),
             key: "vehicle_delivery_check",
             disabled: false,
@@ -338,7 +340,7 @@ export const TemplateList = (type, context) => {
           },
           guarantee: {
             title: i18n.t("printcenter.jobs.guarantee"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.guarantee"),
             key: "guarantee",
             disabled: false,
@@ -346,7 +348,7 @@ export const TemplateList = (type, context) => {
           },
           csi_invitation: {
             title: i18n.t("printcenter.jobs.csi_invitation"),
-            description: "CSI invite",
+            description: "",
             key: "csi_invitation",
             subject: i18n.t("printcenter.jobs.csi_invitation"),
             disabled: false,
@@ -354,7 +356,7 @@ export const TemplateList = (type, context) => {
           },
           window_tag_sublet: {
             title: i18n.t("printcenter.jobs.window_tag_sublet"),
-            description: "Window Tag Sublet",
+            description: "",
             key: "window_tag_sublet",
             subject: i18n.t("printcenter.jobs.window_tag_sublet"),
             disabled: false,
@@ -362,7 +364,7 @@ export const TemplateList = (type, context) => {
           },
           thank_you_ro: {
             title: i18n.t("printcenter.jobs.thank_you_ro"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "thank_you_ro",
             subject: i18n.t("printcenter.jobs.thank_you_ro"),
             disabled: false,
@@ -370,7 +372,7 @@ export const TemplateList = (type, context) => {
           },
           parts_label_single: {
             title: i18n.t("printcenter.jobs.parts_label_single"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "parts_label_single",
             subject: i18n.t("printcenter.jobs.parts_label_single"),
             disabled: false,
@@ -379,7 +381,7 @@ export const TemplateList = (type, context) => {
           },
           envelope_return_address: {
             title: i18n.t("printcenter.jobs.envelope_return_address"),
-            description: "All Jobs Notes",
+            description: "",
             subject: i18n.t("printcenter.jobs.envelope_return_address"),
             key: "envelope_return_address",
             disabled: false,
@@ -388,7 +390,7 @@ export const TemplateList = (type, context) => {
           },
           sgi_certificate_of_repairs: {
             title: i18n.t("printcenter.jobs.sgi_certificate_of_repairs"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "sgi_certificate_of_repairs",
             subject: i18n.t("printcenter.jobs.sgi_certificate_of_repairs"),
             disabled: false,
@@ -399,7 +401,7 @@ export const TemplateList = (type, context) => {
           },
           sgi_windshield_auth: {
             title: i18n.t("printcenter.jobs.sgi_windshield_auth"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "sgi_windshield_auth",
             subject: i18n.t("printcenter.jobs.sgi_windshield_auth"),
             disabled: false,
@@ -410,7 +412,7 @@ export const TemplateList = (type, context) => {
           },
           mpi_final_acct_sheet: {
             title: i18n.t("printcenter.jobs.mpi_final_acct_sheet"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "mpi_final_acct_sheet",
             subject: i18n.t("printcenter.jobs.mpi_final_acct_sheet"),
             disabled: false,
@@ -419,9 +421,20 @@ 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: "Thank You Letter by RO",
+            description: "",
             key: "mpi_eglass_auth",
             subject: i18n.t("printcenter.jobs.mpi_eglass_auth"),
             disabled: false,
@@ -432,7 +445,7 @@ export const TemplateList = (type, context) => {
           },
           mpi_animal_checklist: {
             title: i18n.t("printcenter.jobs.mpi_animal_checklist"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "mpi_animal_checklist",
             subject: i18n.t("printcenter.jobs.mpi_animal_checklist"),
             disabled: false,
@@ -443,7 +456,7 @@ export const TemplateList = (type, context) => {
           },
           ab_proof_of_loss: {
             title: i18n.t("printcenter.jobs.ab_proof_of_loss"),
-            description: "Thank You Letter by RO",
+            description: "",
             key: "ab_proof_of_loss",
             subject: i18n.t("printcenter.jobs.ab_proof_of_loss"),
             disabled: false,
@@ -454,7 +467,7 @@ export const TemplateList = (type, context) => {
           },
           // parts_label_multi: {
           //   title: i18n.t("printcenter.jobs.parts_label_multi"),
-          //   description: "Thank You Letter by RO",
+          //   description: "",
           //   key: "parts_label_multi",
           //   subject: i18n.t("printcenter.jobs.parts_label_multi"),
           //   disabled: false,
@@ -462,7 +475,7 @@ export const TemplateList = (type, context) => {
           // },
           iou_form: {
             title: i18n.t("printcenter.jobs.iou_form"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.iou_form"),
             key: "iou_form",
             disabled: false,
@@ -470,7 +483,7 @@ export const TemplateList = (type, context) => {
           },
           lag_time_ro: {
             title: i18n.t("printcenter.jobs.lag_time_ro"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.lag_time_ro"),
             key: "lag_time_ro",
             disabled: false,
@@ -478,7 +491,7 @@ export const TemplateList = (type, context) => {
           },
           rental_reservation: {
             title: i18n.t("printcenter.jobs.rental_reservation"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.rental_reservation"),
             key: "rental_reservation",
             disabled: false,
@@ -486,7 +499,7 @@ export const TemplateList = (type, context) => {
           },
           timetickets_ro: {
             title: i18n.t("printcenter.jobs.timetickets_ro"),
-            description: "CASL Authorization",
+            description: "",
             subject: i18n.t("printcenter.jobs.timetickets_ro"),
             key: "timetickets_ro",
             disabled: false,
@@ -494,11 +507,12 @@ export const TemplateList = (type, context) => {
           },
           dms_posting_sheet: {
             title: i18n.t("printcenter.jobs.dms_posting_sheet"),
-            description: "DMS Posting Sheet",
+            description: "",
             subject: i18n.t("printcenter.jobs.dms_posting_sheet"),
             key: "dms_posting_sheet",
             disabled: false,
             group: "financial",
+            dms: true,
           },
         }
       : {}),
@@ -506,41 +520,41 @@ export const TemplateList = (type, context) => {
       ? {
           special_thirdpartypayer: {
             title: i18n.t("printcenter.jobs.thirdpartypayer"),
-            description: "CSI invite",
+            description: "",
             key: "special_thirdpartypayer",
             disabled: false,
           },
           folder_label_multiple: {
             title: i18n.t("printcenter.jobs.folder_label_multiple"),
-            description: "Folder Label Multiple",
+            description: "",
             key: "folder_label_multiple",
             disabled: false,
           },
           parts_label_multiple: {
             title: i18n.t("printcenter.jobs.parts_label_multiple"),
-            description: "Parts Label Multiple",
+            description: "",
             key: "parts_label_multiple",
             disabled: false,
           },
           parts_invoice_label_single: {
             title: i18n.t("printcenter.jobs.parts_invoice_label_single"),
-            description: "Parts Label Multiple",
+            description: "",
             key: "parts_invoice_label_single",
             disabled: false,
             ignoreCustomMargins: true,
           },
           csi_invitation_action: {
             title: i18n.t("printcenter.jobs.csi_invitation_action"),
-            description: "CSI invite",
+            description: "",
             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: "CSI invite",
+            description: "",
             key: "individual_job_note",
-            subject: i18n.t("printcenter.jobs.individual_job_note", {
+            subject: i18n.t("printcenter.subjects.jobs.individual_job_note", {
               ro_number: (context && context.ro_number) || "",
             }),
             disabled: false,
@@ -551,7 +565,7 @@ export const TemplateList = (type, context) => {
       ? {
           appointment_confirmation: {
             title: i18n.t("printcenter.appointments.appointment_confirmation"),
-            description: "Appointment Confirmation",
+            description: "",
             subject: i18n.t(
               "printcenter.appointments.appointment_confirmation"
             ),
@@ -564,7 +578,7 @@ export const TemplateList = (type, context) => {
       ? {
           parts_order: {
             title: i18n.t("printcenter.jobs.parts_order"),
-            description: "Parts Order",
+            description: "",
             key: "parts_order",
             subject: i18n.t("printcenter.subjects.jobs.parts_order", {
               ro_number: context && context.job && context.job.ro_number,
@@ -578,7 +592,7 @@ export const TemplateList = (type, context) => {
           },
           sublet_order: {
             title: i18n.t("printcenter.jobs.sublet_order"),
-            description: "Parts Order",
+            description: "",
             key: "sublet_order",
             subject: i18n.t("printcenter.subjects.jobs.sublet_order", {
               ro_number: context && context.job && context.job.ro_number,
@@ -592,8 +606,15 @@ 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: "Parts Return",
+            subject: i18n.t("printcenter.subjects.jobs.parts_return_slip", {
+              ro_number: context && context.job && context.job.ro_number,
+              name: (
+                (context && context.job && context.job.ownr_ln) ||
+                (context && context.job && context.job.ownr_co_nm) ||
+                ""
+              ).trim(),
+            }),
+            description: "",
             key: "parts_return_slip",
             disabled: false,
           },
@@ -603,7 +624,7 @@ export const TemplateList = (type, context) => {
       ? {
           payment_receipt: {
             title: i18n.t("printcenter.jobs.payment_receipt"),
-            description: "Payment Receipt",
+            description: "",
             subject: i18n.t("printcenter.jobs.payment_receipt"),
             key: "payment_receipt",
             disabled: false,
@@ -1223,7 +1244,7 @@ export const TemplateList = (type, context) => {
             disabled: false,
             rangeFilter: {
               object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_open"),
+              field: i18n.t("jobs.fields.date_void"),
             },
             group: "sales",
           },
@@ -1526,6 +1547,19 @@ export const TemplateList = (type, context) => {
             },
             group: "payroll",
           },
+          work_in_progress_jobs_excel: {
+            title: i18n.t("reportcenter.templates.work_in_progress_jobs"),
+            subject: i18n.t("reportcenter.templates.work_in_progress_jobs"),
+            key: "work_in_progress_jobs_excel",
+            //idtype: "vendor",
+            reporttype: "excel",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+            group: "jobs",
+          },
           work_in_progress_labour: {
             title: i18n.t("reportcenter.templates.work_in_progress_labour"),
             description: "",
@@ -1883,6 +1917,18 @@ export const TemplateList = (type, context) => {
             },
             group: "sales",
           },
+          jobs_scheduled_completion: {
+            title: i18n.t("reportcenter.templates.jobs_scheduled_completion"),
+            subject: i18n.t("reportcenter.templates.jobs_scheduled_completion"),
+            key: "jobs_scheduled_completion",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.scheduled_completion"),
+            },
+            group: "jobs",
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"
@@ -1891,7 +1937,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_contract"
             ),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_contract"
             ),
@@ -1900,7 +1946,7 @@ export const TemplateList = (type, context) => {
           },
           courtesy_car_terms: {
             title: i18n.t("printcenter.courtesycarcontract.courtesy_car_terms"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_terms"
             ),
@@ -1911,7 +1957,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_impound"
             ),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_impound"
             ),
@@ -1926,7 +1972,7 @@ export const TemplateList = (type, context) => {
             title: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_inventory"
             ),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t(
               "printcenter.courtesycarcontract.courtesy_car_inventory"
             ),
@@ -1939,7 +1985,7 @@ export const TemplateList = (type, context) => {
       ? {
           inhouse_invoice: {
             title: i18n.t("printcenter.bills.inhouse_invoice"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.bills.inhouse_invoice"),
             key: "inhouse_invoice",
             disabled: false,
@@ -1950,7 +1996,7 @@ export const TemplateList = (type, context) => {
       ? {
           // timetickets: {
           //   title: i18n.t("printcenter.timetickets.timetickets"),
-          //   description: "Est Detail",
+          //   description: "",
           //   subject: `${i18n.t("printcenter.timetickets.timetickets")} - ${
           //     context && context.job && context.job.ro_number
           //   }`,
@@ -1963,14 +2009,14 @@ export const TemplateList = (type, context) => {
       ? {
           purchases_by_vendor_detailed: {
             title: i18n.t("printcenter.vendors.purchases_by_vendor_detailed"),
-            description: "Est Detail",
+            description: "",
             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: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.vendors.purchases_by_vendor_summary"),
             key: "purchases_by_vendor_summary",
             disabled: false,
@@ -2043,21 +2089,21 @@ export const TemplateList = (type, context) => {
       ? {
           ca_bc_etf_table: {
             title: i18n.t("printcenter.payments.ca_bc_etf_table"),
-            description: "Est Detail",
+            description: "",
             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: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.payments.exported_payroll"),
             key: "exported_payroll",
             disabled: false,
           },
           attendance_detail_csv: {
             title: i18n.t("printcenter.special.attendance_detail_csv"),
-            description: "Est Detail",
+            description: "",
             subject: i18n.t("printcenter.special.attendance_detail_csv"),
             key: "attendance_detail_csv",
             disabled: false,

client/yarn.lock

@@ -11168,6 +11168,11 @@ react-image-lightbox@^5.1.4:
     prop-types "^15.7.2"
     react-modal "^3.11.1"
 
+react-intersection-observer@^9.4.3:
+  version "9.4.3"
+  resolved "https://registry.yarnpkg.com/react-intersection-observer/-/react-intersection-observer-9.4.3.tgz#ec84ce0c25cad548075130ea045ac5c7adf908f3"
+  integrity sha512-WNRqMQvKpupr6MzecAQI0Pj0+JQong307knLP4g/nBex7kYfIaZsPpXaIhKHR+oV8z+goUbH9e10j6lGRnTzlQ==
+
 react-is@^16.10.2, react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"

hasura/metadata/tables.yaml

@@ -941,6 +941,7 @@
           - md_referral_sources
           - md_responsibility_centers
           - md_ro_statuses
+          - md_tasks_presets
           - md_to_emails
           - messagingservicesid
           - pbs_configuration
@@ -1038,6 +1039,7 @@
           - md_referral_sources
           - md_responsibility_centers
           - md_ro_statuses
+          - md_tasks_presets
           - md_to_emails
           - pbs_configuration
           - phone
@@ -2090,6 +2092,13 @@
           table:
             name: employee_team_members
             schema: public
+    - name: joblines
+      using:
+        foreign_key_constraint_on:
+          column: assigned_team
+          table:
+            name: joblines
+            schema: public
   insert_permissions:
     - role: user
       permission:
@@ -2663,6 +2672,9 @@
     name: joblines
     schema: public
   object_relationships:
+    - name: employee_team
+      using:
+        foreign_key_constraint_on: assigned_team
     - name: job
       using:
         foreign_key_constraint_on: jobid
@@ -2688,6 +2700,13 @@
           table:
             name: inventory
             schema: public
+    - name: parts_dispatch_lines
+      using:
+        foreign_key_constraint_on:
+          column: joblineid
+          table:
+            name: parts_dispatch_lines
+            schema: public
     - name: parts_order_lines
       using:
         foreign_key_constraint_on:
@@ -2717,6 +2736,7 @@
           - alt_part_i
           - alt_partm
           - alt_partno
+          - assigned_team
           - bett_amt
           - bett_pctg
           - bett_tax
@@ -2725,6 +2745,7 @@
           - convertedtolbr
           - convertedtolbr_data
           - created_at
+          - critical
           - db_hrs
           - db_price
           - db_ref
@@ -2784,6 +2805,7 @@
           - alt_part_i
           - alt_partm
           - alt_partno
+          - assigned_team
           - bett_amt
           - bett_pctg
           - bett_tax
@@ -2863,6 +2885,7 @@
           - alt_part_i
           - alt_partm
           - alt_partno
+          - assigned_team
           - bett_amt
           - bett_pctg
           - bett_tax
@@ -3129,6 +3152,13 @@
           table:
             name: notes
             schema: public
+    - name: parts_dispatches
+      using:
+        foreign_key_constraint_on:
+          column: jobid
+          table:
+            name: parts_dispatch
+            schema: public
     - name: parts_orders
       using:
         foreign_key_constraint_on:
@@ -3270,6 +3300,7 @@
           - clm_total
           - clm_zip
           - comment
+          - completed_tasks
           - converted
           - created_at
           - cust_pr
@@ -3464,6 +3495,7 @@
           - v_model_yr
           - v_vin
           - vehicleid
+          - date_void
           - voided
   select_permissions:
     - role: user
@@ -3534,6 +3566,7 @@
           - clm_total
           - clm_zip
           - comment
+          - completed_tasks
           - converted
           - created_at
           - cust_pr
@@ -3729,6 +3762,7 @@
           - v_model_yr
           - v_vin
           - vehicleid
+          - date_void
           - voided
         filter:
           bodyshop:
@@ -3809,6 +3843,7 @@
           - clm_total
           - clm_zip
           - comment
+          - completed_tasks
           - converted
           - created_at
           - cust_pr
@@ -4004,6 +4039,7 @@
           - v_model_yr
           - v_vin
           - vehicleid
+          - date_void
           - voided
         filter:
           bodyshop:
@@ -4331,6 +4367,7 @@
           - jobid
           - private
           - text
+          - type
           - updated_at
   select_permissions:
     - role: user
@@ -4344,6 +4381,7 @@
           - jobid
           - private
           - text
+          - type
           - updated_at
         filter:
           job:
@@ -4367,6 +4405,7 @@
           - jobid
           - private
           - text
+          - type
           - updated_at
         filter:
           job:
@@ -4551,6 +4590,165 @@
         template_engine: Kriti
         url: '{{$base_url}}/opensearch'
         version: 2
+- table:
+    name: parts_dispatch
+    schema: public
+  object_relationships:
+    - name: job
+      using:
+        foreign_key_constraint_on: jobid
+  array_relationships:
+    - name: parts_dispatch_lines
+      using:
+        foreign_key_constraint_on:
+          column: partsdispatchid
+          table:
+            name: parts_dispatch_lines
+            schema: public
+  insert_permissions:
+    - role: user
+      permission:
+        check:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                  - user:
+                      authid:
+                        _eq: X-Hasura-User-Id
+                  - active:
+                      _eq: true
+        columns:
+          - id
+          - created_at
+          - updated_at
+          - jobid
+          - number
+          - employeeid
+          - dispatched_at
+          - dispatched_by
+  select_permissions:
+    - role: user
+      permission:
+        columns:
+          - number
+          - dispatched_by
+          - created_at
+          - dispatched_at
+          - updated_at
+          - employeeid
+          - id
+          - jobid
+        filter:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                  - user:
+                      authid:
+                        _eq: X-Hasura-User-Id
+                  - active:
+                      _eq: true
+  update_permissions:
+    - role: user
+      permission:
+        columns:
+          - number
+          - dispatched_by
+          - created_at
+          - dispatched_at
+          - updated_at
+          - employeeid
+          - id
+          - jobid
+        filter:
+          job:
+            bodyshop:
+              associations:
+                _and:
+                  - user:
+                      authid:
+                        _eq: X-Hasura-User-Id
+                  - active:
+                      _eq: true
+        check: null
+- table:
+    name: parts_dispatch_lines
+    schema: public
+  object_relationships:
+    - name: jobline
+      using:
+        foreign_key_constraint_on: joblineid
+    - name: parts_dispatch
+      using:
+        foreign_key_constraint_on: partsdispatchid
+  insert_permissions:
+    - role: user
+      permission:
+        check:
+          parts_dispatch:
+            job:
+              bodyshop:
+                associations:
+                  _and:
+                    - user:
+                        authid:
+                          _eq: X-Hasura-User-Id
+                    - active:
+                        _eq: true
+        columns:
+          - id
+          - created_at
+          - updated_at
+          - partsdispatchid
+          - joblineid
+          - quantity
+          - accepted_at
+  select_permissions:
+    - role: user
+      permission:
+        columns:
+          - quantity
+          - accepted_at
+          - created_at
+          - updated_at
+          - id
+          - joblineid
+          - partsdispatchid
+        filter:
+          parts_dispatch:
+            job:
+              bodyshop:
+                associations:
+                  _and:
+                    - user:
+                        authid:
+                          _eq: X-Hasura-User-Id
+                    - active:
+                        _eq: true
+  update_permissions:
+    - role: user
+      permission:
+        columns:
+          - id
+          - created_at
+          - updated_at
+          - partsdispatchid
+          - joblineid
+          - quantity
+          - accepted_at
+        filter:
+          parts_dispatch:
+            job:
+              bodyshop:
+                associations:
+                  _and:
+                    - user:
+                        authid:
+                          _eq: X-Hasura-User-Id
+                    - active:
+                        _eq: true
+        check: null
 - table:
     name: parts_order_lines
     schema: public
@@ -5364,6 +5562,7 @@
           - memo
           - productivehrs
           - rate
+          - task_name
           - ttapprovalqueueid
           - updated_at
   select_permissions:
@@ -5387,6 +5586,7 @@
           - memo
           - productivehrs
           - rate
+          - task_name
           - ttapprovalqueueid
           - updated_at
         filter:
@@ -5419,6 +5619,7 @@
           - memo
           - productivehrs
           - rate
+          - task_name
           - ttapprovalqueueid
           - updated_at
         filter:

hasura/migrations/1684251223317_alter_table_public_bodyshops_add_column_md_tasks_presets/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."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

@@ -0,0 +1,2 @@
+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

@@ -0,0 +1,4 @@
+-- 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

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

hasura/migrations/1685561607407_create_table_public_parts_dispatch/down.sql

@@ -0,0 +1 @@
+DROP TABLE "public"."parts_dispatch";

hasura/migrations/1685561607407_create_table_public_parts_dispatch/up.sql

@@ -0,0 +1,18 @@
+CREATE TABLE "public"."parts_dispatch" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "jobid" uuid NOT NULL, "number" serial NOT NULL, "employeeid" uuid NOT NULL, "dispatched_at" timestamptz NOT NULL, "dispatched_by" text NOT NULL, PRIMARY KEY ("id") , FOREIGN KEY ("jobid") REFERENCES "public"."jobs"("id") ON UPDATE cascade ON DELETE cascade);
+CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"()
+RETURNS TRIGGER AS $$
+DECLARE
+  _new record;
+BEGIN
+  _new := NEW;
+  _new."updated_at" = NOW();
+  RETURN _new;
+END;
+$$ LANGUAGE plpgsql;
+CREATE TRIGGER "set_public_parts_dispatch_updated_at"
+BEFORE UPDATE ON "public"."parts_dispatch"
+FOR EACH ROW
+EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"();
+COMMENT ON TRIGGER "set_public_parts_dispatch_updated_at" ON "public"."parts_dispatch" 
+IS 'trigger to set value of column "updated_at" to current timestamp on row update';
+CREATE EXTENSION IF NOT EXISTS pgcrypto;

hasura/migrations/1685561715531_create_table_public_parts_dispatch_lines/down.sql

@@ -0,0 +1 @@
+DROP TABLE "public"."parts_dispatch_lines";

hasura/migrations/1685561715531_create_table_public_parts_dispatch_lines/up.sql

@@ -0,0 +1,18 @@
+CREATE TABLE "public"."parts_dispatch_lines" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "partsdispatchid" UUID NOT NULL, "joblineid" uuid NOT NULL, "quantity" numeric NOT NULL DEFAULT 1, "accepted_at" timestamptz NOT NULL, PRIMARY KEY ("id") , FOREIGN KEY ("joblineid") REFERENCES "public"."joblines"("id") ON UPDATE cascade ON DELETE cascade);
+CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"()
+RETURNS TRIGGER AS $$
+DECLARE
+  _new record;
+BEGIN
+  _new := NEW;
+  _new."updated_at" = NOW();
+  RETURN _new;
+END;
+$$ LANGUAGE plpgsql;
+CREATE TRIGGER "set_public_parts_dispatch_lines_updated_at"
+BEFORE UPDATE ON "public"."parts_dispatch_lines"
+FOR EACH ROW
+EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"();
+COMMENT ON TRIGGER "set_public_parts_dispatch_lines_updated_at" ON "public"."parts_dispatch_lines" 
+IS 'trigger to set value of column "updated_at" to current timestamp on row update';
+CREATE EXTENSION IF NOT EXISTS pgcrypto;

hasura/migrations/1686082869359_set_fk_public_parts_dispatch_lines_partsdispatchid/down.sql

@@ -0,0 +1 @@
+alter table "public"."parts_dispatch_lines" drop constraint "parts_dispatch_lines_partsdispatchid_fkey";

hasura/migrations/1686082869359_set_fk_public_parts_dispatch_lines_partsdispatchid/up.sql

@@ -0,0 +1,5 @@
+alter table "public"."parts_dispatch_lines"
+  add constraint "parts_dispatch_lines_partsdispatchid_fkey"
+  foreign key ("partsdispatchid")
+  references "public"."parts_dispatch"
+  ("id") on update cascade on delete cascade;

hasura/migrations/1686084082349_alter_table_public_parts_dispatch_lines_alter_column_accepted_at/down.sql

@@ -0,0 +1 @@
+alter table "public"."parts_dispatch_lines" alter column "accepted_at" set not null;

hasura/migrations/1686084082349_alter_table_public_parts_dispatch_lines_alter_column_accepted_at/up.sql

@@ -0,0 +1 @@
+alter table "public"."parts_dispatch_lines" alter column "accepted_at" drop not null;

hasura/migrations/1686335272144_set_fk_public_job_conversations_conversationid/down.sql

@@ -0,0 +1,5 @@
+alter table "public"."job_conversations" drop constraint "job_conversations_conversationid_fkey",
+  add constraint "job_conversations_conversationid_fkey"
+  foreign key ("conversationid")
+  references "public"."conversations"
+  ("id") on update restrict on delete restrict;

hasura/migrations/1686335272144_set_fk_public_job_conversations_conversationid/up.sql

@@ -0,0 +1,5 @@
+alter table "public"."job_conversations" drop constraint "job_conversations_conversationid_fkey",
+  add constraint "job_conversations_conversationid_fkey"
+  foreign key ("conversationid")
+  references "public"."conversations"
+  ("id") on update cascade on delete cascade;

hasura/migrations/1688674667178_alter_table_public_joblines_add_column_assigned_team/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."joblines" add column "assigned_team" uuid
+--  null;

hasura/migrations/1688674667178_alter_table_public_joblines_add_column_assigned_team/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."joblines" add column "assigned_team" uuid
+ null;

hasura/migrations/1688674763806_set_fk_public_joblines_assigned_team/down.sql

@@ -0,0 +1 @@
+alter table "public"."joblines" drop constraint "joblines_assigned_team_fkey";

hasura/migrations/1688674763806_set_fk_public_joblines_assigned_team/up.sql

@@ -0,0 +1,5 @@
+alter table "public"."joblines"
+  add constraint "joblines_assigned_team_fkey"
+  foreign key ("assigned_team")
+  references "public"."employee_teams"
+  ("id") on update restrict on delete restrict;

hasura/migrations/1689808180226_alter_table_public_jobs_add_column_completed_tasks/down.sql

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

hasura/migrations/1689808180226_alter_table_public_jobs_add_column_completed_tasks/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "completed_tasks" jsonb
+ null default jsonb_build_array();

hasura/migrations/1689973479186_alter_table_public_jobs_add_column_void_date/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "void_date" Timestamp
+--  null;

hasura/migrations/1689973479186_alter_table_public_jobs_add_column_void_date/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "void_date" Timestamp
+ null;

hasura/migrations/1689973508700_alter_table_public_jobs_alter_column_void_date/down.sql

@@ -0,0 +1 @@
+ALTER TABLE "public"."jobs" ALTER COLUMN "void_date" TYPE timestamp without time zone;

hasura/migrations/1689973508700_alter_table_public_jobs_alter_column_void_date/up.sql

@@ -0,0 +1 @@
+ALTER TABLE "public"."jobs" ALTER COLUMN "void_date" TYPE timestamptz;

hasura/migrations/1689978551428_alter_table_public_jobs_alter_column_void_date/down.sql

@@ -0,0 +1 @@
+alter table "public"."jobs" rename column "date_void" to "void_date";