IO-1327 Resolve dinero error on bill posting

Merged in hotfix/2021-08-12 (pull request #178)

Approved-by: Patrick Fic

.platform/nginx/conf.d/proxy.conf

@@ -1 +1 @@
-client_max_body_size 15M;
+client_max_body_size 50M;

client/craco.config.js

@@ -12,7 +12,9 @@ module.exports = {
             modifyVars: {
               ...(process.env.NODE_ENV === "development"
                 ? { "@primary-color": "#a51d1d" }
-                : { "@primary-color": "#1DA57A" }),
+                : {
+                    //"@primary-color": "#1DA57A"
+                  }),
               // "@primary-color": " #1890ff", // primary color for all components
               // "@link-color": "#1890ff", // link color
               // "@success-color": "#52c41a", // success state color

client/package.json

@@ -4,37 +4,40 @@
   "private": true,
   "proxy": "http://localhost:5000",
   "dependencies": {
-    "@apollo/client": "^3.3.17",
-    "@craco/craco": "^5.9.0",
-    "@fingerprintjs/fingerprintjs": "^3.1.2",
+    "@apollo/client": "^3.3.21",
+    "@craco/craco": "^6.2.0",
+    "@fingerprintjs/fingerprintjs": "^3.2.0",
     "@lourenci/react-kanban": "^2.1.0",
-    "@sentry/react": "^6.3.6",
-    "@sentry/tracing": "^6.3.6",
+    "@sentry/react": "^6.10.0",
+    "@sentry/tracing": "^6.10.0",
     "@stripe/react-stripe-js": "^1.4.0",
-    "@stripe/stripe-js": "^1.14.0",
-    "@tanem/react-nprogress": "^3.0.65",
-    "antd": "^4.15.5",
+    "@stripe/stripe-js": "^1.16.0",
+    "@tanem/react-nprogress": "^3.0.74",
+    "antd": "^4.16.8",
     "apollo-link-logger": "^2.0.0",
     "axios": "^0.21.1",
-    "craco-less": "^1.17.1",
-    "dinero.js": "^1.8.1",
-    "dotenv": "^9.0.2",
+    "craco-less": "^1.18.0",
+    "dinero.js": "^1.9.0",
+    "dotenv": "^10.0.0",
+    "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
-    "exifr": "^7.0.0",
-    "firebase": "^8.6.0",
-    "graphql": "^15.5.0",
-    "i18next": "^20.2.2",
-    "i18next-browser-languagedetector": "^6.1.1",
-    "jsoneditor": "^9.4.1",
+    "exifr": "^7.1.2",
+    "firebase": "^8.7.1",
+    "graphql": "^15.5.1",
+    "i18next": "^20.3.4",
+    "i18next-browser-languagedetector": "^6.1.2",
+    "jsoneditor": "^9.5.2",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.9.17",
+    "libphonenumber-js": "^1.9.22",
     "logrocket": "^1.2.0",
-    "markerjs2": "^2.8.1",
+    "markerjs2": "^2.9.0",
     "moment-business-days": "^1.2.0",
-    "phone": "^2.4.21",
+    "phone": "^3.1.2",
     "preval.macro": "^5.0.0",
     "prop-types": "^15.7.2",
-    "query-string": "^7.0.0",
+    "query-string": "^7.0.1",
+    "rc-queue-anim": "^2.0.0",
+    "rc-scroll-anim": "^2.7.6",
     "react": "^17.0.1",
     "react-big-calendar": "^0.33.2",
     "react-color": "^2.19.3",
@@ -42,24 +45,26 @@
     "react-drag-listview": "^0.1.8",
     "react-grid-gallery": "^0.5.5",
     "react-grid-layout": "^1.2.5",
-    "react-i18next": "^11.8.15",
+    "react-i18next": "^11.11.3",
     "react-icons": "^4.2.0",
-    "react-number-format": "^4.5.5",
+    "react-number-format": "^4.6.4",
     "react-redux": "^7.2.4",
-    "react-resizable": "^3.0.1",
+    "react-resizable": "^3.0.4",
     "react-router-dom": "^5.2.0",
     "react-scripts": "^4.0.3",
+    "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.3",
-    "recharts": "^2.0.7",
+    "recharts": "^2.0.10",
     "redux": "^4.1.0",
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.1.3",
     "redux-state-sync": "^3.1.2",
     "reselect": "^4.0.0",
-    "sass": "^1.32.13",
+    "sass": "^1.35.2",
+    "socket.io-client": "^4.1.3",
     "styled-components": "^5.3.0",
     "subscriptions-transport-ws": "^0.9.18",
-    "web-vitals": "^1.1.2",
+    "web-vitals": "^2.1.0",
     "workbox-background-sync": "^6.1.5",
     "workbox-broadcast-update": "^6.1.5",
     "workbox-cacheable-response": "^6.1.5",

client/public/index.html

@@ -8,7 +8,17 @@
     <meta name="description" content="ImEX Online" />
     <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
     <link rel="apple-touch-icon" href="logo192.png" />
-
+    <script type="text/javascript">
+      window.$crisp = [];
+      window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
+      (function () {
+        d = document;
+        s = d.createElement("script");
+        s.src = "https://client.crisp.chat/l.js";
+        s.async = 1;
+        d.getElementsByTagName("head")[0].appendChild(s);
+      })();
+    </script>
     <script>
       !(function () {
         "use strict";

client/src/App/App.container.jsx

@@ -3,12 +3,11 @@ import { ConfigProvider } from "antd";
 import enLocale from "antd/es/locale/en_US";
 import LogRocket from "logrocket";
 import moment from "moment";
-import React, { useEffect } from "react";
+import React from "react";
+import { useTranslation } from "react-i18next";
 import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
 import client from "../utils/GraphQLClient";
 import App from "./App";
-import { useTranslation } from "react-i18next";
-import JiraSupportComponent from "../components/jira-support-widget/jira-support-widget.component";
 moment.locale("en-US");
 
 if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");
@@ -16,21 +15,6 @@ if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");
 export default function AppContainer() {
   const { t } = useTranslation();
 
-  useEffect(() => {
-    // Include the Crisp code here, without the <script></script> tags
-    window.$crisp = [];
-    window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
-    var d = document;
-    var s = d.createElement("script");
-    s.src = "https://client.crisp.chat/l.js";
-    s.async = 1;
-    d.getElementsByTagName("head")[0].appendChild(s);
-
-    return () => {
-      d.getElementsByTagName("head")[0].removeChild(s);
-    };
-  }, []);
-
   return (
     <ApolloProvider client={client}>
       <ConfigProvider
@@ -46,7 +30,6 @@ export default function AppContainer() {
       >
         <GlobalLoadingBar />
         <App />
-        <JiraSupportComponent />
       </ConfigProvider>
     </ApolloProvider>
   );

client/src/App/App.jsx

@@ -8,7 +8,7 @@ import DocumentEditorContainer from "../components/document-editor/document-edit
 import ErrorBoundary from "../components/error-boundary/error-boundary.component";
 //Component Imports
 import LoadingSpinner from "../components/loading-spinner/loading-spinner.component";
-import AboutPage from "../pages/about/about.page";
+import DisclaimerPage from "../pages/disclaimer/disclaimer.page";
 import TechPageContainer from "../pages/tech/tech.page.container";
 import { setOnline } from "../redux/application/application.actions";
 import { selectOnline } from "../redux/application/application.selectors";
@@ -17,7 +17,7 @@ import { selectCurrentUser } from "../redux/user/user.selectors";
 import PrivateRoute from "../utils/private-route";
 import "./App.styles.scss";
 
-const LandingPage = lazy(() => import("../pages/landing/landing.page"));
+import LandingPage from "../pages/landing/landing.page";
 const ResetPassword = lazy(() =>
   import("../pages/reset-password/reset-password.component")
 );
@@ -100,7 +100,7 @@ export function App({ checkUserSession, currentUser, online, setOnline }) {
           <Route exact path="/csi/:surveyId" component={CsiPage} />
         </ErrorBoundary>
         <ErrorBoundary>
-          <Route exact path="/about" component={AboutPage} />
+          <Route exact path="/disclaimer" component={DisclaimerPage} />
         </ErrorBoundary>
         <ErrorBoundary>
           <Route

client/src/assets/icons/technology.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" ?><svg style="enable-background:new 0 0 128 128;" version="1.1" viewBox="0 0 128 128" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><style type="text/css">
+	.st0{fill:none;stroke:#000000;stroke-width:8;stroke-miterlimit:10;}
+	.st1{display:none;}
+	.st2{display:inline;opacity:0.25;fill:#F45EFD;}
+</style><g id="_x31_2_3D_Printing"/><g id="_x31_1_VR_Gear"/><g id="_x31_0_Virtual_reality"/><g id="_x39__Augmented_reality"/><g id="_x38__Teleport"/><g id="_x37__Glassess"/><g id="_x36__Folding_phone"/><g id="_x35__Drone"/><g id="_x34__Retina_scan"/><g id="_x33__Smartwatch"/><g id="_x32__Bionic_Arm"/><g id="_x31__Chip"><g><path d="M108,40c-5.2,0-9.6,3.3-11.3,8H84V32h-8V20h-8v12h-8V20h-8v12h-8v16H24v-8.7c4.7-1.7,8-6.1,8-11.3c0-6.6-5.4-12-12-12    S8,21.4,8,28c0,5.2,3.3,9.6,8,11.3V56h28v8H16v16.7c-4.7,1.7-8,6.1-8,11.3c0,6.6,5.4,12,12,12s12-5.4,12-12c0-5.2-3.3-9.6-8-11.3    V72h20v16h8v12h8V88h8v12h8V88h8V72h8v16.7c-4.7,1.7-8,6.1-8,11.3c0,6.6,5.4,12,12,12s12-5.4,12-12c0-5.2-3.3-9.6-8-11.3V64H84v-8    h12.7c1.7,4.7,6.1,8,11.3,8c6.6,0,12-5.4,12-12S114.6,40,108,40z M20,32c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S22.2,32,20,32z     M20,96c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S22.2,96,20,96z M76,80H52V40h24V80z M96,96c2.2,0,4,1.8,4,4s-1.8,4-4,4s-4-1.8-4-4    S93.8,96,96,96z M108,56c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S110.2,56,108,56z"/><rect height="8" width="8" x="56" y="64"/></g></g><g class="st1" id="Guide"><path class="st2" d="M120,8v112H8V8H120 M128,0H0v128h128V0L128,0z"/></g></svg>

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

@@ -109,6 +109,17 @@ export default function AccountingPayablesTableComponent({ loading, bills }) {
         <Checkbox disabled checked={record.is_credit_memo} />
       ),
     },
+    {
+      title: t("exportlogs.labels.attempts"),
+      dataIndex: "attempts",
+      key: "attempts",
+
+      render: (text, record) => {
+        const success = record.exportlogs.filter((e) => e.successful).length;
+        const attempts = record.exportlogs.length;
+        return `${success}/${attempts}`;
+      },
+    },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",
@@ -121,6 +132,7 @@ export default function AccountingPayablesTableComponent({ loading, bills }) {
             billId={record.id}
             disabled={transInProgress || !!record.exported}
             loadingCallback={setTransInProgress}
+            setSelectedBills={setSelectedBills}
           />
         </div>
       ),

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

@@ -108,7 +108,17 @@ export default function AccountingPayablesTableComponent({
         <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
       ),
     },
+    {
+      title: t("exportlogs.labels.attempts"),
+      dataIndex: "attempts",
+      key: "attempts",
 
+      render: (text, record) => {
+        const success = record.exportlogs.filter((e) => e.successful).length;
+        const attempts = record.exportlogs.length;
+        return `${success}/${attempts}`;
+      },
+    },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",
@@ -120,6 +130,7 @@ export default function AccountingPayablesTableComponent({
           paymentId={record.id}
           disabled={transInProgress || !!record.exportedat}
           loadingCallback={setTransInProgress}
+          setSelectedPayments={setSelectedPayments}
         />
       ),
     },

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

@@ -114,17 +114,28 @@ export default function AccountingReceivablesTableComponent({ loading, jobs }) {
         );
       },
     },
+    {
+      title: t("exportlogs.labels.attempts"),
+      dataIndex: "attempts",
+      key: "attempts",
+
+      render: (text, record) => {
+        const success = record.exportlogs.filter((e) => e.successful).length;
+        const attempts = record.exportlogs.length;
+        return `${success}/${attempts}`;
+      },
+    },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
-      sorter: (a, b) => a.clm_total - b.clm_total,
 
       render: (text, record) => (
         <Space wrap>
           <JobExportButton
             jobId={record.id}
             disabled={!!record.date_exported}
+            setSelectedJobs={setSelectedJobs}
           />
           <Link to={`/manage/jobs/${record.id}/close`}>
             <Button>{t("jobs.labels.viewallocations")}</Button>

client/src/components/bill-detail-edit/bill-detail-edit.container.jsx

@@ -26,6 +26,8 @@ import BillReeportButtonComponent from "../bill-reexport-button/bill-reexport-bu
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -33,6 +35,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "partsOrder" })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export default connect(
@@ -40,7 +44,10 @@ export default connect(
   mapDispatchToProps
 )(BillDetailEditcontainer);
 
-export function BillDetailEditcontainer({ setPartsOrderContext }) {
+export function BillDetailEditcontainer({
+  setPartsOrderContext,
+  insertAuditTrail,
+}) {
   const search = queryString.parse(useLocation().search);
   const history = useHistory();
   const { t } = useTranslation();
@@ -134,6 +141,12 @@ export function BillDetailEditcontainer({ setPartsOrderContext }) {
     });
     await Promise.all(updates);
 
+    insertAuditTrail({
+      jobid: bill.jobid,
+      billid: search.billid,
+      operation: AuditTrailMapping.billupdated(bill.invoice_number),
+    });
+
     await refetch();
     form.setFieldsValue(transformData(data));
     form.resetFields();

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

@@ -11,12 +11,14 @@ import {
   QUERY_JOB_LBR_ADJUSTMENTS,
   UPDATE_JOB,
 } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectBillEnterModal } from "../../redux/modals/modals.selectors";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import BillFormContainer from "../bill-form/bill-form.container";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
 
@@ -27,6 +29,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 function BillEnterModalContainer({
@@ -34,6 +38,7 @@ function BillEnterModalContainer({
   toggleModalVisible,
   bodyshop,
   currentUser,
+  insertAuditTrail,
 }) {
   const [form] = Form.useForm();
   const { t } = useTranslation();
@@ -81,8 +86,9 @@ function BillEnterModalContainer({
           },
         ],
       },
+      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
     });
-    console.log("adjustmentsToInsert", adjustmentsToInsert);
+
     const adjKeys = Object.keys(adjustmentsToInsert);
     if (adjKeys.length > 0) {
       //Query the adjustments, merge, and update them.
@@ -115,7 +121,12 @@ function BillEnterModalContainer({
             message: JSON.stringify(jobUpdate.errors),
           }),
         });
+        return;
       }
+      insertAuditTrail({
+        jobid: values.jobid,
+        operation: AuditTrailMapping.jobmodifylbradj(),
+      });
     }
 
     if (!!r1.errors) {
@@ -171,6 +182,12 @@ function BillEnterModalContainer({
     });
     if (billEnterModal.actions.refetch) billEnterModal.actions.refetch();
 
+    insertAuditTrail({
+      jobid: values.jobid,
+      billid: billId,
+      operation: AuditTrailMapping.billposted(remainingValues.invoice_number),
+    });
+
     if (enterAgain) {
       form.resetFields();
       form.setFieldsValue({ billlines: [] });

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

@@ -72,9 +72,11 @@ export function BillEnterModalLinesComponent({
                         quantity: opt.part_qty || 1,
                         actual_price: opt.cost,
                         cost_center: opt.part_type
-                          ? responsibilityCenters.defaults.costs[
+                          ? responsibilityCenters.defaults &&
+                            (responsibilityCenters.defaults.costs[
                               opt.part_type
-                            ] || null
+                            ] ||
+                              null)
                           : null,
                       };
                     }

client/src/components/bill-form/bill-form.totals.utility.js

@@ -1,13 +1,8 @@
 import Dinero from "dinero.js";
 
 export const CalculateBillTotal = (invoice) => {
-  const {
-    total,
-    billlines,
-    federal_tax_rate,
-    local_tax_rate,
-    state_tax_rate,
-  } = invoice;
+  const { total, billlines, federal_tax_rate, local_tax_rate, state_tax_rate } =
+    invoice;
 
   //TODO Determine why this recalculates so many times.
   let subtotal = Dinero({ amount: 0 });
@@ -20,8 +15,7 @@ export const CalculateBillTotal = (invoice) => {
   billlines.forEach((i) => {
     if (!!i) {
       const itemTotal = Dinero({
-        amount:
-          Math.round(((i.actual_cost || 0) * 100 + Number.EPSILON) * 100) / 100,
+        amount: Math.round((i.actual_cost || 0) * 100),
       }).multiply(i.quantity || 1);
 
       subtotal = subtotal.add(itemTotal);

client/src/components/bill-reexport-button/bill-reexport-button.component.jsx

@@ -47,7 +47,9 @@ export function BillMarkForReexportButton({ bodyshop, authLevel, bill }) {
     });
 
     if (!result.errors) {
-      notification["success"]({ message: t("bills.successes.save") });
+      notification["success"]({
+        message: t("bills.successes.reexport"),
+      });
     } else {
       notification["error"]({
         message: t("bills.errors.saving", {

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

@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort, dateSort } from "../../utils/sorters";
@@ -14,6 +15,7 @@ import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   //jobRO: selectJobReadOnly,
+  bodyshop: selectBodyshop,
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -26,6 +28,7 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 export function BillsListTableComponent({
+  bodyshop,
   job,
   billsQuery,
   handleOnRowClick,
@@ -52,7 +55,9 @@ export function BillsListTableComponent({
       )}
       <BillDeleteButton bill={record} />
       <Button
-        disabled={record.is_credit_memo}
+        disabled={
+          record.is_credit_memo || record.vendorid === bodyshop.inhousevendorid
+        }
         onClick={() =>
           setPartsOrderContext({
             actions: {},

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

@@ -1,5 +1,5 @@
 import { HomeFilled } from "@ant-design/icons";
-import { Breadcrumb } from "antd";
+import { Breadcrumb, Row, Col } from "antd";
 import React from "react";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
@@ -14,27 +14,29 @@ const mapStateToProps = createStructuredSelector({
 
 export function BreadCrumbs({ breadcrumbs }) {
   return (
-    <div className="breadcrumb-container imex-flex-row">
-      <Breadcrumb separator=">" style={{ flex: 1 }}>
-        <Breadcrumb.Item>
-          <Link to={`/manage`}>
-            <HomeFilled />
-          </Link>
-        </Breadcrumb.Item>
-        {breadcrumbs.map((item) =>
-          item.link ? (
-            <Breadcrumb.Item key={item.label}>
-              <Link to={item.link}>{item.label} </Link>
-            </Breadcrumb.Item>
-          ) : (
-            <Breadcrumb.Item key={item.label}>{item.label}</Breadcrumb.Item>
-          )
-        )}
-      </Breadcrumb>
-      <div>
+    <Row className="breadcrumb-container">
+      <Col xs={24} sm={24} md={16}>
+        <Breadcrumb separator=">">
+          <Breadcrumb.Item>
+            <Link to={`/manage`}>
+              <HomeFilled />
+            </Link>
+          </Breadcrumb.Item>
+          {breadcrumbs.map((item) =>
+            item.link ? (
+              <Breadcrumb.Item key={item.label}>
+                <Link to={item.link}>{item.label} </Link>
+              </Breadcrumb.Item>
+            ) : (
+              <Breadcrumb.Item key={item.label}>{item.label}</Breadcrumb.Item>
+            )
+          )}
+        </Breadcrumb>
+      </Col>
+      <Col xs={24} sm={24} md={8}>
         <GlobalSearch />
-      </div>
-    </div>
+      </Col>
+    </Row>
   );
 }
 export default connect(mapStateToProps, null)(BreadCrumbs);

client/src/components/chat-archive-button/chat-archive-button.component.jsx

@@ -5,10 +5,6 @@ import { useTranslation } from "react-i18next";
 import { TOGGLE_CONVERSATION_ARCHIVE } from "../../graphql/conversations.queries";
 
 export default function ChatArchiveButton({ conversation }) {
-  console.log(
-    "🚀  ~ file: chat-archive-button.component.jsx  ~ line 6  ~ conversation",
-    conversation
-  );
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [updateConversation] = useMutation(TOGGLE_CONVERSATION_ARCHIVE);

client/src/components/dashboard-components/monthly-revenue-graph/monthly-revenue-graph.component.jsx

@@ -34,7 +34,9 @@ export default function DashboardMonthlyRevenueGraph({ data, ...cardProps }) {
     let dailySales;
     if (!!jobsByDate[val]) {
       dailySales = jobsByDate[val].reduce((dayAcc, dayVal) => {
-        return dayAcc.add(Dinero(dayVal.job_totals.totals.subtotal));
+        return dayAcc.add(
+          Dinero((dayVal.job_totals && dayVal.job_totals.totals.subtotal) || 0)
+        );
       }, Dinero());
     } else {
       dailySales = Dinero();
@@ -63,7 +65,9 @@ export default function DashboardMonthlyRevenueGraph({ data, ...cardProps }) {
             <CartesianGrid stroke="#f5f5f5" />
             <XAxis dataKey="date" />
             <YAxis />
-            <Tooltip />
+            <Tooltip
+              formatter={(value, name, props) => value && value.toFixed(2)}
+            />
             <Legend />
             <Area
               type="monotone"

client/src/components/dashboard-components/pojected-monthly-sales/projected-monthly-sales.component.jsx

@@ -13,7 +13,14 @@ export default function DashboardProjectedMonthlySales({ data, ...cardProps }) {
   const dollars =
     data.projected_monthly_sales &&
     data.projected_monthly_sales.reduce(
-      (acc, val) => acc.add(Dinero(val.job_totals.totals.subtotal)),
+      (acc, val) =>
+        acc.add(
+          Dinero(
+            val.job_totals &&
+              val.job_totals.totals &&
+              val.job_totals.totals.subtotal
+          )
+        ),
       Dinero()
     );
   return (

client/src/components/dashboard-components/total-production-dollars/total-production-dollars.component.jsx

@@ -14,7 +14,8 @@ export default function DashboardTotalProductionDollars({
   const dollars =
     data.production_jobs &&
     data.production_jobs.reduce(
-      (acc, val) => acc.add(Dinero(val.job_totals.totals.subtotal)),
+      (acc, val) =>
+        acc.add(Dinero(val.job_totals && val.job_totals.totals.subtotal)),
       Dinero()
     );
 

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

@@ -0,0 +1,83 @@
+import { Button, Table } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import Dinero from "dinero.js";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(DmsAllocationsSummary);
+
+export function DmsAllocationsSummary({ socket, bodyshop, jobId }) {
+  const { t } = useTranslation();
+  const [allocationsSummary, setAllocationsSummary] = useState([]);
+  const columns = [
+    {
+      title: t("jobs.fields.dms.center"),
+      dataIndex: "center",
+      key: "center",
+    },
+    {
+      title: t("jobs.fields.dms.sale"),
+      dataIndex: "sale",
+      key: "sale",
+      render: (text, record) => Dinero(record.sale).toFormat(),
+    },
+    {
+      title: t("jobs.fields.dms.cost"),
+      dataIndex: "cost",
+      key: "cost",
+      render: (text, record) => Dinero(record.cost).toFormat(),
+    },
+    {
+      title: t("jobs.fields.dms.sale_dms_acctnumber"),
+      dataIndex: "sale_dms_acctnumber",
+      key: "sale_dms_acctnumber",
+      render: (text, record) =>
+        record.profitCenter && record.profitCenter.dms_acctnumber,
+    },
+    {
+      title: t("jobs.fields.dms.cost_dms_acctnumber"),
+      dataIndex: "cost_dms_acctnumber",
+      key: "cost_dms_acctnumber",
+      render: (text, record) =>
+        record.costCenter && record.costCenter.dms_acctnumber,
+    },
+    {
+      title: t("jobs.fields.dms.dms_wip_acctnumber"),
+      dataIndex: "dms_wip_acctnumber",
+      key: "dms_wip_acctnumber",
+      render: (text, record) =>
+        record.costCenter && record.costCenter.dms_wip_acctnumber,
+    },
+  ];
+
+  return (
+    <Table
+      title={() => (
+        <Button
+          onClick={() => {
+            socket.emit("cdk-calculate-allocations", jobId, (ack) =>
+              setAllocationsSummary(ack)
+            );
+          }}
+        >
+          Get
+        </Button>
+      )}
+      pagination={{ position: "top", defaultPageSize: 50 }}
+      columns={columns}
+      rowKey="center"
+      dataSource={allocationsSummary}
+    />
+  );
+}

client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx

@@ -0,0 +1,115 @@
+import React, { useState } from "react";
+import { Modal, Button, Table, Input } from "antd";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(DmsCdkMakes);
+
+export function DmsCdkMakes({ bodyshop, form, socket }) {
+  const [makesList, setMakesList] = useState([]);
+  const [searchText, setSearchText] = useState("");
+  const [loading, setLoading] = useState(false);
+  const [visible, setVisible] = useState(false);
+  const [selectedModel, setSelectedModel] = useState(null);
+  const { t } = useTranslation();
+  const columns = [
+    {
+      title: t("jobs.fields.dms.makeFullName"),
+      dataIndex: "makeFullName",
+      key: "makeFullName",
+    },
+    {
+      title: t("jobs.fields.dms.modelFullName"),
+      dataIndex: "modelFullName",
+      key: "modelFullName",
+    },
+    {
+      title: t("jobs.fields.dms.makeCode"),
+      dataIndex: "makeCode",
+      key: "makeCode",
+    },
+    {
+      title: t("jobs.fields.dms.modelCode"),
+      dataIndex: "modelCode",
+      key: "modelCode",
+    },
+  ];
+
+  const filteredMakes =
+    searchText !== "" && searchText
+      ? makesList.filter(
+          (make) =>
+            searchText
+              .split(" ")
+              .some((v) =>
+                make.makeFullName.toLowerCase().includes(v.toLowerCase())
+              ) ||
+            searchText
+              .split(" ")
+              .some((v) =>
+                make.modelFullName.toLowerCase().includes(v.toLowerCase())
+              )
+        )
+      : makesList;
+
+  return (
+    <div>
+      <Modal width={"90%"} visible={visible} onCancel={() => setVisible(false)}>
+        <Table
+          title={() => (
+            <Input.Search
+              onSearch={(val) => setSearchText(val)}
+              placeholder={t("general.labels.search")}
+            />
+          )}
+          columns={columns}
+          loading={loading}
+          id="id"
+          dataSource={filteredMakes}
+          onRow={(record) => {
+            return {
+              onClick: setSelectedModel(record),
+            };
+          }}
+          rowSelection={{
+            onSelect: (record, selected, ...props) => {
+              console.log(
+                "🚀  ~ file: dms-cdk-makes.component.jsx  ~ line 85  ~ record, selected, ...props",
+                record,
+                selected,
+                ...props
+              );
+
+              setSelectedModel(record);
+            },
+
+            type: "radio",
+            selectedRowKeys: [selectedModel && selectedModel.id],
+          }}
+        />
+      </Modal>
+      <Button
+        onClick={() => {
+          setVisible(true);
+          setLoading(true);
+          socket.emit("cdk-get-makes", bodyshop.cdk_dealerid, (makes) => {
+            console.log("Called back", makes);
+            setMakesList(makes);
+            setLoading(false);
+          });
+        }}
+      >
+        Get Makes
+      </Button>
+    </div>
+  );
+}

client/src/components/dms-customer-selector/dms-customer-selector.component.jsx

@@ -0,0 +1,77 @@
+import { Button, Table } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { socket } from "../../pages/dms/dms.container";
+import PhoneFormatter from "../../utils/PhoneFormatter";
+import { alphaSort } from "../../utils/sorters";
+export default function DmsCustomerSelector() {
+  const { t } = useTranslation();
+  const [customerList, setcustomerList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [selectedCustomer, setSelectedCustomer] = useState(null);
+
+  socket.on("cdk-select-customer", (customerList, callback) => {
+    setVisible(true);
+    setcustomerList(customerList);
+  });
+
+  const onOk = () => {
+    setVisible(false);
+    socket.emit("cdk-selected-customer", selectedCustomer);
+  };
+
+  const columns = [
+    {
+      title: t("dms.fields.name1"),
+      dataIndex: ["name1", "fullName"],
+      key: "name1",
+      sorter: (a, b) => alphaSort(a.name1?.fullName, b.name1?.fullName),
+    },
+    {
+      title: t("dms.fields.name2"),
+      dataIndex: ["name2", "fullName"],
+      key: "name2",
+      sorter: (a, b) => alphaSort(a.name2?.fullName, b.name2?.fullName),
+    },
+    {
+      title: t("dms.fields.phone"),
+      dataIndex: ["contactInfo", "mainTelephoneNumber", "value"],
+      key: "phone",
+      render: (record, value) => (
+        <PhoneFormatter>
+          {record.contactInfo?.mainTelephoneNumber?.value}
+        </PhoneFormatter>
+      ),
+    },
+    {
+      title: t("dms.fields.address"),
+      //dataIndex: ["name2", "fullName"],
+      key: "address",
+      render: (record, value) =>
+        `${record.address?.addressLine[0]}, ${record.address?.city} ${record.address?.stateOrProvince} ${record.address?.postalCode}`,
+    },
+  ];
+
+  if (!visible) return <></>;
+  return (
+    <Table
+      title={() => (
+        <div>
+          <Button onClick={onOk}>Select</Button>
+        </div>
+      )}
+      pagination={{ position: "top" }}
+      columns={columns}
+      rowKey={(record) => record.id.value}
+      dataSource={customerList}
+      //onChange={handleTableChange}
+      rowSelection={{
+        onSelect: (props) => {
+          setSelectedCustomer(props.id.value);
+        },
+        type: "radio",
+        selectedRowKeys: [selectedCustomer],
+      }}
+    />
+  );
+}

client/src/components/dms-log-events/dms-log-events.component.jsx

@@ -0,0 +1,55 @@
+import { Divider, Space, Tag, Timeline } from "antd";
+import moment from "moment";
+import React from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  setBreadcrumbs,
+  setSelectedHeader,
+} from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
+  setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(DmsLogEvents);
+
+export function DmsLogEvents({ socket, logs, bodyshop }) {
+  return (
+    <Timeline pending reverse={true}>
+      {logs.map((log, idx) => (
+        <Timeline.Item key={idx} color={LogLevelHierarchy(log.level)}>
+          <Space wrap align="start" style={{}}>
+            <Tag color={LogLevelHierarchy(log.level)}>{log.level}</Tag>
+            <span>{moment(log.timestamp).format("MM/DD/YYYY HH:MM:ss")}</span>
+            <Divider type="vertical" />
+            <span>{log.message}</span>
+          </Space>
+        </Timeline.Item>
+      ))}
+    </Timeline>
+  );
+}
+
+function LogLevelHierarchy(level) {
+  switch (level) {
+    case "TRACE":
+      return "pink";
+    case "DEBUG":
+      return "orange";
+    case "INFO":
+      return "blue";
+    case "WARNING":
+      return "yellow";
+    case "ERROR":
+      return "red";
+    default:
+      return 0;
+  }
+}

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

@@ -0,0 +1,150 @@
+import { DeleteFilled } from "@ant-design/icons";
+import { Button, Form, Input } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component";
+import CurrencyInput from "../form-items-formatted/currency-form-item.component";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(DmsPostForm);
+
+export function DmsPostForm({ bodyshop, socket, jobId }) {
+  const [form] = Form.useForm();
+  const { t } = useTranslation();
+  return (
+    <Form form={form} layout="vertical">
+      <LayoutFormRow>
+        <Form.Item
+          name="journal"
+          label={t("jobs.fields.dms.journal")}
+          initialValue={
+            bodyshop.cdk_configuration &&
+            bodyshop.cdk_configuration.default_journal
+          }
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          name="dms_make"
+          label={t("jobs.fields.dms.dms_make")}
+          rules={[
+            {
+              required: true,
+            },
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          name="dms_make"
+          label={t("jobs.fields.dms.dms_make")}
+          rules={[
+            {
+              required: true,
+            },
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <DmsCdkMakes form={form} socket={socket} />
+      </LayoutFormRow>
+
+      <Form.List name={["payers"]}>
+        {(fields, { add, remove }) => {
+          return (
+            <div>
+              {fields.map((field, index) => (
+                <Form.Item key={field.key}>
+                  <LayoutFormRow>
+                    <Form.Item
+                      label={t("jobs.fields.dms.payer.name")}
+                      key={`${index}name`}
+                      name={[field.name, "name"]}
+                      rules={[
+                        {
+                          required: true,
+                        },
+                      ]}
+                    >
+                      <Input />
+                    </Form.Item>
+
+                    <Form.Item
+                      label={t("jobs.fields.dms.payer.account")}
+                      key={`${index}account`}
+                      name={[field.name, "account"]}
+                      rules={[
+                        {
+                          required: true,
+                        },
+                      ]}
+                    >
+                      <Input />
+                    </Form.Item>
+
+                    <Form.Item
+                      label={t("jobs.fields.dms.payer.amount")}
+                      key={`${index}amount`}
+                      name={[field.name, "amount"]}
+                      rules={[
+                        {
+                          required: true,
+                        },
+                      ]}
+                    >
+                      <CurrencyInput />
+                    </Form.Item>
+                    <Form.Item
+                      label={t("jobs.fields.dms.payer.controlnumber")}
+                      key={`${index}controlnumber`}
+                      name={[field.name, "controlnumber"]}
+                      rules={[
+                        {
+                          required: true,
+                        },
+                      ]}
+                    >
+                      <Input />
+                    </Form.Item>
+
+                    <DeleteFilled
+                      onClick={() => {
+                        remove(field.name);
+                      }}
+                    />
+                  </LayoutFormRow>
+                </Form.Item>
+              ))}
+              <Form.Item>
+                <Button
+                  type="dashed"
+                  onClick={() => {
+                    add();
+                  }}
+                  style={{ width: "100%" }}
+                >
+                  {t("general.actions.add")}
+                </Button>
+              </Form.Item>
+            </div>
+          );
+        }}
+      </Form.List>
+    </Form>
+  );
+}

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

@@ -37,6 +37,8 @@ export default function EmailOverlayComponent({ form, selectedMediaState }) {
       </Form.Item>
 
       <Divider>{t("emails.labels.preview")}</Divider>
+      <strong>{t("emails.labels.pdfcopywillbeattached")}</strong>
+
       <Form.Item shouldUpdate>
         {() => {
           return (

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

@@ -43,6 +43,10 @@ export function EmailOverlayContainer({
   const [loading, setLoading] = useState(false);
   const [sending, setSending] = useState(false);
   const [rawHtml, setRawHtml] = useState("");
+  const [pdfCopytoAttach, setPdfCopytoAttach] = useState({
+    filename: null,
+    pdf: null,
+  });
   const [selectedMedia, setSelectedMedia] = useState([]);
 
   const defaultEmailFrom = {
@@ -59,17 +63,17 @@ export function EmailOverlayContainer({
   const handleFinish = async (values) => {
     logImEXEvent("email_send_from_modal");
 
-    const attachments = [];
+    //const attachments = [];
 
-    if (values.fileList)
-      await asyncForEach(values.fileList, async (f) => {
-        const t = {
-          ContentType: f.type,
-          Filename: f.name,
-          Base64Content: (await toBase64(f.originFileObj)).split(",")[1],
-        };
-        attachments.push(t);
-      });
+    // if (values.fileList)
+    //   await asyncForEach(values.fileList, async (f) => {
+    //     const t = {
+    //       ContentType: f.type,
+    //       Filename: f.name,
+    //       Base64Content: (await toBase64(f.originFileObj)).split(",")[1],
+    //     };
+    //     attachments.push(t);
+    //   });
 
     setSending(true);
     try {
@@ -77,11 +81,28 @@ export function EmailOverlayContainer({
         ...defaultEmailFrom,
         ...values,
         html: rawHtml,
-        attachments:
-          values.fileList &&
-          (await Promise.all(
-            values.fileList.map(async (f) => await toBase64(f.originFileObj))
-          )),
+        attachments: [
+          ...(values.fileList
+            ? await Promise.all(
+                values.fileList.map(async (f) => {
+                  return {
+                    filename: f.name,
+                    path: await toBase64(f.originFileObj),
+                  };
+                })
+              )
+            : []),
+          ...(pdfCopytoAttach.pdf
+            ? [
+                {
+                  path: pdfCopytoAttach.pdf,
+                  filename:
+                    pdfCopytoAttach.filename &&
+                    `${pdfCopytoAttach.filename}.pdf`,
+                },
+              ]
+            : []),
+        ],
         media: selectedMedia.filter((m) => m.isSelected).map((m) => m.src),
         //attachments,
       });
@@ -99,13 +120,22 @@ export function EmailOverlayContainer({
   const render = async () => {
     logImEXEvent("email_render_template", { template: emailConfig.template });
     setLoading(true);
-    let html = await RenderTemplate(emailConfig.template, bodyshop, true);
+    let { html, pdf, filename } = await RenderTemplate(
+      emailConfig.template,
+      bodyshop,
+      true
+    );
 
     const response = await axios.post("/render/inlinecss", {
       html: html,
       url: `${window.location.protocol}://${window.location.host}/`,
     });
     setRawHtml(response.data);
+
+    if (pdf) {
+      setPdfCopytoAttach({ pdf, filename });
+    }
+
     form.setFieldsValue({
       ...emailConfig.messageOptions,
       cc:
@@ -166,8 +196,8 @@ const toBase64 = (file) =>
     reader.onerror = (error) => reject(error);
   });
 
-const asyncForEach = async (array, callback) => {
-  for (let index = 0; index < array.length; index++) {
-    await callback(array[index], index, array);
-  }
-};
+// const asyncForEach = async (array, callback) => {
+//   for (let index = 0; index < array.length; index++) {
+//     await callback(array[index], index, array);
+//   }
+// };

client/src/components/error-boundary/error-boundary.component.jsx

@@ -73,7 +73,6 @@ class ErrorBoundary extends React.Component {
   };
 
   render() {
-    console.log("this.props :>> ", this.props);
     const { t } = this.props;
     const { error, info } = this.state;
     if (this.state.hasErrored === true) {

client/src/components/feature-wrapper/feature-wrapper.component.jsx

@@ -0,0 +1,50 @@
+import moment from "moment";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import AlertComponent from "../alert/alert.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+function FeatureWrapper({
+  bodyshop,
+  featureName,
+  noauth,
+  children,
+  ...restProps
+}) {
+  const { t } = useTranslation();
+
+  if (HasFeatureAccess({ featureName, bodyshop })) return children;
+
+  return (
+    noauth || (
+      <AlertComponent
+        message={t("general.messages.nofeatureaccess")}
+        type="warning"
+      />
+    )
+  );
+}
+
+export function HasFeatureAccess({ featureName, bodyshop }) {
+  return (
+    bodyshop.features.allAccess ||
+    moment(bodyshop.features[featureName]).isAfter(moment())
+  );
+}
+
+export default connect(mapStateToProps, null)(FeatureWrapper);
+
+/* 
+dashboard
+production-board
+scoreboard
+csi
+tech-console
+mobile-imaging
+*/

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

@@ -37,7 +37,7 @@ export default function GlobalSearch() {
               value: job.ro_number,
               label: (
                 <Link to={`/manage/jobs/${job.id}`}>
-                  <Space wrap split={<Divider type="vertical" />}>
+                  <Space size="small" split={<Divider type="vertical" />}>
                     <strong>{job.ro_number || t("general.labels.na")}</strong>
                     <span>{`${job.ownr_fn || ""} ${job.ownr_ln || ""} ${
                       job.ownr_co_nm || ""
@@ -45,7 +45,7 @@ export default function GlobalSearch() {
                     <span>{`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${
                       job.v_model_desc || ""
                     }`}</span>
-                    <span>{`${job.clm_no}`}</span>
+                    <span>{`${job.clm_no || ""}`}</span>
                   </Space>
                 </Link>
               ),
@@ -62,7 +62,7 @@ export default function GlobalSearch() {
               }`,
               label: (
                 <Link to={`/manage/owners/${owner.id}`}>
-                  <Space wrap split={<Divider type="vertical" />}>
+                  <Space size="small" split={<Divider type="vertical" />}>
                     <span>{`${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${
                       owner.ownr_co_nm || ""
                     }`}</span>
@@ -85,14 +85,14 @@ export default function GlobalSearch() {
               } ${vehicle.v_model_desc || ""}`,
               label: (
                 <Link to={`/manage/vehicles/${vehicle.id}`}>
-                  <Space wrap split={<Divider type="vertical" />}>
+                  <Space size="small" split={<Divider type="vertical" />}>
                     <span>
                       {`${vehicle.v_model_yr || ""} ${
                         vehicle.v_make_desc || ""
                       } ${vehicle.v_model_desc || ""}`}
                     </span>
-                    <span>{vehicle.plate_no}</span>
-                    <span> {vehicle.v_vin}</span>
+                    <span>{vehicle.plate_no || ""}</span>
+                    <span> {vehicle.v_vin || ""}</span>
                   </Space>
                 </Link>
               ),
@@ -107,11 +107,12 @@ export default function GlobalSearch() {
               value: `${payment.job.ro_number} ${payment.payer} ${payment.amount}`,
               label: (
                 <Link to={`/manage/jobs/${payment.job.id}`}>
-                  <Space wrap split={<Divider type="vertical" />}>
+                  <Space size="small" split={<Divider type="vertical" />}>
+                    <span>{payment.paymentnum}</span>
                     <span>{payment.job.ro_number}</span>
-                    <span>{payment.job.memo}</span>
-                    <span>{payment.job.amount}</span>
-                    <span>{payment.job.transactionid}</span>
+                    <span>{payment.memo || ""}</span>
+                    <span>{payment.amount || ""}</span>
+                    <span>{payment.transactionid || ""}</span>
                   </Space>
                 </Link>
               ),
@@ -126,7 +127,7 @@ export default function GlobalSearch() {
               value: `${bill.invoice_number} - ${bill.vendor.name}`,
               label: (
                 <Link to={`/manage/bills?billid=${bill.id}`}>
-                  <Space wrap split={<Divider type="vertical" />}>
+                  <Space size="small" split={<Divider type="vertical" />}>
                     <span>{bill.invoice_number}</span>
                     <span>{bill.vendor.name}</span>
                     <span>{bill.date}</span>
@@ -146,7 +147,7 @@ export default function GlobalSearch() {
               }`,
               label: (
                 <Link to={`/manage/phonebook?phonebookentry=${pb.id}`}>
-                  <Space wrap split={<Divider type="vertical" />}>
+                  <Space size="small" split={<Divider type="vertical" />}>
                     <span>{`${pb.firstname || ""} ${pb.lastname || ""} ${
                       pb.company || ""
                     }`}</span>
@@ -165,8 +166,6 @@ export default function GlobalSearch() {
 
   return (
     <AutoComplete
-      key="globalsearch"
-      dropdownMatchSelectWidth={"false"}
       options={options}
       onSearch={handleSearch}
       allowClear

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

@@ -202,8 +202,8 @@ function Header({
                 context: null,
               });
             }}
+            icon={<Icon component={FaCreditCard} />}
           >
-            <Icon component={FaCreditCard} />
             {t("menus.header.enterpayment")}
           </Menu.Item>
           <Menu.Divider key="div5" />

client/src/components/jira-support-widget/jira-support-widget.component.jsx

@@ -1,28 +0,0 @@
-import React from "react";
-
-export default function JiraSupportComponent() {
-  //useScript();
-
-  return <div></div>;
-}
-
-// const useScript = () => {
-//   useEffect(() => {
-//     const script = document.createElement("script");
-//     script.src = "https://jsd-widget.atlassian.com/assets/embed.js";
-//     script.setAttribute("data-jsd-embedded", true);
-//     script.setAttribute("data-key", "d69bb65c-1dd3-483f-b109-66a970d03f44");
-//     script.setAttribute("data-base-url", "https://jsd-widget.atlassian.com");
-//     //script.async = true;
-//     script.onload = () => {
-//       var DOMContentLoaded_event = document.createEvent("Event");
-//       DOMContentLoaded_event.initEvent("DOMContentLoaded", true, true);
-//       window.document.dispatchEvent(DOMContentLoaded_event);
-//     };
-//     document.head.appendChild(script);
-
-//     return () => {
-//       document.head.removeChild(script);
-//     };
-//   }, []);
-// };

client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx

@@ -161,7 +161,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId }) {
               <Input />
             </Form.Item>
             <Form.Item
-              label={t("printcenter.jobs.3rdpartyfields.ponumber")}
+              label={t("printcenter.jobs.3rdpartyfields.refnumber")}
               name="ponumber"
             >
               <Input />

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

@@ -1,22 +1,50 @@
-import { Button, Popover, Space } from "antd";
+import { AlertFilled } from "@ant-design/icons";
+import {
+  Button,
+  Divider,
+  Dropdown,
+  Menu,
+  notification,
+  Popover,
+  Space,
+} from "antd";
+import parsePhoneNumber from "libphonenumber-js";
+import moment from "moment";
+import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { Link } from "react-router-dom";
+import { Link, useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import {
+  openChatByPhone,
+  setMessage,
+} from "../../redux/messaging/messaging.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import PhoneFormatter from "../../utils/PhoneFormatter";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
+import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
+import ScheduleEventNote from "./schedule-event.note.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
 const mapDispatchToProps = (dispatch) => ({
   setScheduleContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "schedule" })),
+  openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
+  setMessage: (text) => dispatch(setMessage(text)),
 });
 
 export function ScheduleEventComponent({
+  bodyshop,
+  setMessage,
+  openChatByPhone,
   event,
   refetch,
   handleCancel,
@@ -24,6 +52,8 @@ export function ScheduleEventComponent({
 }) {
   const { t } = useTranslation();
   const [visible, setVisible] = useState(false);
+  const history = useHistory();
+  const searchParams = queryString.parse(useLocation().search);
 
   const blockContent = (
     <div>
@@ -34,7 +64,7 @@ export function ScheduleEventComponent({
   );
 
   const popoverContent = (
-    <div>
+    <div style={{ maxWidth: "40vw" }}>
       {!event.isintake ? (
         <strong>{event.title}</strong>
       ) : (
@@ -71,40 +101,95 @@ export function ScheduleEventComponent({
             {(event.job && event.job.ownr_ea) || ""}
           </DataLabel>
           <DataLabel label={t("jobs.fields.ownr_ph1")}>
-            <PhoneFormatter>
-              {(event.job && event.job.ownr_ph1) || ""}
-            </PhoneFormatter>
+            <ChatOpenButton
+              phone={event.job && event.job.ownr_ph1}
+              jobid={event.job.id}
+            />
           </DataLabel>
           <DataLabel label={t("jobs.fields.alt_transport")}>
             {(event.job && event.job.alt_transport) || ""}
             <ScheduleAtChange job={event && event.job} />
           </DataLabel>
+          <ScheduleEventNote event={event} />
         </div>
       ) : null}
-
+      <Divider />
       <Space wrap>
         {event.job ? (
           <Link to={`/manage/jobs/${event.job && event.job.id}`}>
             <Button>{t("appointments.actions.viewjob")}</Button>
           </Link>
         ) : null}
-        <Button
-          onClick={() => {
-            const Template = TemplateList("job").appointment_reminder;
-            GenerateDocument(
-              {
-                name: Template.key,
-                variables: { id: event.job.id },
-              },
-              { to: event.job && event.job.ownr_ea, subject: Template.subject },
-              "e",
-              event.job && event.job.id
-            );
-          }}
-          disabled={event.arrived}
+        {event.job ? (
+          <Button
+            onClick={() => {
+              history.push({
+                search: queryString.stringify({
+                  ...searchParams,
+                  selected: event.job.id,
+                }),
+              });
+            }}
+          >
+            {t("appointments.actions.preview")}
+          </Button>
+        ) : null}
+
+        <Dropdown
+          overlay={
+            <Menu>
+              <Menu.Item
+                onClick={() => {
+                  const Template = TemplateList("job").appointment_reminder;
+                  GenerateDocument(
+                    {
+                      name: Template.key,
+                      variables: { id: event.job.id },
+                    },
+                    {
+                      to: event.job && event.job.ownr_ea,
+                      subject: Template.subject,
+                    },
+                    "e",
+                    event.job && event.job.id
+                  );
+                }}
+                disabled={event.arrived}
+              >
+                {t("general.labels.email")}
+              </Menu.Item>
+              <Menu.Item
+                onClick={() => {
+                  const p = parsePhoneNumber(event.job.ownr_ph1, "CA");
+                  if (p && p.isValid()) {
+                    openChatByPhone({
+                      phone_num: p.formatInternational(),
+                      jobid: event.job.id,
+                    });
+                    setMessage(
+                      t("appointments.labels.reminder", {
+                        shopname: bodyshop.shopname,
+                        date: moment(event.start).format("MM/DD/YYYY"),
+                        time: moment(event.start).format("HH:MM a"),
+                      })
+                    );
+                    setVisible(false);
+                  } else {
+                    notification["error"]({
+                      message: t("messaging.error.invalidphone"),
+                    });
+                  }
+                }}
+                disabled={event.arrived || !bodyshop.messagingservicesid}
+              >
+                {t("general.labels.sms")}
+              </Menu.Item>
+            </Menu>
+          }
         >
-          {t("appointments.actions.sendreminder")}
-        </Button>
+          <Button>{t("appointments.actions.sendreminder")}</Button>
+        </Dropdown>
+
         <Button onClick={() => handleCancel(event.id)} disabled={event.arrived}>
           {t("appointments.actions.cancel")}
         </Button>
@@ -143,6 +228,7 @@ export function ScheduleEventComponent({
   const RegularEvent = event.isintake ? (
     <div style={{ display: "flex", flexWrap: "wrap" }}>
       <Space>
+        {event.note && <AlertFilled className="production-alert" />}
         <strong>{`${event.job.ro_number || t("general.labels.na")}`}</strong>
         <span>{`${(event.job && event.job.ownr_fn) || ""} ${
           (event.job && event.job.ownr_ln) || ""
@@ -184,4 +270,7 @@ export function ScheduleEventComponent({
     </Popover>
   );
 }
-export default connect(null, mapDispatchToProps)(ScheduleEventComponent);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ScheduleEventComponent);

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

@@ -0,0 +1,74 @@
+import { EditFilled, SaveFilled } from "@ant-design/icons";
+import { useMutation } from "@apollo/client";
+import { Button, Input, notification, Space } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import DataLabel from "../data-label/data-label.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export function ScheduleEventNote({ event }) {
+  const [editing, setEditing] = useState(false);
+  const [note, setNote] = useState(event.note || "");
+  const [loading, setLoading] = useState(false);
+  const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
+  const { t } = useTranslation();
+
+  const toggleEdit = async () => {
+    if (editing) {
+      //Await the update
+      setLoading(true);
+      const result = await updateAppointment({
+        variables: {
+          appid: event.id,
+          app: { note },
+        },
+      });
+
+      if (!!!result.errors) {
+        //  notification["success"]({ message: t("appointments.successes.saved") });
+      } else {
+        notification["error"]({
+          message: t("jobs.errors.saving", {
+            error: JSON.stringify(result.errors),
+          }),
+        });
+      }
+
+      setEditing(false);
+    } else {
+      setEditing(true);
+    }
+    setLoading(false);
+  };
+
+  return (
+    <DataLabel label={t("appointments.fields.note")}>
+      <Space flex>
+        {!editing ? (
+          event.note || ""
+        ) : (
+          <Input.TextArea
+            rows={3}
+            value={note}
+            onChange={(e) => setNote(e.target.value)}
+            style={{ maxWidth: "8vw" }}
+          />
+        )}
+        <Button onClick={toggleEdit} loading={loading}>
+          {editing ? <SaveFilled /> : <EditFilled />}
+        </Button>
+      </Space>
+    </DataLabel>
+  );
+}
+export default connect(mapStateToProps, mapDispatchToProps)(ScheduleEventNote);

client/src/components/job-audit-trail/job-audit-trail.component.jsx

@@ -0,0 +1,46 @@
+import { useQuery } from "@apollo/client";
+import { Card, Table } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { QUERY_AUDIT_TRAIL } from "../../graphql/audit_trail.queries";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
+
+export default function JobAuditTrail({ jobId }) {
+  const { t } = useTranslation();
+  const { loading, data } = useQuery(QUERY_AUDIT_TRAIL, {
+    variables: { jobid: jobId },
+    skip: !jobId,
+  });
+
+  const columns = [
+    {
+      title: t("audit.fields.created"),
+      dataIndex: "created",
+      key: "created",
+      render: (text, record) => (
+        <DateTimeFormatter>{record.created}</DateTimeFormatter>
+      ),
+    },
+    {
+      title: t("audit.fields.useremail"),
+      dataIndex: "useremail",
+      key: "useremail",
+    },
+    {
+      title: t("audit.fields.operation"),
+      dataIndex: "operation",
+      key: "operation",
+    },
+  ];
+
+  return (
+    <Card title={t("jobs.labels.audit")}>
+      <Table
+        loading={loading}
+        columns={columns}
+        rowKey="id"
+        dataSource={data ? data.audit_trail : []}
+      />
+    </Card>
+  );
+}

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

@@ -16,16 +16,21 @@ import {
 import ConfigFormComponents from "../../../config-form-components/config-form-components.component";
 import DateTimePicker from "../../../form-date-time-picker/form-date-time-picker.component";
 import moment from "moment-business-days";
+import { insertAuditTrail } from "../../../../redux/application/application.actions";
+import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
+import { UPDATE_OWNER } from "../../../../graphql/owners.queries";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function JobChecklistForm({
+  insertAuditTrail,
   formItems,
   bodyshop,
   currentUser,
@@ -37,6 +42,8 @@ export function JobChecklistForm({
   const [intakeJob] = useMutation(UPDATE_JOB);
   const [loading, setLoading] = useState(false);
   const [markAptArrived] = useMutation(MARK_LATEST_APPOINTMENT_AS_ARRIVED);
+  const [updateOwner] = useMutation(UPDATE_OWNER);
+
   const { jobId } = useParams();
   const history = useHistory();
   const search = queryString.parse(useLocation().search);
@@ -59,6 +66,12 @@ export function JobChecklistForm({
             production_vars: {
               ...job.production_vars,
               ...values.production_vars,
+              note:
+                values.production_vars &&
+                values.production_vars.note &&
+                values.production_vars.note !== ""
+                  ? job.production_vars && values.production_vars.note
+                  : job.production_vars && job.production_vars.note,
             },
           }),
           ...(type === "intake" && {
@@ -104,11 +117,40 @@ export function JobChecklistForm({
         });
       }
     }
+    if (type === "intake" && job.owner && job.owner.id) {
+      //Updae Owner Allow to Text
+      const updateOwnerResult = await updateOwner({
+        variables: {
+          ownerId: job.owner.id,
+          owner: { allow_text_message: values.allow_text_message },
+        },
+      });
+
+      if (!!updateOwnerResult.errors) {
+        notification["error"]({
+          message: t("checklist.errors.complete", {
+            error: JSON.stringify(result.errors),
+          }),
+        });
+      }
+    }
+
     setLoading(false);
 
     if (!!!result.errors) {
       notification["success"]({ message: t("checklist.successes.completed") });
       history.push(`/manage/jobs/${jobId}`);
+
+      insertAuditTrail({
+        jobid: jobId,
+        operation: AuditTrailMapping.jobchecklist(
+          type,
+          (type === "deliver" && values.removeFromProduction && false) ||
+            (type === "intake" && values.addToProduction),
+          (type === "intake" && bodyshop.md_ro_statuses.default_arrived) ||
+            (type === "deliver" && bodyshop.md_ro_statuses.default_delivered)
+        ),
+      });
     } else {
       notification["error"]({
         message: t("checklist.errors.complete", {
@@ -135,6 +177,7 @@ export function JobChecklistForm({
         initialValues={{
           ...(type === "intake" && {
             addToProduction: true,
+            allow_text_message: job.owner && job.owner.allow_text_message,
             scheduled_completion:
               (job && job.scheduled_completion) ||
               moment().businessAdd(
@@ -170,6 +213,14 @@ export function JobChecklistForm({
             >
               <Switch disabled={readOnly} />
             </Form.Item>
+            <Form.Item
+              name="allow_text_message"
+              valuePropName="checked"
+              label={t("checklist.labels.allow_text_message")}
+              disabled={readOnly}
+            >
+              <Switch disabled={readOnly} />
+            </Form.Item>
             <Form.Item
               name="scheduled_completion"
               label={t("jobs.fields.scheduled_completion")}

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

@@ -16,6 +16,7 @@ import {
   Table,
   Tag,
 } from "antd";
+import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -291,23 +292,27 @@ export function JobLinesComponent({
               </Button>
               <Button
                 disabled={jobRO}
-                onClick={() =>
-                  deleteJobLine({
+                onClick={async () => {
+                  await deleteJobLine({
                     variables: { joblineId: record.id },
-                    update(cache) {
-                      cache.modify({
-                        id: cache.identify(job),
-                        fields: {
-                          joblines(existingJobLines, { readField }) {
-                            return existingJobLines.filter(
-                              (jlRef) => record.id !== readField("id", jlRef)
-                            );
-                          },
-                        },
-                      });
-                    },
-                  })
-                }
+                    // update(cache) {
+                    //   cache.modify({
+                    //     id: cache.identify(job),
+                    //     fields: {
+                    //       joblines(existingJobLines, { readField }) {
+                    //         return existingJobLines.filter(
+                    //           (jlRef) => record.id !== readField("id", jlRef)
+                    //         );
+                    //       },
+                    //     },
+                    //   });
+                    // },
+                  });
+                  await axios.post("/job/totalsssu", {
+                    id: job.id,
+                  });
+                  refetch && refetch();
+                }}
               >
                 <DeleteFilled />
               </Button>
@@ -395,7 +400,7 @@ export function JobLinesComponent({
                 setState({
                   ...state,
                   filteredInfo: {
-                    part_type: ["PAN,PAL,PAA,PAP,PAS,PASL"],
+                    part_type: ["PAN,PAC,PAR,PAL,PAA,PAM,PAP,PAS,PASL"],
                   },
                 });
               }}

client/src/components/job-employee-assignments/job-employee-assignments.component.jsx

@@ -37,8 +37,8 @@ export function JobEmployeeAssignments({
   });
   const [visibility, setVisibility] = useState(false);
 
-  const onChange = (e) => {
-    setAssignment({ ...assignment, employeeid: e });
+  const onChange = (value, option) => {
+    setAssignment({ ...assignment, employeeid: value, name: option.name });
   };
 
   const popContent = (
@@ -56,7 +56,11 @@ export function JobEmployeeAssignments({
           }
         >
           {bodyshop.employees.map((emp) => (
-            <Select.Option value={emp.id} key={emp.id}>
+            <Select.Option
+              value={emp.id}
+              key={emp.id}
+              name={`${emp.first_name} ${emp.last_name}`}
+            >
               {`${emp.first_name} ${emp.last_name}`}
             </Select.Option>
           ))}

client/src/components/job-employee-assignments/job-employee-assignments.container.jsx

@@ -6,14 +6,34 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB_ASSIGNMENTS } from "../../graphql/jobs.queries";
 import JobEmployeeAssignmentsComponent from "./job-employee-assignments.component";
 
-export default function JobEmployeeAssignmentsContainer({ job, refetch }) {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+});
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobEmployeeAssignmentsContainer);
+
+export function JobEmployeeAssignmentsContainer({
+  job,
+  refetch,
+  insertAuditTrail,
+}) {
   const { t } = useTranslation();
   const [updateJob] = useMutation(UPDATE_JOB_ASSIGNMENTS);
   const [loading, setLoading] = useState(false);
 
   const handleAdd = async (assignment) => {
     setLoading(true);
-    const { operation, employeeid } = assignment;
+    const { operation, employeeid, name } = assignment;
     logImEXEvent("job_assign_employee", { operation });
 
     let empAssignment = determineFieldName(operation);
@@ -23,6 +43,11 @@ export default function JobEmployeeAssignmentsContainer({ job, refetch }) {
     });
     if (refetch) refetch();
 
+    insertAuditTrail({
+      jobid: job.id,
+      operation: AuditTrailMapping.jobassignmentchange(operation, name),
+    });
+
     if (!!result.errors) {
       notification["error"]({
         message: t("jobs.errors.assigning", {
@@ -48,6 +73,10 @@ export default function JobEmployeeAssignmentsContainer({ job, refetch }) {
         }),
       });
     }
+    insertAuditTrail({
+      jobid: job.id,
+      operation: AuditTrailMapping.jobassignmentremoved(operation),
+    });
     setLoading(false);
   };
 

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

@@ -72,7 +72,7 @@ export function JobLineStatusPopup({ bodyshop, jobline, disabled }) {
     );
   return (
     <div
-      style={{ width: "100%", minHeight: "2rem", cursor: "pointer" }}
+      style={{ width: "100%", minHeight: "1rem", cursor: "pointer" }}
       onClick={() => !disabled && setEditing(true)}
     >
       {jobline.status}

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

@@ -12,7 +12,7 @@ import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectJobLineEditModal } from "../../redux/modals/modals.selectors";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import JobLinesUpdsertModal from "./job-lines-upsert-modal.component";
-
+import Axios from "axios";
 const mapStateToProps = createStructuredSelector({
   jobLineEditModal: selectJobLineEditModal,
 });
@@ -29,10 +29,10 @@ function JobLinesUpsertModalContainer({
   const [updateJobLine] = useMutation(UPDATE_JOB_LINE);
   const [loading, setLoading] = useState(false);
 
-  const handleFinish = (values) => {
+  const handleFinish = async (values) => {
     setLoading(true);
     if (!jobLineEditModal.context.id) {
-      insertJobLine({
+      const r = await insertJobLine({
         variables: {
           lineInput: [
             {
@@ -44,42 +44,44 @@ function JobLinesUpsertModalContainer({
             },
           ],
         },
-      })
-        .then((r) => {
-          if (jobLineEditModal.actions.refetch)
-            jobLineEditModal.actions.refetch();
-          //Need to recalcuate totals.
-          toggleModalVisible();
-          notification["success"]({
-            message: t("joblines.successes.created"),
-          });
-        })
-        .catch((error) => {
-          notification["error"]({
-            message: t("joblines.errors.creating", {
-              message: error.message,
-            }),
-          });
+      });
+      if (!r.errors) {
+        await Axios.post("/job/totalsssu", {
+          id: jobLineEditModal.context.jobid,
         });
+        if (jobLineEditModal.actions.refetch)
+          jobLineEditModal.actions.refetch();
+        //Need to recalcuate totals.
+        toggleModalVisible();
+        notification["success"]({
+          message: t("joblines.successes.created"),
+        });
+      } else {
+        notification["error"]({
+          message: t("joblines.errors.creating", {
+            message: JSON.stringify(r.errors.message),
+          }),
+        });
+      }
     } else {
-      updateJobLine({
+      const r = await updateJobLine({
         variables: {
           lineId: jobLineEditModal.context.id,
           line: values,
         },
-      })
-        .then((r) => {
-          notification["success"]({
-            message: t("joblines.successes.updated"),
-          });
-        })
-        .catch((error) => {
-          notification["success"]({
-            message: t("joblines.errors.updating", {
-              message: error.message,
-            }),
-          });
+      });
+      if (!r.errors) {
+        notification["success"]({
+          message: t("joblines.successes.updated"),
         });
+      } else {
+        notification["success"]({
+          message: t("joblines.errors.updating", {
+            message: JSON.stringify(r.errors.message),
+          }),
+        });
+      }
+
       if (jobLineEditModal.actions.submit) {
         jobLineEditModal.actions.submit();
       } else {

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

@@ -1,4 +1,5 @@
 import { Button, Card, Space, Table } from "antd";
+import { EditFilled } from "@ant-design/icons";
 import Dinero from "dinero.js";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -115,16 +116,29 @@ export function JobPayments({
       dataIndex: "actions",
       key: "actions",
       render: (text, record) => (
-        <PrintWrapperComponent
-          templateObject={{
-            name: TemplateList("payment").payment_receipt.key,
-            variables: { id: record.id },
-          }}
-          messageObject={{
-            to: job.ownr_ea,
-          }}
-          id={job.id}
-        />
+        <Space wrap>
+          <Button
+            disabled={record.exportedat}
+            onClick={() => {
+              setPaymentContext({
+                actions: { refetch: refetch },
+                context: record,
+              });
+            }}
+          >
+            <EditFilled />
+          </Button>
+          <PrintWrapperComponent
+            templateObject={{
+              name: TemplateList("payment").payment_receipt.key,
+              variables: { id: record.id },
+            }}
+            messageObject={{
+              to: job.ownr_ea,
+            }}
+            id={job.id}
+          />
+        </Space>
       ),
     },
   ];

client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx

@@ -1,4 +1,4 @@
-import { Checkbox, PageHeader, Table } from "antd";
+import { Checkbox, Table, Typography } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -21,6 +21,7 @@ export default function JobReconciliationBillsTable({
       title: t("billlines.fields.line_desc"),
       dataIndex: "line_desc",
       key: "line_desc",
+      width: "35%",
       sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
       sortOrder:
         state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
@@ -29,6 +30,8 @@ export default function JobReconciliationBillsTable({
       title: t("billlines.labels.from"),
       dataIndex: "from",
       key: "from",
+      width: "20%",
+      ellipsis: true,
       render: (text, record) =>
         `${record.bill.vendor && record.bill.vendor.name} / ${
           record.bill.invoice_number
@@ -57,7 +60,7 @@ export default function JobReconciliationBillsTable({
       ),
     },
     {
-      title: t("billlines.fields.quantity"),
+      title: t("joblines.fields.part_qty"),
       dataIndex: "quantity",
       key: "quantity",
       sorter: (a, b) => a.quantity - b.quantity,
@@ -86,10 +89,12 @@ export default function JobReconciliationBillsTable({
   };
 
   return (
-    <PageHeader title={t("bills.labels.bills")}>
+    <div>
+      <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
       <Table
         pagination={false}
-        scroll={{ y: "40vh", x: true }}
+        size="small"
+        scroll={{ y: "80vh", x: true }}
         columns={columns}
         rowKey="id"
         dataSource={invoiceLineData}
@@ -99,6 +104,6 @@ export default function JobReconciliationBillsTable({
           selectedRowKeys: selectedLines,
         }}
       />
-    </PageHeader>
+    </div>
   );
 }

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

@@ -22,21 +22,23 @@ export default function JobReconciliationModalComponent({ job, bills }) {
   );
 
   return (
-    <div>
-      <Row gutter={[16, 16]}>
-        <Col span={12}>
-          <JobReconciliationPartsTable
-            jobLineData={jobLineData}
-            jobLineState={jobLineState}
-          />
-        </Col>
-        <Col span={12}>
-          <JobReconciliationBillsTable
-            invoiceLineData={invoiceLineData}
-            billLineState={billLineState}
-          />
-        </Col>
-      </Row>
+    <div style={{ flex: 1, display: "flex", flexDirection: "column" }}>
+      <div style={{ flex: 1 }}>
+        <Row gutter={8}>
+          <Col span={12}>
+            <JobReconciliationPartsTable
+              jobLineData={jobLineData}
+              jobLineState={jobLineState}
+            />
+          </Col>
+          <Col span={12}>
+            <JobReconciliationBillsTable
+              invoiceLineData={invoiceLineData}
+              billLineState={billLineState}
+            />
+          </Col>
+        </Row>
+      </div>
       <Row>
         <JobReconciliationTotals
           jobLines={jobLineData}

client/src/components/job-reconciliation-modal/job-reconciliation-modal.styles.scss

@@ -0,0 +1,12 @@
+.imex-reconciliation-modal {
+  top: 20px;
+  .ant-modal-content {
+    height: 95vh;
+    display: flex;
+    flex-direction: column;
+    .ant-modal-body {
+      display: flex;
+      flex: 1;
+    }
+  }
+}

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

@@ -10,6 +10,7 @@ import { selectReconciliation } from "../../redux/modals/modals.selectors";
 import JobReconciliationModalComponent from "./job-reconciliation-modal.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import AlertComponent from "../alert/alert.component";
+import "./job-reconciliation-modal.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
   reconciliationModal: selectReconciliation,
@@ -38,23 +39,23 @@ function JobReconciliationModalContainer({
   return (
     <Modal
       title={t("jobs.labels.reconciliationheader")}
-      width={"90%"}
+      width={"95%"}
       visible={visible}
       okText={t("general.actions.close")}
       onOk={handleCancel}
       onCancel={handleCancel}
       cancelButtonProps={{ display: "none" }}
       destroyOnClose
+      className="imex-reconciliation-modal"
     >
-      <LoadingSpinner loading={loading}>
-        {error && <AlertComponent message={error.message} type="error" />}
-        {data && (
-          <JobReconciliationModalComponent
-            job={data && data.jobs_by_pk}
-            bills={data && data.bills}
-          />
-        )}
-      </LoadingSpinner>
+      {loading && <LoadingSpinner loading={loading} />}
+      {error && <AlertComponent message={error.message} type="error" />}
+      {data && (
+        <JobReconciliationModalComponent
+          job={data && data.jobs_by_pk}
+          bills={data && data.bills}
+        />
+      )}
     </Modal>
   );
 }

client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx

@@ -1,4 +1,4 @@
-import { PageHeader, Table } from "antd";
+import { Table, Typography } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -102,11 +102,13 @@ export default function JobReconcilitionPartsTable({
   };
 
   return (
-    <PageHeader title={t("jobs.labels.lines")}>
+    <div>
+      <Typography.Title level={4}>{t("jobs.labels.lines")}</Typography.Title>
       <Table
         pagination={false}
         columns={columns}
-        scroll={{ y: "40vh", x: true }}
+        size="small"
+        scroll={{ y: "80vh", x: true }}
         rowKey="id"
         dataSource={jobLineData}
         onChange={handleTableChange}
@@ -122,6 +124,6 @@ export default function JobReconcilitionPartsTable({
       <div style={{ fontStyle: "italic", margin: "4px" }}>
         {t("jobs.labels.reconciliation.removedpartsstrikethrough")}
       </div>
-    </PageHeader>
+    </div>
   );
 }

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

@@ -1,6 +1,6 @@
 import { LoadingOutlined } from "@ant-design/icons";
 import { useLazyQuery } from "@apollo/client";
-import { Empty, Select } from "antd";
+import { Empty, Select, Space, Tag } from "antd";
 import _ from "lodash";
 import React, { forwardRef, useEffect } from "react";
 import { useTranslation } from "react-i18next";
@@ -15,6 +15,7 @@ const JobSearchSelect = (
   {
     disabled,
     convertedOnly = false,
+    notInvoiced = false,
     notExported = true,
     clm_no = false,
     ...restProps
@@ -30,6 +31,7 @@ const JobSearchSelect = (
             variables: {
               ...(convertedOnly ? { isConverted: true } : {}),
               ...(notExported ? { notExported: true } : {}),
+              ...(notInvoiced ? { notInvoiced: true } : {}),
             },
           }
         : {}),
@@ -80,13 +82,20 @@ const JobSearchSelect = (
         {theOptions
           ? theOptions.map((o) => (
               <Option key={o.id} value={o.id} status={o.status}>
-                {`${clm_no ? `${o.clm_no} | ` : ""}${
-                  o.ro_number || t("general.labels.na")
-                } | ${o.ownr_ln || ""} ${o.ownr_fn || ""} ${
-                  o.ownr_co_nm ? ` ${o.ownr_co_num}` : ""
-                }| ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${
-                  o.v_model_desc || ""
-                }`}
+                <Space align="center">
+                  <span>
+                    {`${clm_no && o.clm_no ? `${o.clm_no} | ` : ""}${
+                      o.ro_number || t("general.labels.na")
+                    } | ${o.ownr_ln || ""} ${o.ownr_fn || ""} ${
+                      o.ownr_co_nm ? ` ${o.ownr_co_num}` : ""
+                    }| ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${
+                      o.v_model_desc || ""
+                    }`}
+                  </span>
+                  <Tag>
+                    <strong>{o.status}</strong>
+                  </Tag>
+                </Space>
               </Option>
             ))
           : null}

client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx

@@ -0,0 +1,57 @@
+import { DownCircleFilled } from "@ant-design/icons";
+import { useMutation } from "@apollo/client";
+import { Button, Dropdown, Menu, notification } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminStatus);
+
+export function JobsAdminStatus({ bodyshop, job }) {
+  const { t } = useTranslation();
+
+  const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
+  const updateJobStatus = (status) => {
+    mutationUpdateJobstatus({
+      variables: { jobId: job.id, status: status },
+    })
+      .then((r) => {
+        notification["success"]({ message: t("jobs.successes.save") });
+        // refetch();
+      })
+      .catch((error) => {
+        notification["error"]({ message: t("jobs.errors.saving") });
+      });
+  };
+
+  const statusmenu = (
+    <Menu
+      onClick={(e) => {
+        updateJobStatus(e.key);
+      }}
+    >
+      {bodyshop.md_ro_statuses.statuses.map((item) => (
+        <Menu.Item key={item}>{item}</Menu.Item>
+      ))}
+    </Menu>
+  );
+
+  return (
+    <Dropdown overlay={statusmenu} trigger={["click"]} key="changestatus">
+      <Button shape="round">
+        <span>{job.status}</span>
+
+        <DownCircleFilled />
+      </Button>
+    </Dropdown>
+  );
+}

client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx

@@ -6,8 +6,8 @@ import { useTranslation } from "react-i18next";
 export default function JobAdminDeleteIntake({ job }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-  const [updateJob] = useMutation(gql`
-    mutation UPDATE_JOB($jobId: uuid!) {
+  const [deleteIntake] = useMutation(gql`
+    mutation DELETE_INTAKE($jobId: uuid!) {
       update_jobs_by_pk(
         pk_columns: { id: $jobId }
         _set: { intakechecklist: null }
@@ -18,9 +18,39 @@ export default function JobAdminDeleteIntake({ job }) {
     }
   `);
 
+  const [DELETE_DELIVERY] = useMutation(gql`
+    mutation DELETE_DELIVERY($jobId: uuid!) {
+      update_jobs_by_pk(
+        pk_columns: { id: $jobId }
+        _set: { deliverchecklist: null }
+      ) {
+        id
+        deliverchecklist
+      }
+    }
+  `);
+
   const handleDelete = async (values) => {
     setLoading(true);
-    const result = await updateJob({
+    const result = await deleteIntake({
+      variables: { jobId: job.id },
+    });
+
+    if (!!!result.errors) {
+      notification["success"]({ message: t("jobs.successes.save") });
+    } else {
+      notification["error"]({
+        message: t("jobs.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setLoading(false);
+  };
+
+  const handleDeleteDelivery = async (values) => {
+    setLoading(true);
+    const result = await DELETE_DELIVERY({
       variables: { jobId: job.id },
     });
 
@@ -34,12 +64,16 @@ export default function JobAdminDeleteIntake({ job }) {
       });
     }
     setLoading(false);
-    //Get the owner details, populate it all back into the job.
   };
 
   return (
-    <Button loading={loading} onClick={handleDelete}>
-      {t("jobs.labels.deleteintake")}
-    </Button>
+    <>
+      <Button loading={loading} onClick={handleDelete}>
+        {t("jobs.labels.deleteintake")}
+      </Button>
+      <Button loading={loading} onClick={handleDeleteDelivery}>
+        {t("jobs.labels.deletedelivery")}
+      </Button>
+    </>
   );
 }

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

@@ -7,6 +7,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import moment from "moment";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -21,8 +22,8 @@ export default connect(
 export function JobAdminMarkReexport({ bodyshop, job }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-  const [updateJob] = useMutation(gql`
-    mutation UPDATE_JOB($jobId: uuid!) {
+  const [markJobForReexport] = useMutation(gql`
+    mutation MARK_JOB_FOR_REEXPORT($jobId: uuid!) {
       update_jobs_by_pk(
         pk_columns: { id: $jobId }
         _set: { date_exported: null
@@ -30,14 +31,84 @@ export function JobAdminMarkReexport({ bodyshop, job }) {
         }
       ) {
         id
-        intakechecklist
+        date_exported
+        status
+        date_invoiced
       }
     }
   `);
 
-  const handleUpdate = async (values) => {
+  const [markJobExported] = useMutation(gql`
+    mutation MARK_JOB_AS_EXPORTED($jobId: uuid!, $date_exported: timestamptz!) {
+      update_jobs_by_pk(
+        pk_columns: { id: $jobId }
+        _set: { date_exported: $date_exported
+        status: "${bodyshop.md_ro_statuses.default_exported}"
+        }
+      ) {
+        id
+        date_exported
+        date_invoiced
+        status
+      }
+    }
+  `);
+  const [markJobUninvoiced] = useMutation(gql`
+    mutation MARK_JOB_AS_UNINVOICED($jobId: uuid!, ) {
+      update_jobs_by_pk(
+        pk_columns: { id: $jobId }
+        _set: { date_exported: null
+          date_invoiced: null
+        status: "${bodyshop.md_ro_statuses.default_delivered}"
+        }
+      ) {
+        id
+        date_exported
+        date_invoiced
+        status
+      }
+    }
+  `);
+
+  const handleMarkForExport = async () => {
     setLoading(true);
-    const result = await updateJob({
+    const result = await markJobForReexport({
+      variables: { jobId: job.id },
+    });
+
+    if (!result.errors) {
+      notification["success"]({ message: t("jobs.successes.save") });
+    } else {
+      notification["error"]({
+        message: t("jobs.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setLoading(false);
+  };
+
+  const handleMarkExported = async () => {
+    setLoading(true);
+    const result = await markJobExported({
+      variables: { jobId: job.id, date_exported: moment() },
+    });
+
+    if (!result.errors) {
+      notification["success"]({ message: t("jobs.successes.save") });
+    } else {
+      notification["error"]({
+        message: t("jobs.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setLoading(false);
+  };
+
+  const handleUninvoice = async () => {
+    setLoading(true);
+    const result = await markJobUninvoiced({
       variables: { jobId: job.id },
     });
 
@@ -51,16 +122,31 @@ export function JobAdminMarkReexport({ bodyshop, job }) {
       });
     }
     setLoading(false);
-    //Get the owner details, populate it all back into the job.
   };
 
   return (
-    <Button
-      loading={loading}
-      disabled={!job.date_exported}
-      onClick={handleUpdate}
-    >
-      {t("jobs.labels.markforreexport")}
-    </Button>
+    <>
+      <Button
+        loading={loading}
+        disabled={!job.date_exported}
+        onClick={handleMarkForExport}
+      >
+        {t("jobs.labels.markforreexport")}
+      </Button>
+      <Button
+        loading={loading}
+        disabled={job.date_exported}
+        onClick={handleMarkExported}
+      >
+        {t("jobs.actions.markasexported")}
+      </Button>
+      <Button
+        loading={loading}
+        disabled={!job.date_invoiced || job.date_exported}
+        onClick={handleUninvoice}
+      >
+        {t("jobs.actions.uninvoice")}
+      </Button>
+    </>
   );
 }

client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js

@@ -11,6 +11,7 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
     query: GET_ALL_JOBLINES_BY_PK,
     variables: { id: jobId },
   });
+
   const existingLines = _.cloneDeep(existingLinesFromDb);
   const linesToInsert = [];
   const linesToUpdate = [];
@@ -19,11 +20,14 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
     const matchingIndex = existingLines.findIndex(
       (eL) => eL.unq_seq === newLine.unq_seq
     );
+
+    //Should do a check to make sure there is only 1 matching unq sequence number.
+
     if (matchingIndex >= 0) {
       //Found a relevant matching line. Add it to lines to update.
       linesToUpdate.push({
         id: existingLines[matchingIndex].id,
-        newData: newLine,
+        newData: { ...newLine, removed: false },
       });
 
       //Splice out item we found for performance.

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

@@ -57,7 +57,7 @@ export function JobsAvailableComponent({
       title: t("jobs.fields.cieca_id"),
       dataIndex: "cieca_id",
       key: "cieca_id",
-      sorter: (a, b) => alphaSort(a, b),
+      sorter: (a, b) => alphaSort(a.cieca_id, b.cieca_id),
       sortOrder:
         state.sortedInfo.columnKey === "cieca_id" && state.sortedInfo.order,
     },
@@ -68,9 +68,10 @@ export function JobsAvailableComponent({
       //width: "8%",
       // onFilter: (value, record) => record.ro_number.includes(value),
       // filteredValue: state.filteredInfo.text || null,
-      sorter: (a, b) => alphaSort(a, b),
+      sorter: (a, b) =>
+        alphaSort(a.job && a.job.ro_number, b.job && b.job.ro_number),
       sortOrder:
-        state.sortedInfo.columnKey === "cieca_id" && state.sortedInfo.order,
+        state.sortedInfo.columnKey === "job_id" && state.sortedInfo.order,
       render: (text, record) =>
         record.job ? (
           <Link to={`/manage/jobs/${record.job.id}`}>
@@ -87,7 +88,7 @@ export function JobsAvailableComponent({
       dataIndex: "ownr_name",
       key: "ownr_name",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      sorter: (a, b) => alphaSort(a.ownr_name, b.ownr_name),
       sortOrder:
         state.sortedInfo.columnKey === "ownr_name" && state.sortedInfo.order,
     },

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

@@ -25,10 +25,12 @@ import {
 import { INSERT_NEW_JOB, UPDATE_JOB } from "../../graphql/jobs.queries";
 import { INSERT_NEW_NOTE } from "../../graphql/notes.queries";
 import { SEARCH_VEHICLE_BY_VIN } from "../../graphql/vehicles.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import AlertComponent from "../alert/alert.component";
 import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component";
 import JobsFindModalContainer from "../jobs-find-modal/jobs-find-modal.container";
@@ -42,8 +44,15 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
 });
-
-export function JobsAvailableContainer({ bodyshop, currentUser }) {
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+export function JobsAvailableContainer({
+  bodyshop,
+  currentUser,
+  insertAuditTrail,
+}) {
   const { loading, error, data, refetch } = useQuery(QUERY_AVAILABLE_JOBS, {
     fetchPolicy: "network-only",
   });
@@ -66,7 +75,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
   const client = useApolloClient();
 
   const estDataLazyLoad = useLazyQuery(QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK);
-  const [loadEstData, estData] = estDataLazyLoad;
+  const [loadEstData, estDataRaw] = estDataLazyLoad;
 
   const importOptionsState = useState({ overrideHeaders: false });
   const importOptions = importOptionsState[0];
@@ -79,13 +88,9 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
     setOwnerModalVisible(false);
     setInsertLoading(true);
 
-    if (
-      !(
-        estData.data &&
-        estData.data.available_jobs_by_pk &&
-        estData.data.available_jobs_by_pk.est_data
-      )
-    ) {
+    const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
+
+    if (!(estData && estData.est_data)) {
       //We don't have the right data. Error!
       setInsertLoading(false);
       notification["error"]({
@@ -97,28 +102,25 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
     const newTotals = (
       await Axios.post("/job/totals", {
         job: {
-          ...estData.data.available_jobs_by_pk.est_data,
-          joblines: estData.data.available_jobs_by_pk.est_data.joblines.data,
+          ...estData.est_data,
+          joblines: estData.est_data.joblines.data,
         },
       })
     ).data;
 
     let existingVehicles;
-    if (
-      estData.data.available_jobs_by_pk.est_data.vehicle &&
-      estData.data.available_jobs_by_pk.est_data.vin
-    ) {
+    if (estData.est_data.vehicle && estData.est_data.vin) {
       //There's vehicle data, need to double check the VIN.
       existingVehicles = await client.query({
         query: SEARCH_VEHICLE_BY_VIN,
         variables: {
-          vin: estData.data.available_jobs_by_pk.est_data.vehicle.data.v_vin,
+          vin: estData.est_data.vehicle.data.v_vin,
         },
       });
     }
 
     const newJob = {
-      ...estData.data.available_jobs_by_pk.est_data,
+      ...estData.est_data,
       clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
       owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
       job_totals: newTotals,
@@ -157,8 +159,13 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
         });
         //Job has been inserted. Clean up the available jobs record.
 
+        insertAuditTrail({
+          jobid: r.data.insert_jobs.returning[0].id,
+          operation: AuditTrailMapping.jobimported(),
+        });
+
         deleteJob({
-          variables: { id: estData.data.available_jobs_by_pk.id },
+          variables: { id: estData.id },
         }).then((r) => {
           refetch();
           setInsertLoading(false);
@@ -180,14 +187,8 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
 
     setJobModalVisible(false);
     setInsertLoading(true);
-
-    if (
-      !(
-        estData.data &&
-        estData.data.available_jobs_by_pk &&
-        estData.data.available_jobs_by_pk.est_data
-      )
-    ) {
+    const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
+    if (!(estData && estData.est_data)) {
       //We don't have the right data. Error!
       setInsertLoading(false);
       notification["error"]({
@@ -195,18 +196,19 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
       });
     } else {
       //create upsert job
-      let supp = _.cloneDeep(estData.data.available_jobs_by_pk.est_data);
+      let supp = _.cloneDeep(estData.est_data);
 
       delete supp.owner;
       delete supp.vehicle;
-      if (importOptions.overrideHeaders) {
+      delete supp.ins_co_nm;
+      if (!importOptions.overrideHeaders) {
         HeaderFields.forEach((item) => delete supp[item]);
       }
 
       let suppDelta = await GetSupplementDelta(
         client,
         selectedJob,
-        estData.data.available_jobs_by_pk.est_data.joblines.data
+        estData.est_data.joblines.data
       );
 
       delete supp.joblines;
@@ -265,7 +267,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
       //Job has been inserted. Clean up the available jobs record.
 
       deleteJob({
-        variables: { id: estData.data.available_jobs_by_pk.id },
+        variables: { id: estData.id },
       }).then((r) => {
         refetch();
         setInsertLoading(false);
@@ -283,17 +285,21 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
           ],
         },
       });
+      insertAuditTrail({
+        jobid: selectedJob,
+        operation: AuditTrailMapping.jobsupplement(),
+      });
     }
   };
 
   const owner =
-    estData.data &&
-    estData.data.available_jobs_by_pk &&
-    estData.data.available_jobs_by_pk.est_data &&
-    estData.data.available_jobs_by_pk.est_data.owner &&
-    estData.data.available_jobs_by_pk.est_data.owner.data &&
-    !estData.data.available_jobs_by_pk.issupplement
-      ? estData.data.available_jobs_by_pk.est_data.owner.data
+    estDataRaw.data &&
+    estDataRaw.data.available_jobs_by_pk &&
+    estDataRaw.data.available_jobs_by_pk.est_data &&
+    estDataRaw.data.available_jobs_by_pk.est_data.owner &&
+    estDataRaw.data.available_jobs_by_pk.est_data.owner.data &&
+    !estDataRaw.data.available_jobs_by_pk.issupplement
+      ? estDataRaw.data.available_jobs_by_pk.est_data.owner.data
       : null;
 
   const onOwnerModalCancel = () => {
@@ -331,8 +337,8 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
       message={t("jobs.labels.creating_new_job")}
     >
       <OwnerFindModalContainer
-        loading={estData.loading}
-        error={estData.error}
+        loading={estDataRaw.loading}
+        error={estDataRaw.error}
         owner={owner}
         selectedOwner={selectedOwner}
         setSelectedOwner={setSelectedOwner}
@@ -341,8 +347,8 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
         onCancel={onOwnerModalCancel}
       />
       <JobsFindModalContainer
-        loading={estData.loading}
-        error={estData.error}
+        loading={estDataRaw.loading}
+        error={estDataRaw.error}
         selectedJob={selectedJob}
         setSelectedJob={setSelectedJob}
         importOptionsState={importOptionsState}
@@ -368,4 +374,16 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
     </LoadingSpinner>
   );
 }
-export default connect(mapStateToProps, null)(JobsAvailableContainer);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsAvailableContainer);
+
+function replaceEmpty(someObj, replaceValue = null) {
+  const replacer = (key, value) => (value === "" ? replaceValue : value);
+  //^ because you seem to want to replace (strings) "null" or "undefined" too
+  console.log(someObj);
+  const temp = JSON.stringify(someObj, replacer);
+  console.log(`temp`, temp);
+  return JSON.parse(temp);
+}

client/src/components/jobs-change-status/jobs-change-status.component.jsx

@@ -6,18 +6,21 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   jobRO: selectJobReadOnly,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
-export function JobsChangeStatus({ job, bodyshop, jobRO }) {
+export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
   const { t } = useTranslation();
 
   const [availableStatuses, setAvailableStatuses] = useState([]);
@@ -29,6 +32,10 @@ export function JobsChangeStatus({ job, bodyshop, jobRO }) {
     })
       .then((r) => {
         notification["success"]({ message: t("jobs.successes.save") });
+        insertAuditTrail({
+          jobid: job.id,
+          operation: AuditTrailMapping.jobstatuschange(status),
+        });
         // refetch();
       })
       .catch((error) => {

client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx

@@ -1,4 +1,4 @@
-import { Button } from "antd";
+import { Button, Dropdown, Menu } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -12,11 +12,8 @@ const mapStateToProps = createStructuredSelector({
 
 export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
   const { t } = useTranslation();
-  const handleAllocate = () => {
-    logImEXEvent("jobs_close_allocate_auto");
-
-    const { defaults } = bodyshop.md_responsibility_centers;
 
+  const handleAllocate = (defaults) => {
     form.setFieldsValue({
       joblines: joblines.map((jl) => {
         const ret = _.cloneDeep(jl);
@@ -32,7 +29,7 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
         }
         //Verify that this is also manually updated in server/job-costing
         if (!jl.part_type && !jl.mod_lbr_ty) {
-          const lineDesc = jl.line_desc.toLowerCase();
+          const lineDesc = jl.line_desc ? jl.line_desc.toLowerCase() : "";
           if (lineDesc.includes("shop materials")) {
             ret.profitcenter_part = defaults.profits["MASH"];
           } else if (lineDesc.includes("paint/materials")) {
@@ -48,8 +45,36 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
     });
   };
 
-  return (
-    <Button onClick={handleAllocate} disabled={disabled}>
+  const handleAutoAllocateClick = () => {
+    logImEXEvent("jobs_close_allocate_auto");
+
+    const { defaults } = bodyshop.md_responsibility_centers;
+    handleAllocate(defaults);
+  };
+
+  const handleMenuClick = ({ item, key, keyPath, domEvent }) => {
+    logImEXEvent("jobs_close_allocate_auto_dms");
+    handleAllocate(
+      bodyshop.md_responsibility_centers.dms_defaults.find(
+        (x) => x.name === key
+      )
+    );
+  };
+
+  const overlay = bodyshop.cdk_dealerid && (
+    <Menu onClick={handleMenuClick}>
+      {bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => (
+        <Menu.Item key={mapping.name}>{mapping.name}</Menu.Item>
+      ))}
+    </Menu>
+  );
+
+  return bodyshop.cdk_dealerid ? (
+    <Dropdown overlay={overlay}>
+      <Button disabled={disabled}>{t("jobs.actions.dmsautoallocate")}</Button>
+    </Dropdown>
+  ) : (
+    <Button onClick={handleAutoAllocateClick} disabled={disabled}>
       {t("jobs.actions.autoallocate")}
     </Button>
   );

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

@@ -24,6 +24,7 @@ export function JobsCloseExportButton({
   currentUser,
   jobId,
   disabled,
+  setSelectedJobs,
 }) {
   const { t } = useTranslation();
   const [updateJob] = useMutation(UPDATE_JOB);
@@ -147,6 +148,11 @@ export function JobsCloseExportButton({
           }),
         });
       }
+      if (setSelectedJobs) {
+        setSelectedJobs((selectedJobs) => {
+          return selectedJobs.filter((i) => i !== jobId);
+        });
+      }
     }
 
     setLoading(false);

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

@@ -13,8 +13,10 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { CONVERT_JOB_TO_RO } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -22,10 +24,17 @@ const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
-export function JobsConvertButton({ bodyshop, job, refetch, jobRO }) {
+export function JobsConvertButton({
+  bodyshop,
+  job,
+  refetch,
+  jobRO,
+  insertAuditTrail,
+}) {
   const [visible, setVisible] = useState(false);
   const [loading, setLoading] = useState(false);
   const [mutationConvertJob] = useMutation(CONVERT_JOB_TO_RO);
@@ -43,6 +52,14 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO }) {
       notification["success"]({
         message: t("jobs.successes.converted"),
       });
+
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.jobconverted(
+          res.data.update_jobs.returning[0].ro_number
+        ),
+      });
+
       setVisible(false);
     }
     setLoading(false);

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

@@ -11,7 +11,8 @@ import FormItemPhone, {
   PhoneItemFormatterValidation,
 } from "../form-items-formatted/phone-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
-import { JobsDetailRatesParts } from "../jobs-detail-rates/jobs-detail-rates.parts.component";
+import JobsDetailRatesParts from "../jobs-detail-rates/jobs-detail-rates.parts.component";
+import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -187,7 +188,7 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
           header={t("menus.jobsdetail.financials")}
         >
           <JobsDetailRatesChangeButton form={form} />
-
+          <JobsMarkPstExempt form={form} />
           <LayoutFormRow>
             <Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
               <CurrencyInput />

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.addtoproduction.util.jsx

@@ -1,7 +1,10 @@
 import { notification } from "antd";
 import i18n from "i18next";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import { store } from "../../redux/store";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 export default function AddToProduction(
   apolloClient,
@@ -21,6 +24,13 @@ export default function AddToProduction(
       notification["success"]({
         message: i18n.t("jobs.successes.save"),
       });
+
+      store.dispatch(
+        insertAuditTrail({
+          jobid: jobId,
+          operation: AuditTrailMapping.jobinproductionchange(!remove),
+        })
+      );
       if (completionCallback) completionCallback();
     })
     .catch((error) => {

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

@@ -17,6 +17,7 @@ import {
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import JobsDetaiLheaderCsi from "./jobs-detail-header-actions.csi.component";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
+import JobsDetailHeaderActionsExportcustdataComponent from "./jobs-detail-header-actions.exportcustdata.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -141,7 +142,10 @@ export function JobsDetailHeaderActions({
       </Menu.Item>
       <Menu.Item
         key="entertimetickets"
-        disabled={!job.converted}
+        disabled={
+          !job.converted ||
+          (!bodyshop.tt_allow_post_to_invoiced && job.date_invoiced)
+        }
         onClick={() => {
           logImEXEvent("job_header_enter_time_ticekts");
 
@@ -180,7 +184,7 @@ export function JobsDetailHeaderActions({
       {job.inproduction ? (
         <Menu.Item
           key="addtoproduction"
-          disabled={!!!job.converted || jobRO}
+          disabled={!job.converted}
           onClick={() => AddToProduction(client, job.id, refetch, true)}
         >
           {t("jobs.actions.removefromproduction")}
@@ -188,7 +192,7 @@ export function JobsDetailHeaderActions({
       ) : (
         <Menu.Item
           key="addtoproduction"
-          disabled={!!!job.converted || !!job.inproduction || jobRO}
+          disabled={!job.converted}
           onClick={() => AddToProduction(client, job.id, refetch)}
         >
           {t("jobs.actions.addtoproduction")}
@@ -316,6 +320,7 @@ export function JobsDetailHeaderActions({
           {t("menus.jobsactions.admin")}
         </Link>
       </Menu.Item>
+      <JobsDetailHeaderActionsExportcustdataComponent job={job} />
       <JobsDetaiLheaderCsi job={job} />
       <Menu.Item
         key="jobcosting"

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

@@ -19,6 +19,7 @@ import {
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser'
@@ -179,6 +180,8 @@ export function JobsDetailHeaderCsi({
     }
   };
 
+  if (!HasFeatureAccess({ featureName: "csi", bodyshop })) return <></>;
+
   return (
     <Menu.SubMenu
       key="sendcsi"

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

@@ -0,0 +1,107 @@
+import { Menu, notification } from "antd";
+import axios from "axios";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { auth, logImEXEvent } from "../../firebase/firebase.utils";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({});
+
+export function JobsDetailHeaderActionexportCustomerData({
+  bodyshop,
+  job,
+  ...props
+}) {
+  const { t } = useTranslation();
+
+  const handleExportCustData = async (e) => {
+    logImEXEvent("job_export_cust_data");
+    let QbXmlResponse;
+    try {
+      QbXmlResponse = await axios.post(
+        "/accounting/qbxml/receivables",
+        { jobIds: [job.id], custDataOnly: true },
+        {
+          headers: {
+            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
+          },
+        }
+      );
+      console.log("handle -> XML", QbXmlResponse);
+    } catch (error) {
+      console.log("Error getting QBXML from Server.", error);
+      notification["error"]({
+        message: t("jobs.errors.exporting", {
+          error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
+        }),
+      });
+
+      return;
+    }
+
+    let PartnerResponse;
+    try {
+      PartnerResponse = await axios.post(
+        "http://localhost:1337/qb/",
+        QbXmlResponse.data,
+        {
+          headers: {
+            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
+          },
+        }
+      );
+    } catch (error) {
+      console.log("Error connecting to quickbooks or partner.", error);
+      notification["error"]({
+        message: t("jobs.errors.exporting-partner"),
+      });
+
+      return;
+    }
+    //Check to see if any of them failed. If they didn't don't execute the update.
+    const failedTransactions = PartnerResponse.data.filter((r) => !r.success);
+    if (failedTransactions.length > 0) {
+      //Uh oh. At least one was no good.
+      failedTransactions.forEach((ft) => {
+        //insert failed export log
+        notification.open({
+          // key: "failedexports",
+          type: "error",
+          message: t("jobs.errors.exporting", {
+            error: ft.errorMessage || "",
+          }),
+        });
+      });
+
+      //Handle Failures.
+    } else {
+      //Insert success export log.
+
+      notification.open({
+        type: "success",
+        key: "jobsuccessexport",
+        message: t("jobs.successes.exported"),
+      });
+    }
+  };
+
+  return (
+    <Menu.Item
+      {...props}
+      onClick={handleExportCustData}
+      key="exportcustdata"
+      disabled={!job.converted}
+    >
+      {t("jobs.actions.exportcustdata")}
+    </Menu.Item>
+  );
+}
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsDetailHeaderActionexportCustomerData);

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

@@ -1,4 +1,13 @@
-import { Form, Input, InputNumber, Select, Space, Switch, Tooltip } from "antd";
+import {
+  Divider,
+  Form,
+  Input,
+  InputNumber,
+  Select,
+  Space,
+  Switch,
+  Tooltip,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -7,6 +16,7 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
 import CABCpvrtCalculator from "../ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
+import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
 import FormRow from "../layout-form-row/layout-form-row.component";
 import JobsDetailRatesParts from "./jobs-detail-rates.parts.component";
 
@@ -103,8 +113,19 @@ export function JobsDetailRates({ jobRO, form, job }) {
           <Switch disabled={jobRO} />
         </Form.Item>
       </FormRow>
-      <JobsDetailRatesChangeButton form={form} disabled={jobRO} />
-      <FormRow header={t("jobs.forms.laborrates")}>
+      <Divider
+        orientation="left"
+        type="horizontal"
+        style={{ marginTop: ".8rem", float: "right" }}
+      >
+        {t("jobs.forms.laborrates")}
+      </Divider>
+      <Space>
+        <div></div>
+        <JobsDetailRatesChangeButton form={form} disabled={jobRO} />
+        <JobsMarkPstExempt form={form} />
+      </Space>
+      <FormRow noDivider>
         <Form.Item
           label={t("jobs.fields.labor_rate_desc")}
           name="labor_rate_desc"
@@ -180,7 +201,6 @@ export function JobsDetailRates({ jobRO, form, job }) {
           <CurrencyInput disabled={jobRO} />
         </Form.Item>
       </FormRow>
-
       <JobsDetailRatesParts form={form} />
     </div>
   );

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

@@ -19,7 +19,11 @@ export function JobsDetailRatesParts({
 
   return (
     <Collapse defaultActiveKey={expanded && "rates"}>
-      <Collapse.Panel header={t("jobs.labels.parts_tax_rates")} key="rates">
+      <Collapse.Panel
+        forceRender
+        header={t("jobs.labels.parts_tax_rates")}
+        key="rates"
+      >
         <LayoutFormRow header={t("joblines.fields.part_types.PAA")}>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_discp")}

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

@@ -50,8 +50,8 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       width: "25%",
       //sortOrder: sortcolumn === "ownr_ln" && sortorder,
       render: (text, record) => {
-        return record.owner ? (
-          <Link to={"/manage/owners/" + record.owner.id}>
+        return record.ownerid ? (
+          <Link to={"/manage/owners/" + record.ownerid}>
             {`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
               record.ownr_co_nm || ""
             }`}

client/src/components/jobs-mark-pst-exempt/jobs-mark-pst-exempt.component.jsx

@@ -0,0 +1,55 @@
+import { Popconfirm, Button } from "antd";
+import React from "react";
+import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import _ from "lodash";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly,
+});
+
+export function JobsMarkPstExempt({ jobRO, form }) {
+  const { t } = useTranslation();
+
+  const handleConfirm = () => {
+    const newPartRates = _.cloneDeep(form.getFieldValue("parts_tax_rates"));
+
+    Object.keys(newPartRates).forEach((key) => {
+      newPartRates[key] = {
+        ...newPartRates[key],
+        prt_tax_in: false,
+        prt_tax_rt: 0,
+      };
+    });
+
+    form.setFieldsValue({
+      state_tax_rate: 0,
+      tax_lbr_rt: 0,
+      tax_levies_rt: 0,
+      tax_sub_rt: 0,
+      tax_shop_mat_rt: 0,
+      tax_paint_mat_rt: 0,
+      tax_str_rt: 0,
+      tax_tow_rt: 0,
+      parts_tax_rates: newPartRates,
+    });
+  };
+
+  return (
+    <Popconfirm
+      onConfirm={handleConfirm}
+      disabled={jobRO}
+      okText={t("general.labels.yes")}
+      cancelText={t("general.labels.no")}
+      title={t("jobs.actions.markpstexemptconfirm")}
+    >
+      <Button type="link" disabled={jobRO}>
+        {t("jobs.actions.markpstexempt")}
+      </Button>
+    </Popconfirm>
+  );
+}
+export default connect(mapStateToProps, null)(JobsMarkPstExempt);

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

@@ -10,7 +10,7 @@ import { alphaSort } from "../../utils/sorters";
 import LaborAllocationsAdjustmentEdit from "../labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component";
 import "./labor-allocations-table.styles.scss";
 import { CalculateAllocationsTotals } from "./labor-allocations-table.utility";
-
+import _ from "lodash";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   technician: selectTechnician,
@@ -113,7 +113,7 @@ export function LaborAllocationsTable({
             color: record.difference >= 0 ? "green" : "red",
           }}
         >
-          {record.difference}
+          {_.round(record.difference, 1)}
         </strong>
       ),
     },

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

@@ -31,11 +31,14 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       title: t("jobs.fields.vehicle"),
       dataIndex: "vehicleid",
       key: "vehicleid",
-      render: (text, record) => (
-        <Link to={`/manage/vehicles/${record.vehicleid}`}>
-          {`${record.v_model_yr} ${record.v_make_desc} ${record.v_model_desc}`}
-        </Link>
-      ),
+      render: (text, record) =>
+        record.vehicleid ? (
+          <Link to={`/manage/vehicles/${record.vehicleid}`}>
+            {`${record.v_model_yr} ${record.v_make_desc} ${record.v_model_desc}`}
+          </Link>
+        ) : (
+          t("jobs.errors.novehicle")
+        ),
     },
     {
       title: t("jobs.fields.clm_no"),

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

@@ -90,7 +90,11 @@ export function PartsOrderListTableComponent({
         </Button>
       )}
       <Button
-        disabled={jobRO || record.return}
+        disabled={
+          jobRO ||
+          record.return ||
+          record.vendor.id === bodyshop.inhousevendorid
+        }
         onClick={() => {
           logImEXEvent("parts_order_receive_bill");
           setPartsReceiveContext({
@@ -139,7 +143,10 @@ export function PartsOrderListTableComponent({
         </Button>
       </Popconfirm>
       <Button
-        disabled={jobRO ? !record.return : jobRO}
+        disabled={
+          (jobRO ? !record.return : jobRO) ||
+          record.vendor.id === bodyshop.inhousevendorid
+        }
         onClick={() => {
           logImEXEvent("parts_order_receive_bill");
 
@@ -157,7 +164,7 @@ export function PartsOrderListTableComponent({
                     quantity: pol.quantity,
 
                     actual_price: pol.act_price,
-                    cost_center: pol.jobline.part_type
+                    cost_center: pol.jobline?.part_type
                       ? responsibilityCenters.defaults.costs[
                           pol.jobline.part_type
                         ] || null

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -9,6 +9,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB_LINE_STATUS } from "../../graphql/jobs-lines.queries";
 import { INSERT_NEW_PARTS_ORDERS } from "../../graphql/parts-orders.queries";
 import { QUERY_ALL_VENDORS_FOR_ORDER } from "../../graphql/vendors.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { setEmailOptions } from "../../redux/email/email.actions";
 import {
   setModalContext,
@@ -19,6 +20,7 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import AlertComponent from "../alert/alert.component";
@@ -36,6 +38,8 @@ const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("partsOrder")),
   setBillEnterContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "billEnter" })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function PartsOrderModalContainer({
@@ -45,6 +49,7 @@ export function PartsOrderModalContainer({
   bodyshop,
   setEmailOptions,
   setBillEnterContext,
+  insertAuditTrail,
 }) {
   const { t } = useTranslation();
 
@@ -101,12 +106,26 @@ export function PartsOrderModalContainer({
 
     const jobLinesResult = await updateJobLines({
       variables: {
-        ids: values.parts_order_lines.data.map((item) => item.job_line_id),
+        ids: values.parts_order_lines.data
+          .filter((item) => item.job_line_id)
+          .map((item) => item.job_line_id),
         status: isReturn
           ? bodyshop.md_order_statuses.default_returned || "Returned*"
           : bodyshop.md_order_statuses.default_ordered || "Ordered*",
       },
     });
+
+    insertAuditTrail({
+      jobid: jobId,
+      operation: isReturn
+        ? AuditTrailMapping.jobspartsreturn(
+            insertResult.data.insert_parts_orders.returning[0].order_number
+          )
+        : AuditTrailMapping.jobspartsorder(
+            insertResult.data.insert_parts_orders.returning[0].order_number
+          ),
+    });
+
     if (!!jobLinesResult.errors) {
       notification["error"]({
         message: t("parts_orders.errors.creating"),

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

@@ -25,6 +25,7 @@ export function PayableExportButton({
   billId,
   disabled,
   loadingCallback,
+  setSelectedBills,
 }) {
   const { t } = useTranslation();
   const [updateBill] = useMutation(UPDATE_BILLS);
@@ -142,6 +143,11 @@ export function PayableExportButton({
           }),
         });
       }
+      if (setSelectedBills) {
+        setSelectedBills((selectedBills) => {
+          return selectedBills.filter((i) => i !== billId);
+        });
+      }
     }
 
     if (!!loadingCallback) loadingCallback(false);

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

@@ -24,6 +24,7 @@ export function PaymentExportButton({
   paymentId,
   disabled,
   loadingCallback,
+  setSelectedPayments,
 }) {
   const { t } = useTranslation();
   const [updatePayment] = useMutation(UPDATE_PAYMENTS);
@@ -141,6 +142,12 @@ export function PaymentExportButton({
           }),
         });
       }
+
+      if (setSelectedPayments) {
+        setSelectedPayments((selectedBills) => {
+          return selectedBills.filter((i) => i !== paymentId);
+        });
+      }
     }
 
     if (!!loadingCallback) loadingCallback(false);

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

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

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

@@ -26,7 +26,9 @@ export function PrintCenterJobsComponent({ printCenterModal }) {
 
   const filteredJobsReportsList =
     search !== ""
-      ? JobsReportsList.filter((r) => r.title.toLowerCase().includes(search))
+      ? JobsReportsList.filter((r) =>
+          r.title.toLowerCase().includes(search.toLowerCase())
+        )
       : JobsReportsList;
 
   //Group it, create cards, and then filter out.

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

@@ -14,12 +14,25 @@ import IndefiniteLoading from "../indefinite-loading/indefinite-loading.componen
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import ProductionBoardFilters from "../production-board-filters/production-board-filters.component";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   technician: selectTechnician,
 });
 
-export function ProductionBoardKanbanComponent({ data, bodyshop, technician }) {
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+
+export function ProductionBoardKanbanComponent({
+  data,
+  bodyshop,
+  technician,
+  insertAuditTrail,
+}) {
   const [boardLanes, setBoardLanes] = useState({
     columns: [{ id: "Loading...", title: "Loading...", cards: [] }],
   });
@@ -104,6 +117,11 @@ export function ProductionBoardKanbanComponent({ data, bodyshop, technician }) {
         newChildCardNewParent
       ),
     });
+    insertAuditTrail({
+      jobid: card.id,
+      operation: AuditTrailMapping.jobstatuschange(destination.toColumnId),
+    });
+
     if (update.errors) {
       notification["error"]({
         message: t("production.errors.boardupdate", {
@@ -130,4 +148,7 @@ export function ProductionBoardKanbanComponent({ data, bodyshop, technician }) {
     </div>
   );
 }
-export default connect(mapStateToProps, null)(ProductionBoardKanbanComponent);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ProductionBoardKanbanComponent);

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

@@ -16,24 +16,32 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const iconStyle = { marginLeft: ".3rem" };
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
-export function ProductionListEmpAssignment({ bodyshop, record, type }) {
+export function ProductionListEmpAssignment({
+  insertAuditTrail,
+  bodyshop,
+  record,
+  type,
+}) {
   const { t } = useTranslation();
   const [updateJob] = useMutation(UPDATE_JOB);
   const [loading, setLoading] = useState(false);
 
   const handleAdd = async (assignment) => {
     setLoading(true);
-    const { operation, employeeid } = assignment;
+    const { operation, employeeid, name } = assignment;
     logImEXEvent("job_assign_employee", { operation });
 
     let empAssignment = determineFieldName(operation);
@@ -44,6 +52,11 @@ export function ProductionListEmpAssignment({ bodyshop, record, type }) {
       awaitRefetchQueries: true,
     });
 
+    insertAuditTrail({
+      jobid: record.id,
+      operation: AuditTrailMapping.jobassignmentchange(empAssignment, name),
+    });
+
     if (!!result.errors) {
       notification["error"]({
         message: t("jobs.errors.assigning", {
@@ -64,6 +77,11 @@ export function ProductionListEmpAssignment({ bodyshop, record, type }) {
       awaitRefetchQueries: true,
     });
 
+    insertAuditTrail({
+      jobid: record.id,
+      operation: AuditTrailMapping.jobassignmentremoved(empAssignment),
+    });
+
     if (!!result.errors) {
       notification["error"]({
         message: t("jobs.errors.assigning", {
@@ -80,8 +98,8 @@ export function ProductionListEmpAssignment({ bodyshop, record, type }) {
   });
 
   const [visibility, setVisibility] = useState(false);
-  const onChange = (e) => {
-    setAssignment({ ...assignment, employeeid: e });
+  const onChange = (e, option) => {
+    setAssignment({ ...assignment, employeeid: e, name: option.name });
   };
 
   const popContent = (
@@ -99,7 +117,11 @@ export function ProductionListEmpAssignment({ bodyshop, record, type }) {
           }
         >
           {bodyshop.employees.map((emp) => (
-            <Select.Option value={emp.id} key={emp.id}>
+            <Select.Option
+              value={emp.id}
+              key={emp.id}
+              name={`${emp.first_name} ${emp.last_name}`}
+            >
               {`${emp.first_name} ${emp.last_name}`}
             </Select.Option>
           ))}

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

@@ -6,12 +6,21 @@ import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
-
-export function ProductionListColumnStatus({ record, bodyshop }) {
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+export function ProductionListColumnStatus({
+  record,
+  bodyshop,
+  insertAuditTrail,
+}) {
   const [updateJob] = useMutation(UPDATE_JOB);
   const [loading, setLoading] = useState(false);
 
@@ -28,6 +37,11 @@ export function ProductionListColumnStatus({ record, bodyshop }) {
         },
       },
     });
+    insertAuditTrail({
+      jobid: record.id,
+      operation: AuditTrailMapping.jobstatuschange(key),
+    });
+
     setLoading(false);
   };
 
@@ -52,4 +66,7 @@ export function ProductionListColumnStatus({ record, bodyshop }) {
     </Dropdown>
   );
 }
-export default connect(mapStateToProps, null)(ProductionListColumnStatus);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ProductionListColumnStatus);

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

@@ -0,0 +1,42 @@
+import { Button, Dropdown, Menu } from "antd";
+import React, { useState } from "react";
+import { TemplateList } from "../../utils/TemplateConstants";
+import { useTranslation } from "react-i18next";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+
+const ProdTemplates = TemplateList("production");
+
+export default function ProductionListPrint() {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+  return (
+    <Dropdown
+      trigger="click"
+      overlay={
+        <Menu>
+          {Object.keys(ProdTemplates).map((key) => (
+            <Menu.Item
+              key={key}
+              onClick={async () => {
+                setLoading(true);
+                await GenerateDocument(
+                  {
+                    name: ProdTemplates[key].key,
+                    // variables: { id: contract.id },
+                  },
+                  {},
+                  "p"
+                );
+                setLoading(false);
+              }}
+            >
+              {ProdTemplates[key].title}
+            </Menu.Item>
+          ))}
+        </Menu>
+      }
+    >
+      <Button loading={loading}>{t("general.labels.print")}</Button>
+    </Dropdown>
+  );
+}

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

@@ -25,6 +25,7 @@ export function ProductionListTable({
   currentUser,
   state,
   setColumns,
+  setState,
 }) {
   const { t } = useTranslation();
   const [updateDefaultProdView] = useMutation(UPDATE_ACTIVE_PROD_LIST_VIEW);
@@ -43,6 +44,10 @@ export function ProductionListTable({
           };
         })
     );
+    setState(
+      bodyshop.production_config.filter((pc) => pc.name === value)[0].columns
+        .tableState
+    );
 
     const assoc = bodyshop.associations.find(
       (a) => a.useremail === currentUser.email
@@ -77,6 +82,8 @@ export function ProductionListTable({
         };
       })
     );
+
+    setState(bodyshop.production_config[0].columns.tableState);
   };
 
   return (

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

@@ -13,6 +13,7 @@ import ProductionListColumnsAdd from "../production-list-columns/production-list
 import ProductionListColumns from "../production-list-columns/production-list-columns.data";
 import ProductionListDetail from "../production-list-detail/production-list-detail.component";
 import ProductionListSaveConfigButton from "../production-list-save-config-button/production-list-save-config-button.component";
+import ProductionListPrint from "./production-list-print.component";
 import ProductionListTableViewSelect from "./production-list-table-view-select.component";
 import ResizeableTitle from "./production-list-table.resizeable.component";
 
@@ -40,9 +41,9 @@ export function ProductionListTable({
 
   const [state, setState] = useState(
     (bodyshop.production_config &&
-      bodyshop.production_config.find((p) => p.name === defaultView)
-        ?.tableState) ||
-      bodyshop.production_config[0]?.tableState || {
+      bodyshop.production_config.find((p) => p.name === defaultView)?.columns
+        .tableState) ||
+      bodyshop.production_config[0]?.columns.tableState || {
         sortedInfo: {},
         filteredInfo: { text: "" },
       }
@@ -88,14 +89,16 @@ export function ProductionListTable({
     setColumns(columns.filter((i) => i.key !== key));
   };
 
-  const handleResize = (index) => (e, { size }) => {
-    const nextColumns = [...columns];
-    nextColumns[index] = {
-      ...nextColumns[index],
-      width: size.width,
+  const handleResize =
+    (index) =>
+    (e, { size }) => {
+      const nextColumns = [...columns];
+      nextColumns[index] = {
+        ...nextColumns[index],
+        width: size.width,
+      };
+      setColumns(nextColumns);
     };
-    setColumns(nextColumns);
-  };
 
   const headerItem = (col) => (
     <Dropdown
@@ -170,6 +173,7 @@ export function ProductionListTable({
 
             <ProductionListTableViewSelect
               state={state}
+              setState={setState}
               setColumns={setColumns}
             />
 
@@ -178,6 +182,7 @@ export function ProductionListTable({
               placeholder={t("general.labels.search")}
               value={searchText}
             />
+            <ProductionListPrint />
           </Space>
         }
       />

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

@@ -1,11 +1,16 @@
-import { Button, Form, Input } from "antd";
+import { Button, Form, Input, notification } from "antd";
+import { LockOutlined } from "@ant-design/icons";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { updateUserDetails } from "../../redux/user/user.actions";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
-import { logImEXEvent } from "../../firebase/firebase.utils";
+import {
+  logImEXEvent,
+  updateCurrentPassword,
+} from "../../firebase/firebase.utils";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -28,33 +33,96 @@ export default connect(
     });
   };
 
+  const handleChangePassword = async ({ password }) => {
+    logImEXEvent("password_update");
+    try {
+      await updateCurrentPassword(password);
+      notification.success({
+        message: t("user.successess.passwordchanged"),
+      });
+    } catch (error) {
+      notification.error({
+        message: error.message,
+      });
+    }
+  };
+
   return (
     <div>
       <Form
         onFinish={handleFinish}
         autoComplete={"no"}
         initialValues={currentUser}
+        layout="vertical"
       >
-        <Form.Item
-          label={t("user.fields.displayname")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name="displayName"
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item label={t("user.fields.photourl")} name="photoURL">
-          <Input />
-        </Form.Item>
+        <LayoutFormRow>
+          <Form.Item
+            label={t("user.fields.displayname")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name="displayName"
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item label={t("user.fields.photourl")} name="photoURL">
+            <Input />
+          </Form.Item>
+        </LayoutFormRow>
 
         <Button type="primary" key="submit" htmlType="submit">
           {t("user.actions.updateprofile")}
         </Button>
       </Form>
+      <Form
+        onFinish={handleChangePassword}
+        autoComplete={"no"}
+        initialValues={currentUser}
+        layout="vertical"
+      >
+        <LayoutFormRow>
+          <Form.Item label={t("general.labels.newpassword")} name="password">
+            <Input
+              prefix={<LockOutlined />}
+              type="password"
+              placeholder={t("general.labels.password")}
+            />
+          </Form.Item>
+          <Form.Item
+            label={t("general.labels.confirmpassword")}
+            name="password-confirm"
+            dependencies={["password"]}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+              ({ getFieldValue }) => ({
+                validator(rule, value) {
+                  if (!value || getFieldValue("password") === value) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(
+                    t("general.labels.passwordsdonotmatch")
+                  );
+                },
+              }),
+            ]}
+          >
+            <Input
+              prefix={<LockOutlined />}
+              type="password"
+              placeholder={t("general.labels.password")}
+            />
+          </Form.Item>
+        </LayoutFormRow>
+        <Button type="primary" key="submit" htmlType="submit">
+          {t("user.actions.changepassword")}
+        </Button>
+      </Form>
     </div>
   );
 });

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

@@ -1,5 +1,5 @@
 import { useLazyQuery } from "@apollo/client";
-import { Button, DatePicker, Form, Radio } from "antd";
+import { Button, DatePicker, Form, Radio, Space } from "antd";
 import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -13,6 +13,7 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
+import "./report-center-modal.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
   reportCenterModal: selectReportCenter,
@@ -60,8 +61,12 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
       {
         name: values.key,
         variables: {
-          ...(start ? { start: moment(start).format("YYYY-MM-DD") } : {}),
-          ...(end ? { end: moment(end).format("YYYY-MM-DD") } : {}),
+          ...(start
+            ? { start: moment(start).startOf("day").format("YYYY-MM-DD") }
+            : {}),
+          ...(end
+            ? { end: moment(end).endOf("day").format("YYYY-MM-DD") }
+            : {}),
           ...(id ? { id: id } : {}),
         },
       },
@@ -86,6 +91,7 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
         <Form.Item
           name="key"
           label={t("reportcenter.labels.key")}
+          //  className="radio-group-columns"
           rules={[
             {
               required: true,
@@ -93,12 +99,21 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
             },
           ]}
         >
-          <Radio.Group style={{ columns: "3 auto" }}>
-            {Object.keys(Templates).map((key) => (
-              <Radio key={key} value={key}>
-                {Templates[key].title}
-              </Radio>
-            ))}
+          <Radio.Group>
+            <Space
+              direction="vertical"
+              wrap
+              size="small"
+              style={{
+                maxHeight: "50vh",
+              }}
+            >
+              {Object.keys(Templates).map((key) => (
+                <Radio key={key} value={key}>
+                  {Templates[key].title}
+                </Radio>
+              ))}
+            </Space>
           </Radio.Group>
         </Form.Item>
         <Form.Item dependencies={["key"]}>

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

@@ -31,7 +31,7 @@ export function ReportCenterModalContainer({
       onCancel={() => toggleModalVisible()}
       cancelButtonProps={{ style: { display: "none" } }}
       destroyOnClose
-      width="60%"
+      width="80%"
     >
       <ReportCenterModalComponent />
     </Modal>

client/src/components/report-center-modal/report-center-modal.styles.scss

@@ -0,0 +1,11 @@
+.radio-group-columns {
+  .ant-radio-group {
+    // display: block;
+  }
+  .ant-radio-wrapper {
+    display: block;
+    span {
+      word-wrap: break-word;
+    }
+  }
+}

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

@@ -9,6 +9,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import Event from "../job-at-change/schedule-event.container";
 import HeaderComponent from "./schedule-calendar-header.component";
 import "./schedule-calendar.styles.scss";
+import JobDetailCards from "../job-detail-cards/job-detail-cards.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -45,45 +46,48 @@ export function ScheduleCalendarWrapperComponent({
   const selectedDate = new Date(date || moment(search.date) || Date.now());
 
   return (
-    <Calendar
-      events={data}
-      defaultView={search.view || defaultView || "week"}
-      date={selectedDate}
-      onNavigate={(date, view, action) => {
-        search.date = date.toISOString().substr(0, 10);
-        history.push({ search: queryString.stringify(search) });
-      }}
-      onRangeChange={(start, end) => {
-        if (setDateRangeCallback) setDateRangeCallback({ start, end });
-      }}
-      onView={(view) => {
-        search.view = view;
-        history.push({ search: queryString.stringify(search) });
-      }}
-      step={15}
-      // timeslots={1}
-      showMultiDayTimes
-      localizer={localizer}
-      min={
-        bodyshop.schedule_start_time
-          ? new Date(bodyshop.schedule_start_time)
-          : new Date("2020-01-01T06:00:00")
-      }
-      max={
-        bodyshop.schedule_end_time
-          ? new Date(bodyshop.schedule_end_time)
-          : new Date("2020-01-01T20:00:00")
-      }
-      eventPropGetter={handleEventPropStyles}
-      components={{
-        event: (e) =>
-          Event({ bodyshop: bodyshop, event: e.event, refetch: refetch }),
-        header: (p) => (
-          <HeaderComponent {...p} events={data} refetch={refetch} />
-        ),
-      }}
-      {...otherProps}
-    />
+    <>
+      <JobDetailCards />
+      <Calendar
+        events={data}
+        defaultView={search.view || defaultView || "week"}
+        date={selectedDate}
+        onNavigate={(date, view, action) => {
+          search.date = date.toISOString().substr(0, 10);
+          history.push({ search: queryString.stringify(search) });
+        }}
+        onRangeChange={(start, end) => {
+          if (setDateRangeCallback) setDateRangeCallback({ start, end });
+        }}
+        onView={(view) => {
+          search.view = view;
+          history.push({ search: queryString.stringify(search) });
+        }}
+        step={15}
+        // timeslots={1}
+        showMultiDayTimes
+        localizer={localizer}
+        min={
+          bodyshop.schedule_start_time
+            ? new Date(bodyshop.schedule_start_time)
+            : new Date("2020-01-01T06:00:00")
+        }
+        max={
+          bodyshop.schedule_end_time
+            ? new Date(bodyshop.schedule_end_time)
+            : new Date("2020-01-01T20:00:00")
+        }
+        eventPropGetter={handleEventPropStyles}
+        components={{
+          event: (e) =>
+            Event({ bodyshop: bodyshop, event: e.event, refetch: refetch }),
+          header: (p) => (
+            <HeaderComponent {...p} events={data} refetch={refetch} />
+          ),
+        }}
+        {...otherProps}
+      />
+    </>
   );
 }
 

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

@@ -9,6 +9,7 @@ export default function ScheduleCalendarComponent({ data, refetch }) {
   return (
     <Row gutter={[16, 16]}>
       <ScheduleModal />
+
       <Col span={24}>
         <PageHeader
           extra={

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

@@ -1,4 +1,14 @@
-import { Button, Card, Col, Form, Row, Select, Switch } from "antd";
+import {
+  Button,
+  Col,
+  Form,
+  Input,
+  Row,
+  Select,
+  Space,
+  Switch,
+  Typography,
+} from "antd";
 import axios from "axios";
 import moment from "moment";
 import React, { useState } from "react";
@@ -12,7 +22,7 @@ import EmailInput from "../form-items-formatted/email-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import ScheduleDayViewContainer from "../schedule-day-view/schedule-day-view.container";
 import ScheduleExistingAppointmentsList from "../schedule-existing-appointments-list/schedule-existing-appointments-list.component";
-
+import "./schedule-job-modal.scss";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -91,31 +101,34 @@ export function ScheduleJobModalComponent({
             <DateTimePicker onlyFuture />
           </Form.Item>
         </LayoutFormRow>
-        <Card title={t("appointments.labels.smartscheduling")}>
+
+        <Typography.Title level={4}>
+          {t("appointments.labels.smartscheduling")}
+        </Typography.Title>
+
+        {
+          // smartOptions.length > 0 && (
+          // <div>{t("appointments.labels.suggesteddates")}</div>
+          // )
+        }
+        <Space wrap>
           <Button onClick={handleSmartScheduling} loading={loading}>
             {t("appointments.actions.calculate")}
           </Button>
-          {smartOptions.length > 0 && (
-            <div>{t("appointments.labels.suggesteddates")}</div>
-          )}
-          <div
-            className="imex-flex-row imex-flex-row__flex-space-around"
-            style={{ flexWrap: "wrap" }}
-          >
-            {smartOptions.map((d, idx) => (
-              <Button
-                className="imex-flex-row__margin"
-                key={idx}
-                onClick={() => {
-                  form.setFieldsValue({ start: new moment(d).add(8, "hours") });
-                  handleDateBlur();
-                }}
-              >
-                <DateFormatter>{d}</DateFormatter>
-              </Button>
-            ))}
-          </div>
-        </Card>
+          {smartOptions.map((d, idx) => (
+            <Button
+              className="imex-flex-row__margin"
+              key={idx}
+              onClick={() => {
+                form.setFieldsValue({ start: new moment(d).add(8, "hours") });
+                handleDateBlur();
+              }}
+            >
+              <DateFormatter>{d}</DateFormatter>
+            </Button>
+          ))}
+        </Space>
+
         <LayoutFormRow grow>
           <Form.Item
             name="notifyCustomer"
@@ -124,12 +137,9 @@ export function ScheduleJobModalComponent({
           >
             <Switch />
           </Form.Item>
-          <Form.Item shouldUpdate>
-            {() => (
-              <Form.Item name="email" label={t("jobs.fields.ownr_ea")}>
-                <EmailInput disabled={!form.getFieldValue("notifyCustomer")} />
-              </Form.Item>
-            )}
+
+          <Form.Item name="email" label={t("jobs.fields.ownr_ea")}>
+            <EmailInput disabled={!form.getFieldValue("notifyCustomer")} />
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow grow>
@@ -158,6 +168,9 @@ export function ScheduleJobModalComponent({
                 ))}
             </Select>
           </Form.Item>
+          <Form.Item name={"note"} label={t("appointments.fields.note")}>
+            <Input />
+          </Form.Item>
         </LayoutFormRow>
         {t("appointments.labels.history")}
         <ScheduleExistingAppointmentsList
@@ -170,7 +183,7 @@ export function ScheduleJobModalComponent({
             const values = form.getFieldsValue();
 
             return (
-              <div style={{ height: "70vh" }}>
+              <div className="schedule-job-modal">
                 <ScheduleDayViewContainer day={values.start} />
               </div>
             );

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

@@ -105,6 +105,7 @@ export function ScheduleJobModalContainer({
           start: moment(values.start),
           end: moment(values.start).add(bodyshop.appt_length || 60, "minutes"),
           color: values.color,
+          note:values.note
         },
         jobId: jobId,
         altTransport: values.alt_transport,

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

@@ -0,0 +1,10 @@
+.schedule-job-modal {
+  height: 70vh;
+  .rbc-calendar {
+    .rbc-toolbar {
+      .rbc-btn-group {
+        display: none;
+      }
+    }
+  }
+}