Add create user.

Updated task scheduler.

Approved-by: Patrick Fic

README.MD

@@ -10,7 +10,7 @@ npx hasura migrate apply --endpoint https://db.imex.online/ --admin-secret 'Prod
 npx hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret 'Test-ImEXOnlineBySnaptSoftware!'
 
 NGROK TEsting:
-./ngrok.exe http http://localhost:5000 -host-header="localhost:5000"
+./ngrok.exe http http://localhost:4000 -host-header="localhost:4000"
 
 Finding deadfiles - run from client directory
 npx deadfile ./src/index.js --exclude build templates

client/cypress/fixtures/users.json

@@ -1,232 +1 @@
-[
-  {
-    "id": 1,
-    "name": "Leanne Graham",
-    "username": "Bret",
-    "email": "Sincere@april.biz",
-    "address": {
-      "street": "Kulas Light",
-      "suite": "Apt. 556",
-      "city": "Gwenborough",
-      "zipcode": "92998-3874",
-      "geo": {
-        "lat": "-37.3159",
-        "lng": "81.1496"
-      }
-    },
-    "phone": "1-770-736-8031 x56442",
-    "website": "hildegard.org",
-    "company": {
-      "name": "Romaguera-Crona",
-      "catchPhrase": "Multi-layered client-server neural-net",
-      "bs": "harness real-time e-markets"
-    }
-  },
-  {
-    "id": 2,
-    "name": "Ervin Howell",
-    "username": "Antonette",
-    "email": "Shanna@melissa.tv",
-    "address": {
-      "street": "Victor Plains",
-      "suite": "Suite 879",
-      "city": "Wisokyburgh",
-      "zipcode": "90566-7771",
-      "geo": {
-        "lat": "-43.9509",
-        "lng": "-34.4618"
-      }
-    },
-    "phone": "010-692-6593 x09125",
-    "website": "anastasia.net",
-    "company": {
-      "name": "Deckow-Crist",
-      "catchPhrase": "Proactive didactic contingency",
-      "bs": "synergize scalable supply-chains"
-    }
-  },
-  {
-    "id": 3,
-    "name": "Clementine Bauch",
-    "username": "Samantha",
-    "email": "Nathan@yesenia.net",
-    "address": {
-      "street": "Douglas Extension",
-      "suite": "Suite 847",
-      "city": "McKenziehaven",
-      "zipcode": "59590-4157",
-      "geo": {
-        "lat": "-68.6102",
-        "lng": "-47.0653"
-      }
-    },
-    "phone": "1-463-123-4447",
-    "website": "ramiro.info",
-    "company": {
-      "name": "Romaguera-Jacobson",
-      "catchPhrase": "Face to face bifurcated interface",
-      "bs": "e-enable strategic applications"
-    }
-  },
-  {
-    "id": 4,
-    "name": "Patricia Lebsack",
-    "username": "Karianne",
-    "email": "Julianne.OConner@kory.org",
-    "address": {
-      "street": "Hoeger Mall",
-      "suite": "Apt. 692",
-      "city": "South Elvis",
-      "zipcode": "53919-4257",
-      "geo": {
-        "lat": "29.4572",
-        "lng": "-164.2990"
-      }
-    },
-    "phone": "493-170-9623 x156",
-    "website": "kale.biz",
-    "company": {
-      "name": "Robel-Corkery",
-      "catchPhrase": "Multi-tiered zero tolerance productivity",
-      "bs": "transition cutting-edge web services"
-    }
-  },
-  {
-    "id": 5,
-    "name": "Chelsey Dietrich",
-    "username": "Kamren",
-    "email": "Lucio_Hettinger@annie.ca",
-    "address": {
-      "street": "Skiles Walks",
-      "suite": "Suite 351",
-      "city": "Roscoeview",
-      "zipcode": "33263",
-      "geo": {
-        "lat": "-31.8129",
-        "lng": "62.5342"
-      }
-    },
-    "phone": "(254)954-1289",
-    "website": "demarco.info",
-    "company": {
-      "name": "Keebler LLC",
-      "catchPhrase": "User-centric fault-tolerant solution",
-      "bs": "revolutionize end-to-end systems"
-    }
-  },
-  {
-    "id": 6,
-    "name": "Mrs. Dennis Schulist",
-    "username": "Leopoldo_Corkery",
-    "email": "Karley_Dach@jasper.info",
-    "address": {
-      "street": "Norberto Crossing",
-      "suite": "Apt. 950",
-      "city": "South Christy",
-      "zipcode": "23505-1337",
-      "geo": {
-        "lat": "-71.4197",
-        "lng": "71.7478"
-      }
-    },
-    "phone": "1-477-935-8478 x6430",
-    "website": "ola.org",
-    "company": {
-      "name": "Considine-Lockman",
-      "catchPhrase": "Synchronised bottom-line interface",
-      "bs": "e-enable innovative applications"
-    }
-  },
-  {
-    "id": 7,
-    "name": "Kurtis Weissnat",
-    "username": "Elwyn.Skiles",
-    "email": "Telly.Hoeger@billy.biz",
-    "address": {
-      "street": "Rex Trail",
-      "suite": "Suite 280",
-      "city": "Howemouth",
-      "zipcode": "58804-1099",
-      "geo": {
-        "lat": "24.8918",
-        "lng": "21.8984"
-      }
-    },
-    "phone": "210.067.6132",
-    "website": "elvis.io",
-    "company": {
-      "name": "Johns Group",
-      "catchPhrase": "Configurable multimedia task-force",
-      "bs": "generate enterprise e-tailers"
-    }
-  },
-  {
-    "id": 8,
-    "name": "Nicholas Runolfsdottir V",
-    "username": "Maxime_Nienow",
-    "email": "Sherwood@rosamond.me",
-    "address": {
-      "street": "Ellsworth Summit",
-      "suite": "Suite 729",
-      "city": "Aliyaview",
-      "zipcode": "45169",
-      "geo": {
-        "lat": "-14.3990",
-        "lng": "-120.7677"
-      }
-    },
-    "phone": "586.493.6943 x140",
-    "website": "jacynthe.com",
-    "company": {
-      "name": "Abernathy Group",
-      "catchPhrase": "Implemented secondary concept",
-      "bs": "e-enable extensible e-tailers"
-    }
-  },
-  {
-    "id": 9,
-    "name": "Glenna Reichert",
-    "username": "Delphine",
-    "email": "Chaim_McDermott@dana.io",
-    "address": {
-      "street": "Dayna Park",
-      "suite": "Suite 449",
-      "city": "Bartholomebury",
-      "zipcode": "76495-3109",
-      "geo": {
-        "lat": "24.6463",
-        "lng": "-168.8889"
-      }
-    },
-    "phone": "(775)976-6794 x41206",
-    "website": "conrad.com",
-    "company": {
-      "name": "Yost and Sons",
-      "catchPhrase": "Switchable contextually-based project",
-      "bs": "aggregate real-time technologies"
-    }
-  },
-  {
-    "id": 10,
-    "name": "Clementina DuBuque",
-    "username": "Moriah.Stanton",
-    "email": "Rey.Padberg@karina.biz",
-    "address": {
-      "street": "Kattie Turnpike",
-      "suite": "Suite 198",
-      "city": "Lebsackbury",
-      "zipcode": "31428-2261",
-      "geo": {
-        "lat": "-38.2386",
-        "lng": "57.2232"
-      }
-    },
-    "phone": "024-648-3804",
-    "website": "ambrose.net",
-    "company": {
-      "name": "Hoeger LLC",
-      "catchPhrase": "Centralized empowering task-force",
-      "bs": "target end-to-end models"
-    }
-  }
-]
+[]

client/package.json

@@ -33,6 +33,7 @@
     "logrocket": "^2.1.2",
     "markerjs2": "^2.17.2",
     "moment-business-days": "^1.2.0",
+    "moment-timezone": "^0.5.34",
     "phone": "^3.1.10",
     "preval.macro": "^5.0.0",
     "prop-types": "^15.7.2",
@@ -111,11 +112,15 @@
       "last 1 safari version"
     ]
   },
+  "resolutions": {
+    "react-error-overlay": "6.0.9"
+  },
   "devDependencies": {
     "@sentry/webpack-plugin": "^1.18.3",
     "@testing-library/cypress": "^8.0.2",
     "cypress": "^9.1.1",
     "eslint-plugin-cypress": "^2.12.1",
+    "react-error-overlay": "6.0.9",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.2"
   }

client/src/App/App.container.jsx

@@ -2,7 +2,6 @@ import { ApolloProvider } from "@apollo/client";
 import { SplitFactory, SplitSdk } from "@splitsoftware/splitio-react";
 import { ConfigProvider } from "antd";
 import enLocale from "antd/es/locale/en_US";
-import LogRocket from "logrocket";
 import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -10,13 +9,8 @@ import GlobalLoadingBar from "../components/global-loading-bar/global-loading-ba
 import client from "../utils/GraphQLClient";
 import App from "./App";
 
-
 moment.locale("en-US");
 
-
-//tracker.start();
-if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");
-
 export const factory = SplitSdk({
   core: {
     authorizationKey: process.env.REACT_APP_SPLIT_API,

client/src/App/App.jsx

@@ -1,4 +1,6 @@
+import { useTreatments } from "@splitsoftware/splitio-react";
 import { Button, Result } from "antd";
+import LogRocket from "logrocket";
 import React, { lazy, Suspense, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -9,15 +11,18 @@ import ErrorBoundary from "../components/error-boundary/error-boundary.component
 //Component Imports
 import LoadingSpinner from "../components/loading-spinner/loading-spinner.component";
 import DisclaimerPage from "../pages/disclaimer/disclaimer.page";
+import LandingPage from "../pages/landing/landing.page";
 import TechPageContainer from "../pages/tech/tech.page.container";
 import { setOnline } from "../redux/application/application.actions";
 import { selectOnline } from "../redux/application/application.selectors";
 import { checkUserSession } from "../redux/user/user.actions";
-import { selectCurrentUser } from "../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../redux/user/user.selectors";
 import PrivateRoute from "../utils/private-route";
 import "./App.styles.scss";
 
-import LandingPage from "../pages/landing/landing.page";
 const ResetPassword = lazy(() =>
   import("../pages/reset-password/reset-password.component")
 );
@@ -32,13 +37,26 @@ const MobilePaymentContainer = lazy(() =>
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
   online: selectOnline,
+  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
   checkUserSession: () => dispatch(checkUserSession()),
   setOnline: (isOnline) => dispatch(setOnline(isOnline)),
 });
 
-export function App({ checkUserSession, currentUser, online, setOnline }) {
+export function App({
+  bodyshop,
+  checkUserSession,
+  currentUser,
+  online,
+  setOnline,
+}) {
+  const { LogRocket_Tracking } = useTreatments(
+    ["LogRocket_Tracking"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
+
   useEffect(() => {
     if (!navigator.onLine) {
       setOnline(false);
@@ -59,6 +77,16 @@ export function App({ checkUserSession, currentUser, online, setOnline }) {
   window.addEventListener("online", function (e) {
     setOnline(true);
   });
+  useEffect(() => {
+    if (currentUser.authorized) {
+      if (
+        process.env.NODE_ENV === "production" &&
+        LogRocket_Tracking.treatment === "on"
+      ) {
+        LogRocket.init("gvfvfw/bodyshopapp");
+      }
+    }
+  }, [currentUser.authorized, LogRocket_Tracking.treatment]);
 
   if (currentUser.authorized === null) {
     return <LoadingSpinner message={t("general.labels.loggingin")} />;

client/src/App/App.styles.scss

@@ -91,13 +91,13 @@
   color: blue;
 }
 
-.production-completion-1 {
-  animation: production-completion-1-blinker 5s linear infinite;
+.production-completion-soon {
+  color: rgba(255, 140, 0, 0.8);
+  font-weight: bold;
 }
-@keyframes production-completion-1-blinker {
-  50% {
-    background: rgba(207, 12, 12, 0.555);
-  }
+.production-completion-past {
+  color: rgba(255, 0, 0, 0.8);
+  font-weight: bold;
 }
 
 .react-resizable {

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

@@ -28,6 +28,7 @@ import { createStructuredSelector } from "reselect";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import BillMarkExportedButton from "../bill-mark-exported-button/bill-mark-exported-button.component";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -107,7 +108,7 @@ export function BillDetailEditcontainer({
     );
 
     billlines.forEach((billline) => {
-      const { deductedfromlbr, ...il } = billline;
+      const { deductedfromlbr, jobline, ...il } = billline;
       delete il.__typename;
 
       if (il.id) {
@@ -206,6 +207,8 @@ export function BillDetailEditcontainer({
                             cost: i.actual_cost,
                             quantity: i.quantity,
                             joblineid: i.joblineid,
+                            oem_partno: i.jobline && i.jobline.oem_partno,
+                            part_type: i.jobline && i.jobline.part_type,
                           };
                         }),
                         isReturn: true,
@@ -234,6 +237,7 @@ export function BillDetailEditcontainer({
                   </Button>
                 </Popconfirm>
                 <BillReeportButtonComponent bill={data && data.bills_by_pk} />
+                <BillMarkExportedButton bill={data && data.bills_by_pk} />
               </Space>
             }
           />

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

@@ -93,6 +93,7 @@ function BillEnterModalContainer({
                     deductedfromlbr,
                     lbr_adjustment,
                     location: lineLocation,
+                    part_type,
                     ...restI
                   } = i;
 
@@ -216,7 +217,11 @@ function BillEnterModalContainer({
 
     if (enterAgain) {
       form.resetFields();
-      form.setFieldsValue({ ...form.getFieldsValue(), billlines: [] });
+      form.resetFields();
+      form.setFieldsValue({
+        ...formValues,
+        billlines: [],
+      });
     } else {
       toggleModalVisible();
     }
@@ -245,7 +250,7 @@ function BillEnterModalContainer({
   return (
     <Modal
       title={t("bills.labels.new")}
-      width={"90%"}
+      width={"98%"}
       visible={billEnterModal.visible}
       okText={t("general.actions.save")}
       keyboard="false"

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

@@ -0,0 +1,135 @@
+import { Form, Input, Table } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { alphaSort } from "../../utils/sorters";
+import BillFormItemsExtendedFormItem from "./bill-form-lines.extended.formitem.component";
+export default function BillFormLinesExtended({
+  lineData,
+  discount,
+  form,
+  responsibilityCenters,
+  disabled,
+}) {
+  const [search, setSearch] = useState("");
+  const { t } = useTranslation();
+  const columns = [
+    {
+      title: t("joblines.fields.line_desc"),
+      dataIndex: "line_desc",
+      key: "line_desc",
+      width: "10%",
+      sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
+    },
+    {
+      title: t("joblines.fields.oem_partno"),
+      dataIndex: "oem_partno",
+      key: "oem_partno",
+      width: "10%",
+      sorter: (a, b) => alphaSort(a.oem_partno, b.oem_partno),
+    },
+    {
+      title: t("joblines.fields.part_type"),
+      dataIndex: "part_type",
+      key: "part_type",
+      width: "10%",
+      filters: [
+        {
+          text: t("jobs.labels.partsfilter"),
+          value: ["PAN", "PAP", "PAL", "PAA", "PAS", "PASL"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAN"),
+          value: ["PAN", "PAP"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAL"),
+          value: ["PAL"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAA"),
+          value: ["PAA"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAS"),
+          value: ["PAS", "PASL"],
+        },
+      ],
+      onFilter: (value, record) => value.includes(record.part_type),
+      render: (text, record) =>
+        record.part_type
+          ? t(`joblines.fields.part_types.${record.part_type}`)
+          : null,
+    },
+
+    {
+      title: t("joblines.fields.act_price"),
+      dataIndex: "act_price",
+      key: "act_price",
+      width: "10%",
+      sorter: (a, b) => a.act_price - b.act_price,
+      shouldCellUpdate: false,
+      render: (text, record) => (
+        <>
+          <CurrencyFormatter>
+            {record.db_ref === "900510" || record.db_ref === "900511"
+              ? record.prt_dsmk_m
+              : record.act_price}
+          </CurrencyFormatter>
+          {record.part_qty ? `(x ${record.part_qty})` : null}
+          {record.prt_dsmk_p && record.prt_dsmk_p !== 0 ? (
+            <span
+              style={{ marginLeft: ".2rem" }}
+            >{`(${record.prt_dsmk_p}%)`}</span>
+          ) : (
+            <></>
+          )}
+        </>
+      ),
+    },
+    {
+      title: t("billlines.fields.posting"),
+      dataIndex: "posting",
+      key: "posting",
+
+      render: (text, record, index) => (
+        <Form.Item noStyle name={["billlineskeys", record.id]}>
+          <BillFormItemsExtendedFormItem
+            form={form}
+            record={record}
+            index={index}
+            responsibilityCenters={responsibilityCenters}
+            discount={discount}
+          />
+        </Form.Item>
+      ),
+    },
+  ];
+
+  const data =
+    search === ""
+      ? lineData
+      : lineData.filter(
+          (l) =>
+            (l.line_desc &&
+              l.line_desc.toLowerCase().includes(search.toLowerCase())) ||
+            (l.oem_partno &&
+              l.oem_partno.toLowerCase().includes(search.toLowerCase())) ||
+            (l.act_price &&
+              l.act_price.toString().startsWith(search.toString()))
+        );
+
+  return (
+    <Form.Item noStyle name="billlineskeys">
+      <button onClick={() => console.log(form.getFieldsValue())}>form</button>
+      <Input onChange={(e) => setSearch(e.target.value)} allowClear />
+      <Table
+        pagination={false}
+        size="small"
+        columns={columns}
+        rowKey="id"
+        dataSource={data}
+      />
+    </Form.Item>
+  );
+}

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

@@ -0,0 +1,288 @@
+import React from "react";
+import {
+  PlusCircleFilled,
+  MinusCircleFilled,
+  WarningOutlined,
+} from "@ant-design/icons";
+import { Form, Button, InputNumber, Input, Select, Switch, Space } from "antd";
+import { useTranslation } from "react-i18next";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import CurrencyInput from "../form-items-formatted/currency-form-item.component";
+import CiecaSelect from "../../utils/Ciecaselect";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(BillFormItemsExtendedFormItem);
+
+export function BillFormItemsExtendedFormItem({
+  value,
+  bodyshop,
+  form,
+  record,
+  index,
+  disabled,
+  responsibilityCenters,
+  discount,
+}) {
+  // const { billlineskeys } = form.getFieldsValue("billlineskeys");
+
+  const { t } = useTranslation();
+  if (!value)
+    return (
+      <Button
+        onClick={() => {
+          const values = form.getFieldsValue("billlineskeys");
+
+          form.setFieldsValue({
+            ...values,
+            billlineskeys: {
+              ...(values.billlineskeys || {}),
+              [record.id]: {
+                joblineid: record.id,
+                line_desc: record.line_desc,
+                quantity: record.part_qty || 1,
+                actual_price: record.act_price,
+                cost_center: record.part_type
+                  ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
+                    ? record.part_type
+                    : responsibilityCenters.defaults &&
+                      (responsibilityCenters.defaults.costs[record.part_type] ||
+                        null)
+                  : null,
+              },
+            },
+          });
+        }}
+      >
+        <PlusCircleFilled />
+      </Button>
+    );
+
+  return (
+    <Space wrap>
+      <Form.Item
+        label={t("billlines.fields.line_desc")}
+        name={["billlineskeys", record.id, "line_desc"]}
+      >
+        <Input disabled={disabled} />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.quantity")}
+        name={["billlineskeys", record.id, "quantity"]}
+      >
+        <InputNumber precision={0} min={0} disabled={disabled} />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.actual_price")}
+        name={["billlineskeys", record.id, "actual_price"]}
+      >
+        <CurrencyInput
+          min={0}
+          disabled={disabled}
+          onBlur={(e) => {
+            const { billlineskeys } = form.getFieldsValue("billlineskeys");
+            form.setFieldsValue({
+              billlineskeys: {
+                ...billlineskeys,
+                [record.id]: {
+                  ...billlineskeys[billlineskeys],
+                  actual_cost: !!billlineskeys[billlineskeys].actual_cost
+                    ? billlineskeys[billlineskeys].actual_cost
+                    : Math.round(
+                        (parseFloat(e.target.value) * (1 - discount) +
+                          Number.EPSILON) *
+                          100
+                      ) / 100,
+                },
+              },
+            });
+          }}
+        />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.actual_cost")}
+        name={["billlineskeys", record.id, "actual_cost"]}
+      >
+        <CurrencyInput min={0} disabled={disabled} />
+      </Form.Item>
+      <Form.Item shouldUpdate>
+        {() => {
+          const line = value;
+          if (!!!line) return null;
+          const lineDiscount = (
+            1 -
+            Math.round((line.actual_cost / line.actual_price) * 100) / 100
+          ).toPrecision(2);
+
+          if (lineDiscount - discount === 0) return <div />;
+          return <WarningOutlined style={{ color: "red" }} />;
+        }}
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.cost_center")}
+        name={["billlineskeys", record.id, "cost_center"]}
+      >
+        <Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
+          {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+            ? CiecaSelect(true, false)
+            : responsibilityCenters.costs.map((item) => (
+                <Select.Option key={item.name}>{item.name}</Select.Option>
+              ))}
+        </Select>
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.location")}
+        name={["billlineskeys", record.id, "location"]}
+      >
+        <Select disabled={disabled}>
+          {bodyshop.md_parts_locations.map((loc, idx) => (
+            <Select.Option key={idx} value={loc}>
+              {loc}
+            </Select.Option>
+          ))}
+        </Select>
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.deductedfromlbr")}
+        name={["billlineskeys", record.id, "deductedfromlbr"]}
+        valuePropName="checked"
+      >
+        <Switch disabled={disabled} />
+      </Form.Item>
+      <Form.Item shouldUpdate style={{ display: "inline-block" }}>
+        {() => {
+          if (
+            form.getFieldsValue("billlineskeys").billlineskeys[record.id]
+              .deductedfromlbr
+          )
+            return (
+              <div>
+                <Form.Item
+                  label={t("joblines.fields.mod_lbr_ty")}
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                  name={[
+                    "billlineskeys",
+                    record.id,
+                    "lbr_adjustment",
+                    "mod_lbr_ty",
+                  ]}
+                >
+                  <Select allowClear>
+                    <Select.Option value="LAA">
+                      {t("joblines.fields.lbr_types.LAA")}
+                    </Select.Option>
+                    <Select.Option value="LAB">
+                      {t("joblines.fields.lbr_types.LAB")}
+                    </Select.Option>
+                    <Select.Option value="LAD">
+                      {t("joblines.fields.lbr_types.LAD")}
+                    </Select.Option>
+                    <Select.Option value="LAE">
+                      {t("joblines.fields.lbr_types.LAE")}
+                    </Select.Option>
+                    <Select.Option value="LAF">
+                      {t("joblines.fields.lbr_types.LAF")}
+                    </Select.Option>
+                    <Select.Option value="LAG">
+                      {t("joblines.fields.lbr_types.LAG")}
+                    </Select.Option>
+                    <Select.Option value="LAM">
+                      {t("joblines.fields.lbr_types.LAM")}
+                    </Select.Option>
+                    <Select.Option value="LAR">
+                      {t("joblines.fields.lbr_types.LAR")}
+                    </Select.Option>
+                    <Select.Option value="LAS">
+                      {t("joblines.fields.lbr_types.LAS")}
+                    </Select.Option>
+                    <Select.Option value="LAU">
+                      {t("joblines.fields.lbr_types.LAU")}
+                    </Select.Option>
+                    <Select.Option value="LA1">
+                      {t("joblines.fields.lbr_types.LA1")}
+                    </Select.Option>
+                    <Select.Option value="LA2">
+                      {t("joblines.fields.lbr_types.LA2")}
+                    </Select.Option>
+                    <Select.Option value="LA3">
+                      {t("joblines.fields.lbr_types.LA3")}
+                    </Select.Option>
+                    <Select.Option value="LA4">
+                      {t("joblines.fields.lbr_types.LA4")}
+                    </Select.Option>
+                  </Select>
+                </Form.Item>
+                <Form.Item
+                  label={t("jobs.labels.adjustmentrate")}
+                  name={["billlineskeys", record.id, "lbr_adjustment", "rate"]}
+                  initialValue={bodyshop.default_adjustment_rate}
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <InputNumber precision={2} min={0.01} />
+                </Form.Item>
+              </div>
+            );
+          return <></>;
+        }}
+      </Form.Item>
+
+      <Form.Item
+        label={t("billlines.fields.federal_tax_applicable")}
+        name={["billlineskeys", record.id, "applicable_taxes", "federal"]}
+        valuePropName="checked"
+      >
+        <Switch disabled={disabled} />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.state_tax_applicable")}
+        name={["billlineskeys", record.id, "applicable_taxes", "state"]}
+        valuePropName="checked"
+      >
+        <Switch disabled={disabled} />
+      </Form.Item>
+      <Form.Item
+        label={t("billlines.fields.local_tax_applicable")}
+        name={["billlineskeys", record.id, "applicable_taxes", "local"]}
+        valuePropName="checked"
+      >
+        <Switch disabled={disabled} />
+      </Form.Item>
+
+      <Button
+        onClick={() => {
+          const values = form.getFieldsValue("billlineskeys");
+
+          form.setFieldsValue({
+            ...values,
+            billlineskeys: {
+              ...(values.billlineskeys || {}),
+              [record.id]: null,
+            },
+          });
+        }}
+      >
+        <MinusCircleFilled />
+      </Button>
+    </Space>
+  );
+}

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

@@ -28,6 +28,8 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import BillFormLines from "./bill-form.lines.component";
 import { CalculateBillTotal } from "./bill-form.totals.utility";
+import { useTreatments } from "@splitsoftware/splitio-react";
+import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -49,7 +51,11 @@ export function BillFormComponent({
   const { t } = useTranslation();
   const client = useApolloClient();
   const [discount, setDiscount] = useState(0);
-
+  const { Extended_Bill_Posting } = useTreatments(
+    ["Extended_Bill_Posting"],
+    {},
+    bodyshop.imexshopid
+  );
   const handleVendorSelect = (props, opt) => {
     setDiscount(opt.discount);
   };
@@ -357,13 +363,24 @@ export function BillFormComponent({
         </Form.Item>
       </LayoutFormRow>
       <Divider orientation="left">{t("bills.labels.bill_lines")}</Divider>
-      <BillFormLines
-        lineData={lineData}
-        discount={discount}
-        form={form}
-        responsibilityCenters={responsibilityCenters}
-        disabled={disabled}
-      />
+
+      {Extended_Bill_Posting.treatment === "on" ? (
+        <BillFormLinesExtended
+          lineData={lineData}
+          discount={discount}
+          form={form}
+          responsibilityCenters={responsibilityCenters}
+          disabled={disabled}
+        />
+      ) : (
+        <BillFormLines
+          lineData={lineData}
+          discount={discount}
+          form={form}
+          responsibilityCenters={responsibilityCenters}
+          disabled={disabled}
+        />
+      )}
 
       <Form.Item
         name="upload"

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

@@ -1,4 +1,4 @@
-import { DeleteFilled, WarningOutlined } from "@ant-design/icons";
+import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
 import {
   Button,
   Form,
@@ -7,7 +7,8 @@ import {
   Select,
   Space,
   Switch,
-  Table
+  Table,
+  Tooltip
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -43,7 +44,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.jobline"),
         dataIndex: "joblineid",
         editable: true,
-
+        width: "20rem",
         formItemProps: (field) => {
           return {
             key: `${field.index}joblinename`,
@@ -57,11 +58,24 @@ export function BillEnterModalLinesComponent({
             ],
           };
         },
+        wrapper: (props) => (
+          <Form.Item
+            noStyle
+            shouldUpdate={(prev, cur) =>
+              prev.is_credit_memo !== cur.is_credit_memo
+            }
+          >
+            {() => {
+              return props.children;
+            }}
+          </Form.Item>
+        ),
         formInput: (record, index) => (
           <BillLineSearchSelect
             disabled={disabled}
             options={lineData}
             style={{ width: "100%", minWidth: "10rem" }}
+            allowRemoved={form.getFieldValue("is_credit_memo") || false}
             onSelect={(value, opt) => {
               setFieldsValue({
                 billlines: getFieldsValue(["billlines"]).billlines.map(
@@ -74,7 +88,9 @@ export function BillEnterModalLinesComponent({
                         actual_price: opt.cost,
                         cost_center: opt.part_type
                           ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
-                            ? opt.part_type
+                            ? opt.part_type !== "PAE"
+                              ? opt.part_type
+                              : null
                             : responsibilityCenters.defaults &&
                               (responsibilityCenters.defaults.costs[
                                 opt.part_type
@@ -199,23 +215,58 @@ export function BillEnterModalLinesComponent({
           };
         },
         formInput: (record, index) => (
-          <CurrencyInput min={0} disabled={disabled} />
+          <CurrencyInput
+            min={0}
+            disabled={disabled}
+            controls={false}
+            addonAfter={
+              <Form.Item shouldUpdate noStyle>
+                {() => {
+                  const line = getFieldsValue(["billlines"]).billlines[index];
+                  if (!!!line) return null;
+                  let lineDiscount = 1 - line.actual_cost / line.actual_price;
+                  if (isNaN(lineDiscount)) lineDiscount = 0;
+                  return (
+                    <Tooltip title={`${(lineDiscount * 100).toFixed(2) || 0}%`}>
+                      <DollarCircleFilled
+                        style={{
+                          color:
+                            Math.abs(lineDiscount - discount) > 0.005
+                              ? lineDiscount > discount
+                                ? "orange"
+                                : "red"
+                              : "green",
+                        }}
+                      />
+                    </Tooltip>
+                  );
+                }}
+              </Form.Item>
+            }
+          />
         ),
-        additional: (record, index) => (
-          <Form.Item shouldUpdate>
-            {() => {
-              const line = getFieldsValue(["billlines"]).billlines[index];
-              if (!!!line) return null;
-              const lineDiscount = (
-                1 -
-                Math.round((line.actual_cost / line.actual_price) * 100) / 100
-              ).toPrecision(2);
+        // additional: (record, index) => (
+        //   <Form.Item shouldUpdate>
+        //     {() => {
+        //       const line = getFieldsValue(["billlines"]).billlines[index];
+        //       if (!!!line) return null;
+        //       const lineDiscount = (
+        //         1 -
+        //         Math.round((line.actual_cost / line.actual_price) * 100) / 100
+        //       ).toPrecision(2);
 
-              if (lineDiscount - discount === 0) return <div />;
-              return <WarningOutlined style={{ color: "red" }} />;
-            }}
-          </Form.Item>
-        ),
+        //       return (
+        //         <Tooltip title={`${(lineDiscount * 100).toFixed(0) || 0}%`}>
+        //           <DollarCircleFilled
+        //             style={{
+        //               color: lineDiscount - discount !== 0 ? "red" : "green",
+        //             }}
+        //           />
+        //         </Tooltip>
+        //       );
+        //     }}
+        //   </Form.Item>
+        // ),
       },
       {
         title: t("billlines.fields.cost_center"),
@@ -283,6 +334,19 @@ export function BillEnterModalLinesComponent({
         additional: (record, index) => (
           <Form.Item shouldUpdate style={{ display: "inline-block" }}>
             {() => {
+              const price = getFieldValue([
+                "billlines",
+                record.name,
+                "actual_price",
+              ]);
+
+              const adjustmentRate = getFieldValue([
+                "billlines",
+                record.name,
+                "lbr_adjustment",
+                "rate",
+              ]);
+
               if (getFieldValue(["billlines", record.name, "deductedfromlbr"]))
                 return (
                   <div>
@@ -355,6 +419,9 @@ export function BillEnterModalLinesComponent({
                     >
                       <InputNumber precision={2} min={0.01} />
                     </Form.Item>
+                    {price &&
+                      adjustmentRate &&
+                      `${(price / adjustmentRate).toFixed(1)} hrs`}
                   </div>
                 );
               return <></>;
@@ -486,6 +553,7 @@ const EditableCell = ({
   formInput,
   formItemProps,
   additional,
+  wrapper,
   ...restProps
 }) => {
   if (additional)
@@ -503,7 +571,20 @@ const EditableCell = ({
         </Space>
       </td>
     );
-
+  if (wrapper)
+    return (
+      <wrapper>
+        <td {...restProps}>
+          <Form.Item
+            labelCol={{ span: 0 }}
+            name={dataIndex}
+            {...(formItemProps && formItemProps(record))}
+          >
+            {(formInput && formInput(record, record.name)) || children}
+          </Form.Item>
+        </td>
+      </wrapper>
+    );
   return (
     <td {...restProps}>
       <Form.Item

client/src/components/bill-line-search-select/bill-line-search-select.component.jsx

@@ -4,7 +4,10 @@ import { useTranslation } from "react-i18next";
 
 //To be used as a form element only.
 const { Option } = Select;
-const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
+const BillLineSearchSelect = (
+  { options, disabled, allowRemoved, ...restProps },
+  ref
+) => {
   const { t } = useTranslation();
 
   return (
@@ -12,6 +15,7 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
       disabled={disabled}
       ref={ref}
       showSearch
+      dropdownMatchSelectWidth={false}
       //  optionFilterProp="line_desc"
       filterOption={(inputValue, option) => {
         return (
@@ -36,7 +40,7 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
       {options
         ? options.map((item) => (
             <Option
-              disabled={item.removed}
+              disabled={allowRemoved ? false : item.removed}
               key={item.id}
               value={item.id}
               cost={item.act_price ? item.act_price : 0}
@@ -49,9 +53,14 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
                 ...(item.removed ? { textDecoration: "line-through" } : {}),
               }}
             >
-              {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
+              <span>{`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
                 item.oem_partno ? ` - ${item.oem_partno}` : ""
-              }${item.act_price ? ` - $${item.act_price}` : ``}`}
+              }`}</span>
+              <span style={{ float: "right", paddingleft: "1rem" }}>
+                {item.act_price
+                  ? `$${item.act_price && item.act_price.toFixed(2)}`
+                  : ``}
+              </span>
             </Option>
           ))
         : null}

client/src/components/bill-mark-exported-button/bill-mark-exported-button.component.jsx

@@ -0,0 +1,82 @@
+import { useMutation } from "@apollo/client";
+import { Button, notification } from "antd";
+import { gql } from "@apollo/client";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  selectAuthLevel,
+  selectBodyshop,
+} from "../../redux/user/user.selectors";
+import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  authLevel: selectAuthLevel,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(BillMarkExportedButton);
+
+export function BillMarkExportedButton({ bodyshop, authLevel, bill }) {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+
+  const [updateBill] = useMutation(gql`
+    mutation UPDATE_BILL($billId: uuid!) {
+      update_bills(where: { id: { _eq: $billId } }, _set: { exported: true }) {
+        returning {
+          id
+          exported
+          exported_at
+        }
+      }
+    }
+  `);
+
+  const handleUpdate = async () => {
+    setLoading(true);
+    const result = await updateBill({
+      variables: { billId: bill.id },
+    });
+
+    if (!result.errors) {
+      notification["success"]({
+        message: t("bills.successes.markexported"),
+      });
+    } else {
+      notification["error"]({
+        message: t("bills.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setLoading(false);
+    //Get the owner details, populate it all back into the job.
+  };
+
+  const hasAccess = HasRbacAccess({
+    bodyshop,
+    authLevel,
+    action: "bills:reexport",
+  });
+
+  if (hasAccess)
+    return (
+      <Button
+        loading={loading}
+        disabled={bill.exported}
+        onClick={handleUpdate}
+      >
+        {t("bills.labels.markexported")}
+      </Button>
+    );
+
+  return <></>;
+}

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

@@ -58,7 +58,8 @@ export function BillsListTableComponent({
         disabled={
           record.is_credit_memo || record.vendorid === bodyshop.inhousevendorid
         }
-        onClick={() =>
+        onClick={() => {
+          console.log(record);
           setPartsOrderContext({
             actions: {},
             context: {
@@ -74,12 +75,14 @@ export function BillsListTableComponent({
                   cost: i.actual_cost,
                   quantity: i.quantity,
                   joblineid: i.joblineid,
+                  oem_partno: i.jobline && i.jobline.oem_partno,
+                  part_type: i.jobline && i.jobline.part_type,
                 };
               }),
               isReturn: true,
             },
-          })
-        }
+          });
+        }}
       >
         {t("bills.actions.return")}
       </Button>

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

@@ -5,21 +5,25 @@ import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectBreadcrumbs } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import GlobalSearch from "../global-search/global-search.component";
 import "./breadcrumbs.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
   breadcrumbs: selectBreadcrumbs,
+  bodyshop: selectBodyshop,
 });
 
-export function BreadCrumbs({ breadcrumbs }) {
+export function BreadCrumbs({ breadcrumbs, bodyshop }) {
   return (
     <Row className="breadcrumb-container">
       <Col xs={24} sm={24} md={16}>
         <Breadcrumb separator=">">
           <Breadcrumb.Item>
             <Link to={`/manage`}>
-              <HomeFilled />
+              <HomeFilled />{" "}
+              {(bodyshop && bodyshop.shopname && `(${bodyshop.shopname})`) ||
+                ""}
             </Link>
           </Breadcrumb.Item>
           {breadcrumbs.map((item) =>

client/src/components/chat-send-message/chat-send-message.component.jsx

@@ -45,13 +45,14 @@ function ChatSendMessageComponent({
   const { t } = useTranslation();
 
   const handleEnter = () => {
-    if (message === "" || !message) return;
-    logImEXEvent("messaging_send_message");
     const selectedImages = selectedMedia.filter((i) => i.isSelected);
-    if (selectedImages < 11) {
+    if ((message === "" || !message) && selectedImages.length === 0) return;
+    logImEXEvent("messaging_send_message");
+
+    if (selectedImages.length < 11) {
       sendMessage({
         to: conversation.phone_num,
-        body: message,
+        body: message || "",
         messagingServiceSid: bodyshop.messagingservicesid,
         conversationid: conversation.id,
         selectedMedia: selectedImages,
@@ -92,7 +93,7 @@ function ChatSendMessageComponent({
       </span>
       <SendOutlined
         className="imex-flex-row__margin"
-        disabled={message === "" || !message}
+        //  disabled={message === "" || !message}
         onClick={handleEnter}
       />
       <Spin

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

@@ -11,6 +11,7 @@ import { setModalContext } from "../../redux/modals/modals.actions";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import moment from "moment";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
 });
@@ -86,7 +87,9 @@ export function ContractsList({
         } ${record.courtesycar.make} ${record.courtesycar.model}${
           record.courtesycar.plate ? ` (${record.courtesycar.plate})` : ""
         }${
-          record.courtesycar.fleetnumber ? ` (${record.courtesycar.fleetnumber})` : ""
+          record.courtesycar.fleetnumber
+            ? ` (${record.courtesycar.fleetnumber})`
+            : ""
         }`}</Link>
       ),
     },
@@ -133,6 +136,19 @@ export function ContractsList({
         <DateTimeFormatter>{record.actualreturn}</DateTimeFormatter>
       ),
     },
+    {
+      title: t("contracts.fields.length"),
+      dataIndex: "length",
+      key: "length",
+
+      render: (text, record) =>
+        (record.actualreturn &&
+          record.start &&
+          `${moment(record.actualreturn)
+            .diff(moment(record.start), "days", true)
+            .toFixed(1)} days`) ||
+        "",
+    },
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {

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

@@ -9,7 +9,7 @@ import { DateFormatter } from "../../utils/DateFormatter";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
 import CourtesyCarStatus from "../courtesy-car-status-select/courtesy-car-status-select.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
-import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
+//import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
@@ -32,7 +32,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         }
       />
 
-      <FormFieldsChanged form={form} />
+      {/* <FormFieldsChanged form={form} /> */}
       <LayoutFormRow header={t("courtesycars.labels.vehicle")}>
         <Form.Item
           label={t("courtesycars.fields.make")}

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

@@ -97,7 +97,9 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       render: (text, record) =>
         record.cccontracts.length === 1 ? (
           <Link to={`/manage/jobs/${record.cccontracts[0].job.id}`}>
-            {record.cccontracts[0].job.ro_number}
+            {`${record.cccontracts[0].job.ro_number} - ${
+              record.cccontracts[0].job.ownr_fn || ""
+            } ${record.cccontracts[0].job.ownr_ln || ""} ${record.cccontracts[0].job.ownr_co_nm || ""}`}
           </Link>
         ) : null,
     },

client/src/components/dashboard-components/monthly-employee-efficiency/monthly-employee-efficiency.component.jsx

@@ -40,7 +40,7 @@ export default function DashboardMonthlyEmployeeEfficiency({
         (dayAcc, dayVal) => {
           return {
             actual: dayAcc.actual + dayVal.actualhrs,
-            productive: dayAcc.actual + dayVal.productivehrs,
+            productive: dayAcc.productive + dayVal.productivehrs,
           };
         },
         { actual: 0, productive: 0 }
@@ -50,11 +50,13 @@ export default function DashboardMonthlyEmployeeEfficiency({
     }
 
     const dailyEfficiency =
-      ((dailyHrs.productive - dailyHrs.actual) / dailyHrs.productive + 1) * 100;
+      ((dailyHrs.productive - dailyHrs.actual) / dailyHrs.actual + 1) * 100;
 
     const theValue = {
       date: moment(val).format("DD"),
-      ...dailyHrs,
+      // ...dailyHrs,
+      actual: dailyHrs.actual.toFixed(1),
+      productive: dailyHrs.productive.toFixed(1),
       dailyEfficiency: isNaN(dailyEfficiency) ? 0 : dailyEfficiency.toFixed(1),
       accActual:
         acc.length > 0
@@ -67,12 +69,18 @@ export default function DashboardMonthlyEmployeeEfficiency({
           : dailyHrs.productive,
       accEfficiency: 0,
     };
-    theValue.accEfficiency = (
+
+    theValue.accEfficiency =
       ((theValue.accProductive - theValue.accActual) /
-        (theValue.accProductive || 1) +
+        (theValue.accActual || 0) +
         1) *
-      100
-    ).toFixed(1);
+      100;
+
+    if (isNaN(theValue.accEfficiency)) {
+      theValue.accEfficiency = 0;
+    } else {
+      theValue.accEfficiency = theValue.accEfficiency.toFixed(1);
+    }
 
     return [...acc, theValue];
   }, []);
@@ -131,6 +139,7 @@ export default function DashboardMonthlyEmployeeEfficiency({
               //stackId="day"
               barSize={20}
               fill="#102568"
+              format={"0.0"}
             />
             <Bar
               name="Productive Hours"
@@ -140,6 +149,7 @@ export default function DashboardMonthlyEmployeeEfficiency({
               //stackId="day"
               barSize={20}
               fill="#017664"
+              format={"0.0"}
             />
           </ComposedChart>
         </ResponsiveContainer>

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

@@ -31,16 +31,51 @@ export default function DashboardProjectedMonthlySales({ data, ...cardProps }) {
 }
 
 export const DashboardProjectedMonthlySalesGql = `
-    projected_monthly_sales: jobs(where: {_or: [{_and: [{date_invoiced: {_gte: "${moment()
+    projected_monthly_sales: jobs(where: {
+      voided: {_eq: false},
+      _or: [
+        {_and: [
+          {date_invoiced:{_is_null: false }},
+          {date_invoiced: {_gte: "${moment()
+            .startOf("month")
+            .startOf("day")
+            .toISOString()}"}}, {date_invoiced: {_lte: "${moment()
+  .endOf("month")
+  .endOf("day")
+  .toISOString()}"}}]},
+  {
+
+_and:[
+  {date_invoiced:{_is_null: true }},
+  {actual_completion: {_gte: "${moment()
+    .startOf("month")
+    .startOf("day")
+    .toISOString()}"}}, {actual_completion: {_lte: "${moment()
+  .endOf("month")
+  .endOf("day")
+  .toISOString()}"}}
+
+]
+  },
+
+  {_and: [
+    {date_invoiced: {_is_null: true}}, 
+    {actual_completion: {_is_null: true}}
+    {scheduled_completion: {_gte: "${moment()
       .startOf("month")
-      .format("YYYY-MM-DD")}"}}, {date_invoiced: {_lte: "${moment()
+      .startOf("day")
+      .toISOString()}"}}, {scheduled_completion: {_lte: "${moment()
   .endOf("month")
-  .format("YYYY-MM-DD")}"}}]}, {_and: [{scheduled_completion: {_gte: "${moment()
-  .startOf("month")
-  .format("YYYY-MM-DD")}"}}, {scheduled_completion: {_lte: "${moment()
-  .endOf("month")
-  .format("YYYY-MM-DD")}"}}]}]}) {
+  .endOf("day")
+  .toISOString()}"}}
+
+
+]}
+
+]}) {
     id
+    ro_number
+    voided
     date_invoiced
     job_totals
   }

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

@@ -280,12 +280,13 @@ const createDashboardQuery = (state) => {
   return gql`
     query QUERY_DASHBOARD_DETAILS {
          ${componentBasedAdditions || ""}
-      monthly_sales: jobs(where: {_and: [{date_invoiced: {_gte: "${moment()
-        .startOf("month")
-        .format("YYYY-MM-DD")}"}}, {date_invoiced: {_lte: "${moment()
-    .endOf("month")
-    .format("YYYY-MM-DD")}"}}]}) {
+      monthly_sales: jobs(where: {_and: [
+        { voided: {_eq: false}},
+        {date_invoiced: {_gte: "${moment()
+        .startOf("month").startOf('day').toISOString()}"}}, {date_invoiced: {_lte: "${moment()
+    .endOf("month").endOf('day').toISOString()}"}}]}) {
     id
+    ro_number
     date_invoiced
     job_totals
           rate_la1
@@ -333,14 +334,14 @@ const createDashboardQuery = (state) => {
           part_qty
           part_type
         }
-        labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" } }) {
+        labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
           aggregate {
             sum {
               mod_lb_hrs
             }
           }
         }
-        larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" } }) {
+        larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }) {
           aggregate {
             sum {
               mod_lb_hrs

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

@@ -45,7 +45,7 @@ export function DmsCustomerSelector({ bodyshop }) {
   const onUseGeneric = () => {
     setVisible(false);
     socket.emit(
-      `${dmsType}selected-customer`,
+      `${dmsType}-selected-customer`,
       bodyshop.cdk_configuration.generic_customer_number
     );
     setSelectedCustomer(null);

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

@@ -14,6 +14,7 @@ import {
   Typography,
 } from "antd";
 import Dinero from "dinero.js";
+import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -22,6 +23,7 @@ import { determineDmsType } from "../../pages/dms/dms.container";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component";
 import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component";
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
@@ -78,10 +80,26 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
         layout="vertical"
         onFinish={handleFinish}
         initialValues={{
-          story: t("jobs.labels.dms.defaultstory", {
+          story: `${t("jobs.labels.dms.defaultstory", {
             ro_number: job.ro_number,
-            area_of_damage: job.area_of_damage && job.area_of_damage.impact1,
-          }).substr(0, 239),
+            ownr_nm: `${job.ownr_fn || ""} ${job.ownr_ln || ""} ${
+              job.ownr_co_nm || ""
+            }`.trim(),
+            ins_co_nm: job.ins_co_nm || "N/A",
+            clm_po: `${job.clm_no ? `${job.clm_no} ` : ""}${
+              job.po_number || ""
+            }`,
+          }).trim()}.${
+            job.area_of_damage && job.area_of_damage.impact1
+              ? " " +
+                t("jobs.labels.dms.damageto", {
+                  area_of_damage:
+                    (job.area_of_damage && job.area_of_damage.impact1) ||
+                    "UNKNOWN",
+                })
+              : ""
+          }`.substr(0, 239),
+          inservicedate: moment("2019-01-01"),
         }}
       >
         <LayoutFormRow grow>
@@ -154,6 +172,12 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
               >
                 <Input disabled />
               </Form.Item>
+              <Form.Item
+                name="inservicedate"
+                label={t("jobs.fields.dms.inservicedate")}
+              >
+                <FormDatePicker />
+              </Form.Item>
             </LayoutFormRow>
             <Space>
               <DmsCdkMakes form={form} socket={socket} job={job} />
@@ -174,6 +198,22 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
         </Form.Item>
 
         <Divider />
+        <Space size="large" wrap align="center">
+          <Statistic
+            title={t("jobs.fields.ded_amt")}
+            value={Dinero(
+              job.job_totals.totals.custPayable.deductible
+            ).toFormat()}
+          />
+          <Statistic
+            title={t("jobs.labels.total_cust_payable")}
+            value={Dinero(job.job_totals.totals.custPayable.total).toFormat()}
+          />
+          <Statistic
+            title={t("jobs.labels.net_repairs")}
+            value={Dinero(job.job_totals.totals.net_repairs).toFormat()}
+          />
+        </Space>
         <Form.List name={["payers"]}>
           {(fields, { add, remove }) => {
             return (

client/src/components/documents-upload/documents-upload.utility.js

@@ -6,6 +6,7 @@ import { INSERT_NEW_DOCUMENT } from "../../graphql/documents.queries";
 import { axiosAuthInterceptorId } from "../../utils/CleanAxios";
 import client from "../../utils/GraphQLClient";
 import exifr from "exifr";
+import { store } from "../../redux/store";
 
 //Context: currentUserEmail, bodyshop, jobid, invoiceid
 
@@ -21,9 +22,9 @@ export const handleUpload = (ev, context) => {
 
   const fileName = ev.file.name || ev.filename;
 
-  let key = `${bodyshop.id}/${jobId}/${fileName.replace(
-    /\.[^/.]+$/,
-    ""
+  let key = `${bodyshop.id}/${jobId}/${replaceAccents(fileName).replace(
+    /[^A-Z0-9]+/gi,
+    "_"
   )}-${new Date().getTime()}`;
   let extension = fileName.split(".").pop();
   uploadToCloudinary(
@@ -112,7 +113,19 @@ export const uploadToCloudinary = async (
   );
 
   if (cloudinaryUploadResponse.status !== 200) {
-    if (!!onError) onError(cloudinaryUploadResponse.statusText);
+    if (!!onError) {
+      onError(cloudinaryUploadResponse.statusText);
+    }
+
+    try {
+      axios.post("/newlog", {
+        message: "client-cloudinary-upload-error",
+        type: "error",
+        user: store.getState().user.email,
+        object: cloudinaryUploadResponse,
+      });
+    } catch (error) {}
+
     notification["error"]({
       message: i18n.t("documents.errors.insert", {
         message: cloudinaryUploadResponse.statusText,
@@ -187,3 +200,33 @@ export function DetermineFileType(filetype) {
 
   return "auto";
 }
+
+function replaceAccents(str) {
+  // Verifies if the String has accents and replace them
+  if (str.search(/[\xC0-\xFF]/g) > -1) {
+    str = str
+      .replace(/[\xC0-\xC5]/g, "A")
+      .replace(/[\xC6]/g, "AE")
+      .replace(/[\xC7]/g, "C")
+      .replace(/[\xC8-\xCB]/g, "E")
+      .replace(/[\xCC-\xCF]/g, "I")
+      .replace(/[\xD0]/g, "D")
+      .replace(/[\xD1]/g, "N")
+      .replace(/[\xD2-\xD6\xD8]/g, "O")
+      .replace(/[\xD9-\xDC]/g, "U")
+      .replace(/[\xDD]/g, "Y")
+      .replace(/[\xDE]/g, "P")
+      .replace(/[\xE0-\xE5]/g, "a")
+      .replace(/[\xE6]/g, "ae")
+      .replace(/[\xE7]/g, "c")
+      .replace(/[\xE8-\xEB]/g, "e")
+      .replace(/[\xEC-\xEF]/g, "i")
+      .replace(/[\xF1]/g, "n")
+      .replace(/[\xF2-\xF6\xF8]/g, "o")
+      .replace(/[\xF9-\xFC]/g, "u")
+      .replace(/[\xFE]/g, "p")
+      .replace(/[\xFD\xFF]/g, "y");
+  }
+
+  return str;
+}

client/src/components/form-date-picker/form-date-picker.component.jsx

@@ -1,35 +1,83 @@
 import { DatePicker } from "antd";
 import moment from "moment";
-import React, { forwardRef } from "react";
+import React, { useRef } from "react";
 //To be used as a form element only.
 
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(FormDatePicker);
+
 const dateFormat = "MM/DD/YYYY";
 
-const FormDatePicker = (
-  { value, onChange, onBlur, onlyFuture, ...restProps },
-  ref
-) => {
+export function FormDatePicker({
+  bodyshop,
+  value,
+  onChange,
+  onBlur,
+  onlyFuture,
+  isDateOnly = true,
+  ...restProps
+}) {
+  const ref = useRef();
+
   const handleChange = (newDate) => {
     if (value !== newDate && onChange) {
-      onChange(newDate);
+      onChange(isDateOnly ? newDate && newDate.format("YYYY-MM-DD") : newDate);
     }
   };
 
   const handleKeyDown = (e) => {
     if (e.key.toLowerCase() === "t") {
       if (onChange) {
-        onChange(new moment());
+        onChange(isDateOnly ? moment().format("YYYY-MM-DD") : moment());
+        // if (ref.current && ref.current.blur) ref.current.blur();
       }
+    } else if (e.key.toLowerCase() === "enter") {
+      if (ref.current && ref.current.blur) ref.current.blur();
     }
   };
 
+  const handleBlur = (e) => {
+    const v = e.target.value;
+    if (!v) return;
+
+    const _a = moment(
+      v,
+      ["MMDDYY", "MMDDYYYY", "MMDD", "MM/DD/YY"],
+      "en",
+      false
+    );
+
+    if (_a.isValid() && value && value.isValid && value.isValid()) {
+      _a.set({
+        hours: value.hours(),
+        minutes: value.minutes(),
+        seconds: value.seconds(),
+        milliseconds: value.milliseconds(),
+      });
+    }
+
+    if (_a.isValid() && onChange)
+      onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
+  };
+
   return (
     <div onKeyDown={handleKeyDown}>
       <DatePicker
+        ref={ref}
         value={value ? moment(value) : null}
         onChange={handleChange}
         format={dateFormat}
-        onBlur={onBlur}
+        onBlur={onBlur || handleBlur}
+        showToday={false}
         disabledTime
         {...(onlyFuture && {
           disabledDate: (d) => moment().subtract(1, "day").isAfter(d),
@@ -38,6 +86,4 @@ const FormDatePicker = (
       />
     </div>
   );
-};
-
-export default forwardRef(FormDatePicker);
+}

client/src/components/form-date-time-picker/form-date-time-picker.component.jsx

@@ -26,19 +26,20 @@ const DateTimePicker = (
         value={value}
         onBlur={onBlur}
         onChange={onChange}
+        isDateOnly={false}
       />
 
       <TimePicker
-        {...restProps}
-        value={value ? moment(value) : null}
-        {...(onlyFuture && {
-          disabledDate: (d) => moment().isAfter(d),
-        })}
-        onChange={onChange}
-        showSecond={false}
-        minuteStep={15}
-        onBlur={onBlur}
-        format="hh:mm a"
+      value={value ? moment(value) : null}
+      {...(onlyFuture && {
+        disabledDate: (d) => moment().isAfter(d),
+      })}
+      onChange={onChange}
+      showSecond={false}
+      minuteStep={15}
+      onBlur={onBlur}
+      format="hh:mm a"
+      {...restProps}
       />
     </div>
   );

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

@@ -38,6 +38,7 @@ export default function GlobalSearch() {
                 <Link to={`/manage/jobs/${job.id}`}>
                   <Space size="small" split={<Divider type="vertical" />}>
                     <strong>{job.ro_number || t("general.labels.na")}</strong>
+                    <span>{`${job.status || ""}`}</span>
                     <span>{`${job.ownr_fn || ""} ${job.ownr_ln || ""} ${
                       job.ownr_co_nm || ""
                     }`}</span>

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

@@ -27,6 +27,7 @@ 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 ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
@@ -66,7 +67,10 @@ export function ScheduleEventComponent({
   const popoverContent = (
     <div style={{ maxWidth: "40vw" }}>
       {!event.isintake ? (
-        <strong>{event.title}</strong>
+        <Space>
+          <strong>{event.title}</strong>
+          <ScheduleEventColor event={event} />
+        </Space>
       ) : (
         <Space>
           <strong>{`${(event.job && event.job.ownr_fn) || ""} ${
@@ -118,7 +122,9 @@ export function ScheduleEventComponent({
           </DataLabel>
           <ScheduleEventNote event={event} />
         </div>
-      ) : null}
+      ) : (
+        <div>{event.note || ""}</div>
+      )}
       <Divider />
       <Space wrap>
         {event.job ? (
@@ -140,84 +146,89 @@ export function ScheduleEventComponent({
             {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"),
-                      })
+        {event.job ? (
+          <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
                     );
-                    setVisible(false);
-                  } else {
-                    notification["error"]({
-                      message: t("messaging.error.invalidphone"),
-                    });
-                  }
-                }}
-                disabled={event.arrived || !bodyshop.messagingservicesid}
-              >
-                {t("general.labels.sms")}
-              </Menu.Item>
-            </Menu>
-          }
-        >
-          <Button>{t("appointments.actions.sendreminder")}</Button>
-        </Dropdown>
+                  }}
+                  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>
+            }
+          >
+            <Button>{t("appointments.actions.sendreminder")}</Button>
+          </Dropdown>
+        ) : null}
 
         <Button onClick={() => handleCancel(event.id)} disabled={event.arrived}>
           {t("appointments.actions.cancel")}
         </Button>
-        <Button
-          disabled={event.arrived}
-          onClick={() => {
-            setVisible(false);
-            setScheduleContext({
-              actions: { refetch: refetch },
-              context: {
-                jobId: event.job.id,
-                job: event.job,
-                previousEvent: event.id,
-                color: event.color,
-                alt_transport: event.job && event.job.alt_transport,
-                note: event.note,
-              },
-            });
-          }}
-        >
-          {t("appointments.actions.reschedule")}
-        </Button>
+        {event.isintake ? (
+          <Button
+            disabled={event.arrived}
+            onClick={() => {
+              setVisible(false);
+              setScheduleContext({
+                actions: { refetch: refetch },
+                context: {
+                  jobId: event.job.id,
+                  job: event.job,
+                  previousEvent: event.id,
+                  color: event.color,
+                  alt_transport: event.job && event.job.alt_transport,
+                  note: event.note,
+                },
+              });
+            }}
+          >
+            {t("appointments.actions.reschedule")}
+          </Button>
+        ) : (
+          <ScheduleManualEvent event={event} />
+        )}
         {event.isintake ? (
           <Link
             to={{
@@ -235,7 +246,13 @@ export function ScheduleEventComponent({
   );
 
   const RegularEvent = event.isintake ? (
-    <div style={{ display: "flex", flexWrap: "wrap" }}>
+    <div
+      style={{
+        display: "flex",
+        flexWrap: "wrap",
+        height: "100%",
+      }}
+    >
       <Space>
         {event.note && <AlertFilled className="production-alert" />}
         <strong>{`${event.job.ro_number || t("general.labels.na")}`}</strong>
@@ -262,7 +279,7 @@ export function ScheduleEventComponent({
       )}
     </div>
   ) : (
-    <div>
+    <div style={{ height: "100%", width: "100%" }}>
       <strong>{`${event.title || ""}`}</strong>
     </div>
   );
@@ -270,7 +287,7 @@ export function ScheduleEventComponent({
   return (
     <Popover
       visible={visible}
-      onVisibleChange={(vis) => setVisible(vis)}
+      onVisibleChange={(vis) => !event.vacation && setVisible(vis)}
       trigger="click"
       content={event.block ? blockContent : popoverContent}
       style={{ height: "100%", width: "100%" }}

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

@@ -38,6 +38,7 @@ export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
           job: {
             date_scheduled: null,
             scheduled_in: null,
+            scheduled_completion:null,
             status: bodyshop.md_ro_statuses.default_imported,
           },
         },

client/src/components/job-bills-total/job-bills-total.component.jsx

@@ -72,7 +72,7 @@ export default function JobBillsTotalComponent({
 
   const discrepWithLbrAdj = discrepancy.add(lbrAdjustments);
 
-  const discrepWithCms = discrepWithLbrAdj.add(billCms);
+  const discrepWithCms = discrepWithLbrAdj.add(totalReturns);
   const creditsNotReceived = totalReturns.subtract(billCms); //billCms is tracked as a negative number.
 
   return (
@@ -171,8 +171,8 @@ export default function JobBillsTotalComponent({
               }
             >
               <Statistic
-                title={t("bills.labels.billcmtotal")}
-                value={billCms.toFormat()}
+                title={t("bills.labels.totalreturns")}
+                value={totalReturns.toFormat()}
               />
             </Tooltip>
             <Typography.Title>=</Typography.Title>

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

@@ -79,9 +79,19 @@ export function JobChecklistForm({
           ...(type === "intake" && {
             scheduled_completion: values.scheduled_completion,
           }),
+          ...(type === "intake" &&
+            bodyshop.intakechecklist &&
+            bodyshop.intakechecklist.next_contact_hours &&
+            bodyshop.intakechecklist.next_contact_hours > 0 && {
+              date_next_contact: moment().add(
+                bodyshop.intakechecklist.next_contact_hours,
+                "hours"
+              ),
+            }),
           ...(type === "deliver" && {
             actual_completion: values.actual_completion,
           }),
+
           [(type === "intake" && "intakechecklist") ||
           (type === "deliver" && "deliverchecklist")]: {
             ...values,
@@ -95,6 +105,10 @@ export function JobChecklistForm({
             completed_at: new Date(),
           },
 
+          ...(type === "intake" &&
+            values.scheduled_delivery && {
+              scheduled_delivery: values.scheduled_delivery,
+            }),
           ...(type === "deliver" && {
             scheduled_delivery: values.scheduled_delivery,
             actual_delivery: values.actual_delivery,
@@ -161,7 +175,12 @@ export function JobChecklistForm({
       });
     }
   };
-
+  console.log(job, {
+    removeFromProduction: true,
+    actual_completion:
+      job && job.actual_completion && moment(job.actual_completion),
+    actual_delivery: job && job.actual_delivery && moment(job.actual_delivery),
+  });
   return (
     <Card
       title={t("checklist.labels.checklist")}
@@ -185,21 +204,27 @@ export function JobChecklistForm({
             addToProduction: true,
             allow_text_message: job.owner && job.owner.allow_text_message,
             scheduled_completion:
-              (job && job.scheduled_completion) ||
-              (job.labbrs && job.larhrs
-                ? moment().businessAdd(
-                    (job.labhrs.aggregate.sum.mod_lb_hrs +
-                      job.larhrs.aggregate.sum.mod_lb_hrs) /
-                      bodyshop.target_touchtime,
-                    "days"
-                  )
-                : null),
-            scheduled_delivery: job && job.scheduled_delivery,
+              (job &&
+                job.scheduled_completion &&
+                moment(job.scheduled_completion)) ||
+              (job &&
+                job.labhrs &&
+                job.larhrs &&
+                moment().businessAdd(
+                  (job.labhrs.aggregate.sum.mod_lb_hrs ||
+                    0 + job.larhrs.aggregate.sum.mod_lb_hrs ||
+                    0) / bodyshop.target_touchtime,
+                  "days"
+                )),
+            scheduled_delivery:
+              job.scheduled_delivery && moment(job.scheduled_delivery),
           }),
           ...(type === "deliver" && {
             removeFromProduction: true,
-            actual_completion: job && job.actual_completion,
-            actual_delivery: job && job.actual_delivery,
+            actual_completion:
+              job && job.actual_completion && moment(job.actual_completion),
+            actual_delivery:
+              job && job.actual_delivery && moment(job.actual_delivery),
           }),
           ...formItems
             .filter((fi) => fi.value)

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

@@ -26,11 +26,6 @@ export function JobCostingModalContainer({
   const { visible, context } = jobCostingModal;
   const { jobId } = context;
 
-  // const { loading, error, data } = useQuery(QUERY_JOB_COSTING_DETAILS, {
-  //   variables: { id: jobId },
-  //   skip: !jobId,
-  // });
-
   useEffect(() => {
     async function getData() {
       if (jobId && visible) {
@@ -46,8 +41,14 @@ export function JobCostingModalContainer({
     <Modal
       visible={visible}
       title={t("jobs.labels.jobcosting")}
-      onOk={() => toggleModalVisible()}
-      onCancel={() => toggleModalVisible()}
+      onOk={() => {
+        toggleModalVisible();
+        setCostingData(null);
+      }}
+      onCancel={() => {
+        toggleModalVisible();
+        setCostingData(null);
+      }}
       cancelButtonProps={{ style: { display: "none" } }}
       width="90%"
       destroyOnClose

client/src/components/job-costing-statistics/job-costing-statistics.component.jsx

@@ -16,6 +16,14 @@ export default function JobCostingStatistics({ summaryData }) {
           value={Dinero(summaryData.totalPartsSales).toFormat()}
           title={t("jobs.labels.sale_parts")}
         />
+        <Statistic
+          value={Dinero(summaryData.totalSubletSales).toFormat()}
+          title={t("jobs.labels.sale_sublet")}
+        />
+        <Statistic
+          value={Dinero(summaryData.totalAdditionalSales).toFormat()}
+          title={t("jobs.labels.sale_additional")}
+        />
         <Statistic
           value={Dinero(summaryData.totalSales).toFormat()}
           title={t("jobs.labels.total_sales")}
@@ -28,6 +36,14 @@ export default function JobCostingStatistics({ summaryData }) {
           value={Dinero(summaryData.totalPartsCost).toFormat()}
           title={t("jobs.labels.cost_parts")}
         />
+        <Statistic
+          value={Dinero(summaryData.totalSubletCost).toFormat()}
+          title={t("jobs.labels.cost_sublet")}
+        />
+        <Statistic
+          value={Dinero(summaryData.totalAdditionalCost).toFormat()}
+          title={t("jobs.labels.cost_Additional")}
+        />
         <Statistic
           value={Dinero(summaryData.totalCost).toFormat()}
           title={t("jobs.labels.total_cost")}

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

@@ -55,15 +55,17 @@ export function JobEmployeeAssignments({
             0
           }
         >
-          {bodyshop.employees.map((emp) => (
-            <Select.Option
-              value={emp.id}
-              key={emp.id}
-              name={`${emp.first_name} ${emp.last_name}`}
-            >
-              {`${emp.first_name} ${emp.last_name}`}
-            </Select.Option>
-          ))}
+          {bodyshop.employees
+            .filter((emp) => emp.active)
+            .map((emp) => (
+              <Select.Option
+                value={emp.id}
+                key={emp.id}
+                name={`${emp.first_name} ${emp.last_name}`}
+              >
+                {`${emp.first_name} ${emp.last_name}`}
+              </Select.Option>
+            ))}
         </Select>
       </Col>
       <Col span={24}>

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

@@ -10,7 +10,7 @@ export default function JobLinesBillRefernece({ jobline }) {
       {subletRequired && <WarningFilled />}
       {`${(billLine.actual_price * billLine.quantity).toFixed(2)} (${
         billLine.bill.vendor.name
-      })`}
+      } #${billLine.bill.invoice_number})`}
     </div>
   );
 }

client/src/components/job-totals-table/job-totals.table.other.component.jsx

@@ -33,10 +33,10 @@ export default function JobTotalsTableOther({ job }) {
         key: t("jobs.fields.storage_payable"),
         total: job.job_totals.additional.storage,
       },
-      {
-        key: t("jobs.fields.ca_bc_pvrt"),
-        total: job.job_totals.additional.pvrt,
-      },
+      // {
+      //   key: t("jobs.fields.ca_bc_pvrt"),
+      //   total: job.job_totals.additional.pvrt,
+      // },
     ];
   }, [job.job_totals, t]);
 

client/src/components/job-totals-table/job-totals.table.totals.component.jsx

@@ -3,7 +3,22 @@ import Dinero from "dinero.js";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 
-export default function JobTotalsTableTotals({ job }) {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobTotalsTableTotals);
+
+export function JobTotalsTableTotals({ bodyshop, job }) {
   const { t } = useTranslation();
 
   const data = useMemo(() => {
@@ -21,6 +36,14 @@ export default function JobTotalsTableTotals({ job }) {
         key: t("jobs.labels.state_tax_amt"),
         total: job.job_totals.totals.state_tax,
       },
+      ...(bodyshop.region_config === "CA_BC"
+        ? [
+            {
+              key: t("jobs.fields.ca_bc_pvrt"),
+              total: job.job_totals.additional.pvrt,
+            },
+          ]
+        : []),
       {
         key: t("jobs.labels.federal_tax_amt"),
         total: job.job_totals.totals.federal_tax,
@@ -58,7 +81,7 @@ export default function JobTotalsTableTotals({ job }) {
         bold: true,
       },
     ];
-  }, [job.job_totals, t]);
+  }, [job.job_totals, t, bodyshop.region_config]);
 
   const columns = [
     {

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

@@ -1,11 +1,13 @@
 import { useMutation } from "@apollo/client";
-import { Button, Form, notification, DatePicker } from "antd";
+import { Button, Form, notification } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import moment from "moment";
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
+
 export default function JobsAdminDatesChange({ job }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
@@ -54,7 +56,7 @@ export default function JobsAdminDatesChange({ job }) {
             label={t("jobs.fields.date_estimated")}
             name="date_estimated"
           >
-            <DatePicker format="MM/DD/YYYY" />
+            <FormDatePicker format="MM/DD/YYYY" />
           </Form.Item>
           <Form.Item label={t("jobs.fields.date_open")} name="date_open">
             <DateTimePicker />

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

@@ -1,4 +1,4 @@
-import { DatePicker, Form, Statistic, Tooltip } from "antd";
+import { Form, Statistic, Tooltip } from "antd";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -34,7 +34,7 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
           label={t("jobs.fields.date_estimated")}
           name="date_estimated"
         >
-          <DatePicker disabled={jobRO} format="MM/DD/YYYY" />
+          <FormDatePicker disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.date_open")} name="date_open">
           <DateTimePicker disabled={jobRO} />

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

@@ -89,6 +89,19 @@ export function JobsDetailHeaderActions({
     });
   };
 
+  const handleSuspend = (e) => {
+    logImEXEvent("production_toggle_alert");
+    //e.stopPropagation();
+    updateJob({
+      variables: {
+        jobId: job.id,
+        job: {
+          suspended: !job.suspended,
+        },
+      },
+    });
+  };
+
   const statusmenu = (
     <Menu key="popovermenu">
       <Menu.Item
@@ -199,7 +212,11 @@ export function JobsDetailHeaderActions({
           {t("jobs.actions.addtoproduction")}
         </Menu.Item>
       )}
-
+      <Menu.Item key="togglesuspend" onClick={handleSuspend}>
+        {job.suspended
+          ? t("production.actions.unsuspend")
+          : t("production.actions.suspend")}
+      </Menu.Item>
       <Menu.Item key="toggleAlert" onClick={handleAlertToggle}>
         {job.production_vars && job.production_vars.alert
           ? t("production.labels.alertoff")

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

@@ -1,5 +1,9 @@
 import { Card, Col, Row, Space, Tag } from "antd";
-import { WarningFilled, ExclamationCircleFilled } from "@ant-design/icons";
+import {
+  WarningFilled,
+  ExclamationCircleFilled,
+  PauseCircleOutlined,
+} from "@ant-design/icons";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -17,6 +21,7 @@ import ProductionListColumnProductionNote from "../production-list-columns/produ
 import "./jobs-detail-header.styles.scss";
 import JobsRelatedRos from "../jobs-related-ros/jobs-related-ros.component";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
+import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -68,6 +73,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                     {t("jobs.labels.inproduction")}
                   </Tag>
                 )}
+                {job.suspended && (
+                  <PauseCircleOutlined style={{ color: "orangered" }} />
+                )}
                 {job.production_vars && job.production_vars.alert ? (
                   <ExclamationCircleFilled className="production-alert" />
                 ) : null}
@@ -79,6 +87,12 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 ) : null}
               </Space>
             </DataLabel>
+            <DataLabel
+              label={t("jobs.fields.comment")}
+              valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}
+            >
+              <ProductionListColumnComment record={job} />
+            </DataLabel>
             <DataLabel label={t("jobs.fields.ins_co_nm_short")}>
               {job.ins_co_nm}
             </DataLabel>

client/src/components/jobs-documents-gallery/jobs-document-gallery.download.component.jsx

@@ -36,7 +36,7 @@ export function JobsDocumentsDownloadButton({
   );
   const imagesToDownload = [
     ...galleryImages.images.filter((image) => image.isSelected),
-    // ...galleryImages.other.filter((image) => image.isSelected),
+     ...galleryImages.other.filter((image) => image.isSelected),
   ];
 
   function downloadProgress(progressEvent) {
@@ -123,6 +123,7 @@ export function JobsDocumentsDownloadButton({
       a.click();
     }
   };
+ 
   return (
     <>
       <Button

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

@@ -30,7 +30,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      width: "8%",
+
       sorter: true, //(a, b) => alphaSort(a.ro_number, b.ro_number),
       sortOrder: sortcolumn === "ro_number" && sortorder,
 
@@ -47,7 +47,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       key: "ownr_ln",
       ellipsis: true,
       //sorter: true, // (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
-      width: "25%",
+
       //sortOrder: sortcolumn === "ownr_ln" && sortorder,
       render: (text, record) => {
         return record.ownerid ? (
@@ -67,7 +67,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.ownr_ph1"),
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
-      width: "12%",
+
       ellipsis: true,
       render: (text, record) => (
         <StartChatButton phone={record.ownr_ph1} jobid={record.id} />
@@ -77,7 +77,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
-      width: "12%",
+
       ellipsis: true,
       render: (text, record) => (
         <StartChatButton phone={record.ownr_ph2} jobid={record.id} />
@@ -87,7 +87,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-      width: "10%",
+
       ellipsis: true,
       sorter: true, // (a, b) => alphaSort(a.status, b.status),
       sortOrder: sortcolumn === "status" && sortorder,
@@ -104,7 +104,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.vehicle"),
       dataIndex: "vehicle",
       key: "vehicle",
-      width: "15%",
+
       ellipsis: true,
       render: (text, record) => {
         return record.vehicleid ? (
@@ -124,7 +124,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("vehicles.fields.plate_no"),
       dataIndex: "plate_no",
       key: "plate_no",
-      width: "8%",
+
       ellipsis: true,
       sorter: true, //(a, b) => alphaSort(a.plate_no, b.plate_no),
       sortOrder: sortcolumn === "plate_no" && sortorder,
@@ -136,7 +136,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.clm_no"),
       dataIndex: "clm_no",
       key: "clm_no",
-      width: "12%",
+
       ellipsis: true,
       sorter: true, //(a, b) => alphaSort(a.clm_no, b.clm_no),
       sortOrder: sortcolumn === "clm_no" && sortorder,
@@ -155,7 +155,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.clm_total"),
       dataIndex: "clm_total",
       key: "clm_total",
-      width: "10%",
+
       sorter: true, //(a, b) => a.clm_total - b.clm_total,
       sortOrder: sortcolumn === "clm_total" && sortorder,
       render: (text, record) => {
@@ -170,11 +170,17 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.owner_owing"),
       dataIndex: "owner_owing",
       key: "owner_owing",
-      width: "8%",
+
       render: (text, record) => (
         <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
       ),
     },
+    {
+      title: t("jobs.fields.comment"),
+      dataIndex: "comment",
+      key: "comment",
+      ellipsis: true,
+    },
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
@@ -224,7 +230,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
     >
       <Table
         loading={loading}
-        scroll={{ x: true }}
         pagination={{
           position: "top",
           pageSize: 25,

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

@@ -1,4 +1,8 @@
-import { SyncOutlined, ExclamationCircleFilled } from "@ant-design/icons";
+import {
+  SyncOutlined,
+  ExclamationCircleFilled,
+  PauseCircleOutlined,
+} from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
 import { Button, Card, Grid, Input, Space, Table } from "antd";
 import queryString from "query-string";
@@ -56,6 +60,9 @@ export function JobsList({ bodyshop }) {
             (j.ownr_co_nm || "")
               .toLowerCase()
               .includes(searchText.toLowerCase()) ||
+            (j.comments || "")
+              .toLowerCase()
+              .includes(searchText.toLowerCase()) ||
             (j.ownr_fn || "")
               .toLowerCase()
               .includes(searchText.toLowerCase()) ||
@@ -111,6 +118,9 @@ export function JobsList({ bodyshop }) {
             {record.production_vars && record.production_vars.alert ? (
               <ExclamationCircleFilled className="production-alert" />
             ) : null}
+            {record.suspended && (
+              <PauseCircleOutlined style={{ color: "orangered" }} />
+            )}
           </Space>
         </Link>
       ),
@@ -255,6 +265,13 @@ export function JobsList({ bodyshop }) {
         <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
       ),
     },
+    {
+      title: t("jobs.fields.comment"),
+      dataIndex: "comment",
+      key: "comment",
+      ellipsis: true,
+      responsive: ["md"],
+    },
     // {
     //   title: t("jobs.fields.owner_owing"),
     //   dataIndex: "owner_owing",

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

@@ -5,7 +5,7 @@ import {
   EyeInvisibleFilled,
   WarningFilled,
 } from "@ant-design/icons";
-import { Button, Card, Space, Table } from "antd";
+import { Button, Card, Form, Input, Space, Table } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -14,6 +14,7 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import NoteUpsertModal from "../note-upsert-modal/note-upsert-modal.container";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
 
@@ -123,7 +124,7 @@ export function JobNotesComponent({
             messageObject={{
               subject: Templates.individual_job_note.subject,
             }}
-            id={record.id}
+            id={jobId}
           />
         </Space>
       ),
@@ -131,32 +132,42 @@ export function JobNotesComponent({
   ];
 
   return (
-    <Card
-      title={t("jobs.labels.notes")}
-      extra={
-        <Button
-          onClick={() => {
-            setNoteUpsertContext({
-              actions: { refetch: refetch },
-              context: {
-                jobId: jobId,
-              },
-            });
-          }}
+    <div>
+      <LayoutFormRow>
+        <Form.Item
+          label={t("jobs.fields.invoice_final_note")}
+          name="invoice_final_note"
         >
-          {t("notes.actions.new")}
-        </Button>
-      }
-    >
-      <NoteUpsertModal />
+          <Input.TextArea disabled={jobRO} />
+        </Form.Item>
+      </LayoutFormRow>
+      <Card
+        title={t("jobs.labels.notes")}
+        extra={
+          <Button
+            onClick={() => {
+              setNoteUpsertContext({
+                actions: { refetch: refetch },
+                context: {
+                  jobId: jobId,
+                },
+              });
+            }}
+          >
+            {t("notes.actions.new")}
+          </Button>
+        }
+      >
+        <NoteUpsertModal />
 
-      <Table
-        loading={loading}
-        columns={columns}
-        rowKey="id"
-        dataSource={data}
-      />
-    </Card>
+        <Table
+          loading={loading}
+          columns={columns}
+          rowKey="id"
+          dataSource={data}
+        />
+      </Card>
+    </div>
   );
 }
 export default connect(mapStateToProps, mapDispatchToProps)(JobNotesComponent);

client/src/components/partner-ping/partner-ping.component.jsx

@@ -6,9 +6,11 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setPartnerVersion } from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -19,26 +21,35 @@ export default connect(
   mapDispatchToProps
 )(PartnerPingComponent);
 
-export function PartnerPingComponent({ setPartnerVersion }) {
+export function PartnerPingComponent({ bodyshop, setPartnerVersion }) {
   const { t } = useTranslation();
 
   useEffect(() => {
     // Create an scoped async function in the hook
     async function checkPartnerStatus() {
+      if (!bodyshop) return;
       try {
         //if (process.env.NODE_ENV === "development") return;
         const PartnerResponse = await axios.post("http://localhost:1337/ping/");
         const { appver, qbpath } = PartnerResponse.data;
-
         setPartnerVersion(appver);
         console.log({ appver, qbpath });
-        if (!qbpath) {
+        if (
+          !qbpath &&
+          !(
+            bodyshop &&
+            (bodyshop.cdk_dealerid ||
+              bodyshop.pbs_serialnumber ||
+              bodyshop.accountingconfig.qbo)
+          )
+        ) {
           notification["error"]({
             title: "",
             message: t("general.messages.noacctfilepath"),
           });
         }
       } catch (error) {
+        console.log(error);
         notification["error"]({
           title: "",
           message: t("general.messages.partnernotrunning"),
@@ -48,7 +59,7 @@ export function PartnerPingComponent({ setPartnerVersion }) {
     // Execute the created function directly
     checkPartnerStatus();
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [bodyshop]);
 
   return <></>;
 }

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

@@ -10,7 +10,7 @@ import {
   PageHeader,
   Popconfirm,
   Space,
-  Table
+  Table,
 } from "antd";
 import queryString from "query-string";
 import React, { useState } from "react";
@@ -168,7 +168,9 @@ export function PartsOrderListTableComponent({
 
                     cost_center: pol.jobline?.part_type
                       ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
-                        ? pol.jobline.part_type
+                        ? pol.jobline.part_type !== "PAE"
+                          ? pol.jobline.part_type
+                          : null
                         : responsibilityCenters.defaults &&
                           (responsibilityCenters.defaults.costs[
                             pol.jobline.part_type
@@ -317,6 +319,15 @@ export function PartsOrderListTableComponent({
             },
           ]
         : []),
+      {
+        title: t("parts_orders.fields.part_type"),
+        dataIndex: "part_type",
+        key: "part_type",
+        render: (text, record) =>
+          record.part_type
+            ? t(`joblines.fields.part_types.${record.part_type}`)
+            : null,
+      },
       {
         title: t("parts_orders.fields.oem_partno"),
         dataIndex: "oem_partno",

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

@@ -1,6 +1,15 @@
 import { DeleteFilled, WarningFilled } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
-import { Divider, Form, Input, InputNumber, Radio, Space, Tag } from "antd";
+import {
+  Divider,
+  Form,
+  Input,
+  InputNumber,
+  Radio,
+  Space,
+  Tag,
+  Select,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -37,6 +46,11 @@ export function PartsOrderModalComponent({
     {},
     bodyshop.imexshopid
   );
+  const { OEConnection_PriceChange } = useTreatments(
+    ["OEConnection_PriceChange"],
+    {},
+    bodyshop.imexshopid
+  );
   const { t } = useTranslation();
 
   return (
@@ -59,6 +73,7 @@ export function PartsOrderModalComponent({
             options={vendorList}
             disabled={isReturn}
             preferredMake={preferredMake}
+            showPhone
           />
         </Form.Item>
         <Form.Item
@@ -91,68 +106,122 @@ export function PartsOrderModalComponent({
             <div>
               {fields.map((field, index) => (
                 <Form.Item required={false} key={field.key}>
-                  <LayoutFormRow grow noDivider>
-                    <Form.Item
-                      //span={8}
-                      label={t("parts_orders.fields.line_desc")}
-                      key={`${index}line_desc`}
-                      name={[field.name, "line_desc"]}
-                      rules={[
-                        {
-                          required: true,
-                          //message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <Input />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("parts_orders.fields.line_remarks")}
-                      key={`${index}line_remarks`}
-                      name={[field.name, "line_remarks"]}
-                    >
-                      <Input />
-                    </Form.Item>
-                    {
-                      // <Form.Item
-                      //   label={t("parts_orders.fields.db_price")}
-                      //   key={`${index}db_price`}
-                      //   name={[field.name, "db_price"]}
-                      // >
-                      //   <CurrencyInput />
-                      // </Form.Item>
-                    }
-                    <Form.Item
-                      label={t("parts_orders.fields.quantity")}
-                      key={`${index}quantity`}
-                      name={[field.name, "quantity"]}
-                      rules={[
-                        {
-                          required: true,
-                          //message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <InputNumber />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("parts_orders.fields.act_price")}
-                      key={`${index}act_price`}
-                      name={[field.name, "act_price"]}
-                    >
-                      <CurrencyInput />
-                    </Form.Item>
-                    {isReturn && (
+                  <div style={{ display: "flex" }}>
+                    <LayoutFormRow grow noDivider style={{ flex: 1 }}>
                       <Form.Item
-                        label={t("parts_orders.fields.cost")}
-                        key={`${index}cost`}
-                        name={[field.name, "cost"]}
+                        //span={8}
+                        label={t("parts_orders.fields.line_desc")}
+                        key={`${index}line_desc`}
+                        name={[field.name, "line_desc"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("parts_orders.fields.line_remarks")}
+                        key={`${index}line_remarks`}
+                        name={[field.name, "line_remarks"]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("parts_orders.fields.part_type")}
+                        key={`${index}part_type`}
+                        name={[field.name, "part_type"]}
+                      >
+                        <Select
+                          disabled={
+                            !(
+                              sendType === "oec" &&
+                              OEConnection_PriceChange.treatment === "on"
+                            )
+                          }
+                        >
+                          <Select.Option value="PAA">
+                            {t("joblines.fields.part_types.PAA")}
+                          </Select.Option>
+                          <Select.Option value="PAC">
+                            {t("joblines.fields.part_types.PAC")}
+                          </Select.Option>
+
+                          <Select.Option value="PAL">
+                            {t("joblines.fields.part_types.PAL")}
+                          </Select.Option>
+                          <Select.Option value="PAG">
+                            {t("joblines.fields.part_types.PAG")}
+                          </Select.Option>
+                          <Select.Option value="PAM">
+                            {t("joblines.fields.part_types.PAM")}
+                          </Select.Option>
+                          <Select.Option value="PAP">
+                            {t("joblines.fields.part_types.PAP")}
+                          </Select.Option>
+                          <Select.Option value="PAN">
+                            {t("joblines.fields.part_types.PAN")}
+                          </Select.Option>
+                          <Select.Option value="PAO">
+                            {t("joblines.fields.part_types.PAO")}
+                          </Select.Option>
+                          <Select.Option value="PAR">
+                            {t("joblines.fields.part_types.PAR")}
+                          </Select.Option>
+                          <Select.Option value="PAS">
+                            {t("joblines.fields.part_types.PAS")}
+                          </Select.Option>
+                        </Select>
+                      </Form.Item>
+                      <Form.Item
+                        label={t("parts_orders.fields.oem_partno")}
+                        key={`${index}oem_partno`}
+                        name={[field.name, "oem_partno"]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      {
+                        // <Form.Item
+                        //   label={t("parts_orders.fields.db_price")}
+                        //   key={`${index}db_price`}
+                        //   name={[field.name, "db_price"]}
+                        // >
+                        //   <CurrencyInput />
+                        // </Form.Item>
+                      }
+                      <Form.Item
+                        label={t("parts_orders.fields.quantity")}
+                        key={`${index}quantity`}
+                        name={[field.name, "quantity"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <InputNumber />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("parts_orders.fields.act_price")}
+                        key={`${index}act_price`}
+                        name={[field.name, "act_price"]}
                       >
                         <CurrencyInput />
                       </Form.Item>
-                    )}
-
-                    <Space wrap align="center">
+                      {isReturn && (
+                        <Form.Item
+                          label={t("parts_orders.fields.cost")}
+                          key={`${index}cost`}
+                          name={[field.name, "cost"]}
+                        >
+                          <CurrencyInput />
+                        </Form.Item>
+                      )}
+                    </LayoutFormRow>
+                    <Space wrap size="small" align="center">
                       <div>
                         <DeleteFilled
                           style={{ margin: "1rem" }}
@@ -167,7 +236,7 @@ export function PartsOrderModalComponent({
                         total={fields.length}
                       />
                     </Space>
-                  </LayoutFormRow>
+                  </div>
                 </Form.Item>
               ))}
             </div>
@@ -184,7 +253,7 @@ export function PartsOrderModalComponent({
         <Radio value={"none"}>{t("general.labels.none")}</Radio>
         <Radio value={"e"}>{t("parts_orders.labels.email")}</Radio>
         <Radio value={"p"}>{t("parts_orders.labels.print")}</Radio>
-        {OEConnection.treatment === "on" && (
+        {OEConnection.treatment === "on" && !isReturn && (
           <Radio value={"oec"}>{t("parts_orders.labels.oec")}</Radio>
         )}
       </Radio.Group>

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

@@ -30,6 +30,8 @@ import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import PartsOrderModalComponent from "./parts-order-modal.component";
 import axios from "axios";
+import { useTreatments } from "@splitsoftware/splitio-react";
+import _ from "lodash";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -57,6 +59,11 @@ export function PartsOrderModalContainer({
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
+  const { OEConnection_PriceChange } = useTreatments(
+    ["OEConnection_PriceChange"],
+    {},
+    bodyshop.imexshopid
+  );
   const { visible, context, actions } = partsOrderModal;
   const {
     jobId,
@@ -70,7 +77,7 @@ export function PartsOrderModalContainer({
 
   const { refetch } = actions;
   const [form] = Form.useForm();
-
+  const [saving, setSaving] = useState(false);
   const sendTypeState = useState("e");
   const sendType = sendTypeState[0];
 
@@ -86,7 +93,7 @@ export function PartsOrderModalContainer({
 
   const handleFinish = async (values) => {
     logImEXEvent("parts_order_insert");
-
+    setSaving(true);
     const insertResult = await insertPartOrder({
       variables: {
         po: [
@@ -189,6 +196,11 @@ export function PartsOrderModalContainer({
         (item) => item.id === values.vendorid
       )[0];
 
+      let vendorEmails =
+        matchingVendor &&
+        matchingVendor.email &&
+        matchingVendor.email.split(RegExp("[;,]"));
+
       GenerateDocument(
         {
           name: isReturn
@@ -199,7 +211,7 @@ export function PartsOrderModalContainer({
           },
         },
         {
-          to: matchingVendor ? [matchingVendor.email] : null,
+          to: matchingVendor ? vendorEmails : null,
           replyTo: bodyshop.email,
           subject: isReturn
             ? Templates.parts_return_slip.subject
@@ -230,11 +242,20 @@ export function PartsOrderModalContainer({
             id: insertResult.data.insert_parts_orders.returning[0].id,
           },
         });
+        let po;
+        //Massage the data based on the split. Should they be able to overwrite OEC pricing?
+        if (OEConnection_PriceChange.treatment === "on") {
+          //Set the flag to include the override.
+          po = _.cloneDeep(partsOrder.data.parts_orders_by_pk);
+          po.parts_order_lines.forEach((pol) => {
+            pol.priceChange = true;
+          });
+        }
 
         const oecResponse = await axios.post(
           "http://localhost:1337/oec/",
 
-          partsOrder.data.parts_orders_by_pk,
+          po || partsOrder.data.parts_orders_by_pk,
           {
             headers: {
               Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
@@ -257,11 +278,11 @@ export function PartsOrderModalContainer({
             error: JSON.stringify(error.message),
           }),
         });
-
+        setSaving(false);
         return;
       }
     }
-
+    setSaving(false);
     toggleModalVisible();
   };
 
@@ -283,6 +304,7 @@ export function PartsOrderModalContainer({
               cost: value.cost,
               quantity: value.part_qty,
               job_line_id: isReturn ? value.joblineid : value.id,
+              part_type: value.part_type,
             });
             return acc;
           }, [])
@@ -306,6 +328,8 @@ export function PartsOrderModalContainer({
       }
       onCancel={() => toggleModalVisible()}
       onOk={() => form.submit()}
+      okButtonProps={{ loading: saving }}
+      cancelButtonProps={{ loading: saving }}
       destroyOnClose
       width="75%"
       forceRender

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

@@ -0,0 +1,84 @@
+import { Button, Card, Form, InputNumber, Popover } 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 { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(PrintCenterJobsLabels);
+
+export function PrintCenterJobsLabels({ bodyshop, jobId }) {
+  const [isModalVisible, setIsModalVisible] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const { t } = useTranslation();
+  const [form] = Form.useForm();
+
+  const handleOk = () => {
+    form.submit();
+    setIsModalVisible(false);
+  };
+
+  const handleCancel = () => {
+    setIsModalVisible(false);
+    setLoading(false);
+  };
+  const handleFinish = async (values) => {
+    const { sendtype, ...restVals } = values;
+    setLoading(true);
+    await GenerateDocument(
+      {
+        name: TemplateList("job_special").folder_label_multiple.key,
+        variables: { id: jobId },
+        context: restVals,
+      },
+      {},
+      "p",
+      jobId
+    );
+    setLoading(false);
+    setIsModalVisible(false);
+  };
+
+  const content = (
+    <Card>
+      <Form
+        onFinish={handleFinish}
+        autoComplete={"off"}
+        layout="vertical"
+        form={form}
+      >
+        <Form.Item
+          label={t("printcenter.jobs.labels.position")}
+          name="position"
+        >
+          <InputNumber min={1} precision={0} />
+        </Form.Item>
+        <Form.Item label={t("printcenter.jobs.labels.count")} name="count">
+          <InputNumber min={1} precision={0} max={99} />
+        </Form.Item>
+        <Button type="primary" loading={loading} onClick={handleOk}>
+          {t("general.actions.print")}
+        </Button>
+        <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
+      </Form>
+    </Card>
+  );
+  return (
+    <Popover content={content} visible={isModalVisible}>
+      <Button onClick={() => setIsModalVisible(true)}>
+        {t("printcenter.jobs.labels.labels")}
+      </Button>
+    </Popover>
+  );
+}

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

@@ -9,6 +9,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import { TemplateList } from "../../utils/TemplateConstants";
 import Jobd3RdPartyModal from "../job-3rd-party-modal/job-3rd-party-modal.component";
 import PrintCenterItem from "../print-center-item/print-center-item.component";
+import PrintCenterJobsLabels from "../print-center-jobs-labels/print-center-jobs-labels.component";
 import PrintCenterSpeedPrint from "../print-center-speed-print/print-center-speed-print.component";
 const mapStateToProps = createStructuredSelector({
   printCenterModal: selectPrintCenter,
@@ -52,6 +53,7 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
           <Card
             extra={
               <Space wrap>
+                <PrintCenterJobsLabels jobId={jobId} />
                 <Jobd3RdPartyModal jobId={jobId} />
                 <Input.Search
                   onChange={(e) => setSearch(e.target.value)}

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

@@ -1,4 +1,8 @@
-import { CalendarOutlined, EyeFilled } from "@ant-design/icons";
+import {
+  CalendarOutlined,
+  EyeFilled,
+  PauseCircleOutlined,
+} from "@ant-design/icons";
 import { Card, Col, Row, Space } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -8,6 +12,7 @@ import ProductionAlert from "../production-list-columns/production-list-columns.
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import ProductionSubletsManageComponent from "../production-sublets-manage/production-sublets-manage.component";
 import "./production-board-card.styles.scss";
+import moment from "moment";
 
 export default function ProductionBoardCard(
   technician,
@@ -17,7 +22,7 @@ export default function ProductionBoardCard(
 ) {
   const { t } = useTranslation();
 
-  let employee_body, employee_prep, employee_refinish; //employee_csr;
+  let employee_body, employee_prep, employee_refinish, employee_csr;
   if (card.employee_body) {
     employee_body = bodyshop.employees.find((e) => e.id === card.employee_body);
   }
@@ -29,10 +34,22 @@ export default function ProductionBoardCard(
       (e) => e.id === card.employee_refinish
     );
   }
+  if (card.employee_csr) {
+    employee_csr = bodyshop.employees.find((e) => e.id === card.employee_csr);
+  }
   // if (card.employee_csr) {
   //   employee_csr = bodyshop.employees.find((e) => e.id === card.employee_csr);
   // }
 
+  const pastDueAlert =
+    !!card.scheduled_completion &&
+    ((moment().isSameOrAfter(moment(card.scheduled_completion), "day") &&
+      "production-completion-past") ||
+      (moment()
+        .add(1, "day")
+        .isSame(moment(card.scheduled_completion), "day") &&
+        "production-completion-soon"));
+
   return (
     <Card
       className="react-kanban-card imex-kanban-card"
@@ -40,6 +57,9 @@ export default function ProductionBoardCard(
       title={
         <Space>
           <ProductionAlert record={card} key="alert" />
+          {card.suspended && (
+            <PauseCircleOutlined style={{ color: "orangered" }} />
+          )}
           <span style={{ fontWeight: "bolder" }}>
             {card.ro_number || t("general.labels.na")}
           </span>
@@ -114,11 +134,11 @@ export default function ProductionBoardCard(
                     )} ${employee_refinish.last_name.charAt(0)}`
                   : ""
               } ${card.larhrs.aggregate.sum.mod_lb_hrs || "?"}h`}</Col>
-              {/* <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`C: ${
+              <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`C: ${
                 employee_csr
                   ? `${employee_csr.first_name} ${employee_csr.last_name}`
                   : ""
-              }`}</Col> */}
+              }`}</Col>
             </Row>
           </Col>
         )}
@@ -138,7 +158,7 @@ export default function ProductionBoardCard(
           cardSettings.scheduled_completion &&
           card.scheduled_completion && (
             <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
-              <Space>
+              <Space className={pastDueAlert}>
                 <CalendarOutlined />
                 <DateTimeFormatter format="MM/DD">
                   {card.scheduled_completion}

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

@@ -2,7 +2,7 @@ import { useApolloClient } from "@apollo/client";
 import Board, { moveCard } from "@asseinfo/react-kanban";
 //import "@asseinfo/react-kanban/dist/styles.css";
 import "./production-board-kanban.styles.scss";
-import { SyncOutlined } from '@ant-design/icons'
+import { SyncOutlined } from "@ant-design/icons";
 import { Grid, notification, Button, PageHeader, Space, Statistic } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -49,9 +49,16 @@ export function ProductionBoardKanbanComponent({
 
   const { t } = useTranslation();
   useEffect(() => {
-    setBoardLanes(
-      createBoardData(bodyshop.md_ro_statuses.production_statuses, data, filter)
+    const boardData = createBoardData(
+      bodyshop.md_ro_statuses.production_statuses,
+      data,
+      filter
     );
+
+    boardData.columns = boardData.columns.map((d) => {
+      return { ...d, title: `${d.title} (${d.cards.length})` };
+    });
+    setBoardLanes(boardData);
     setIsMoving(false);
   }, [
     data,

client/src/components/production-board-kanban/production-board-kanban.utils.js

@@ -66,6 +66,7 @@ export const createBoardData = (AllStatuses, Jobs, filter) => {
               include ||
               j.employee_body === employeeId ||
               j.employee_prep === employeeId ||
+              j.employee_csr === employeeId ||
               j.employee_refinish === employeeId;
           }
 
@@ -76,9 +77,8 @@ export const createBoardData = (AllStatuses, Jobs, filter) => {
 
   Object.keys(DataGroupedByStatus).map((statusGroupKey) => {
     try {
-      boardLanes.columns.find(
-        (l) => l.id === statusGroupKey
-      ).cards = sortByParentId(DataGroupedByStatus[statusGroupKey]);
+      boardLanes.columns.find((l) => l.id === statusGroupKey).cards =
+        sortByParentId(DataGroupedByStatus[statusGroupKey]);
     } catch (error) {
       console.log("Error while creating board card", error);
     }

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

@@ -33,6 +33,7 @@ export function ProductionColumnsComponent({
     setColumns([
       ...columns,
       ...dataSource({
+        bodyshop,
         technician,
         state: tableState,
         activeStatuses: bodyshop.md_ro_statuses.active_statuses,

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

@@ -41,7 +41,11 @@ export default function ProductionListColumnBodyPriority({ record }) {
             title={t("production.actions.bodypriority-set")}
           >
             {new Array(15).fill().map((value, index) => (
-              <Menu.Item key={index + 1}>{index + 1}</Menu.Item>
+              <Menu.Item key={index + 1}>
+                <div style={{ marginLeft: "2rem", marginRight: "2rem" }}>
+                  {index + 1}
+                </div>
+              </Menu.Item>
             ))}
           </Menu.SubMenu>
         </Menu>

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

@@ -0,0 +1,79 @@
+import Icon from "@ant-design/icons";
+import { useMutation } from "@apollo/client";
+import { Button, Input, Popover } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { FaRegStickyNote } from "react-icons/fa";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
+export default function ProductionListColumnComment({ record }) {
+  const { t } = useTranslation();
+
+  const [note, setNote] = useState(record.comment || "");
+
+  const [visible, setVisible] = useState(false);
+
+  const [updateAlert] = useMutation(UPDATE_JOB);
+
+  const handleSaveNote = (e) => {
+    e.stopPropagation();
+    setVisible(false);
+    updateAlert({
+      variables: {
+        jobId: record.id,
+        job: {
+          comment: note,
+        },
+      },
+    }).then(() => {
+      if (record.refetch) record.refetch();
+    });
+  };
+
+  const handleChange = (e) => {
+    e.stopPropagation();
+    setNote(e.target.value);
+  };
+
+  const handleVisibleChange = (flag) => {
+    setVisible(flag);
+    if (flag) setNote(record.comment || "");
+  };
+
+  return (
+    <Popover
+      onVisibleChange={handleVisibleChange}
+      visible={visible}
+      content={
+        <div style={{ width: "30em" }}>
+          <Input.TextArea
+            rows={5}
+            value={note}
+            onChange={handleChange}
+            // onPressEnter={handleSaveNote}
+            autoFocus
+            allowClear
+          />
+          <div>
+            <Button onClick={handleSaveNote}>
+              {t("general.actions.save")}
+            </Button>
+          </div>
+        </div>
+      }
+      trigger={["click"]}
+    >
+      <div
+        style={{
+          width: "100%",
+          height: "19px",
+          cursor: "pointer",
+          overflow: "hidden",
+          textOverflow: "ellipsis",
+        }}
+      >
+        <Icon component={FaRegStickyNote} style={{ marginRight: ".2rem" }} />
+        {record.comment || " "}
+      </div>
+    </Popover>
+  );
+}

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

@@ -1,3 +1,5 @@
+import { PauseCircleOutlined } from "@ant-design/icons";
+import { Space } from "antd";
 import i18n from "i18next";
 import moment from "moment";
 import React from "react";
@@ -16,9 +18,11 @@ import ProductionListLastContacted from "./production-list-columns.lastcontacted
 import ProductionListColumnPaintPriority from "./production-list-columns.paintpriority.component";
 import ProductionListColumnNote from "./production-list-columns.productionnote.component";
 import ProductionListColumnStatus from "./production-list-columns.status.component";
+import ProductionListColumnCategory from "./production-list-columns.status.category";
 import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
+import ProductionListColumnComment from "./production-list-columns.comment.component";
 
-const r = ({ technician, state, activeStatuses }) => {
+const r = ({ technician, state, activeStatuses, bodyshop }) => {
   return [
     {
       title: i18n.t("jobs.actions.viewdetail"),
@@ -43,9 +47,19 @@ const r = ({ technician, state, activeStatuses }) => {
         technician ? (
           <Link to={`/tech/joblookup?selected=${record.id}`}>
             {record.ro_number}
+            {record.suspended && (
+              <PauseCircleOutlined style={{ color: "orangered" }} />
+            )}
           </Link>
         ) : (
-          <Link to={`/manage/jobs/${record.id}`}>{record.ro_number}</Link>
+          <Link to={`/manage/jobs/${record.id}`}>
+            <Space>
+              {record.ro_number}
+              {record.suspended && (
+                <PauseCircleOutlined style={{ color: "orangered" }} />
+              )}
+            </Space>
+          </Link>
         ),
     },
     {
@@ -82,7 +96,7 @@ const r = ({ technician, state, activeStatuses }) => {
       sortOrder:
         state.sortedInfo.columnKey === "actual_in" && state.sortedInfo.order,
       render: (text, record) => (
-        <ProductionListDate record={record} field="actual_in" />
+        <ProductionListDate record={record} field="actual_in" time/>
       ),
     },
     {
@@ -96,7 +110,12 @@ const r = ({ technician, state, activeStatuses }) => {
         state.sortedInfo.columnKey === "scheduled_completion" &&
         state.sortedInfo.order,
       render: (text, record) => (
-        <ProductionListDate record={record} field="scheduled_completion" />
+        <ProductionListDate
+          record={record}
+          field="scheduled_completion"
+          pastIndicator
+          time
+        />
       ),
     },
     {
@@ -143,7 +162,12 @@ const r = ({ technician, state, activeStatuses }) => {
         state.sortedInfo.columnKey === "scheduled_delivery" &&
         state.sortedInfo.order,
       render: (text, record) => (
-        <ProductionListDate record={record} field="scheduled_delivery" />
+        <ProductionListDate
+          record={record}
+          field="scheduled_delivery"
+          pastIndicator
+          time
+        />
       ),
     },
     {
@@ -239,6 +263,29 @@ const r = ({ technician, state, activeStatuses }) => {
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => <ProductionListColumnStatus record={record} />,
     },
+    {
+      title: i18n.t("jobs.fields.category"),
+      dataIndex: "category",
+      key: "category",
+      ellipsis: true,
+
+      filters:
+        (bodyshop &&
+          bodyshop.md_categories.map((s) => {
+            return {
+              text: s,
+              value: [s],
+            };
+          })) ||
+        [],
+      onFilter: (value, record) => value.includes(record.category),
+      sorter: (a, b) => alphaSort(a.category, b.category),
+      sortOrder:
+        state.sortedInfo.columnKey === "category" && state.sortedInfo.order,
+      render: (text, record) => (
+        <ProductionListColumnCategory record={record} />
+      ),
+    },
     {
       title: i18n.t("production.labels.bodyhours"),
       dataIndex: "labhrs",
@@ -289,6 +336,13 @@ const r = ({ technician, state, activeStatuses }) => {
       ellipsis: true,
       render: (text, record) => <ProductionListColumnNote record={record} />,
     },
+    {
+      title: i18n.t("production.labels.comment"),
+      dataIndex: "comment",
+      key: "comment",
+      ellipsis: true,
+      render: (text, record) => <ProductionListColumnComment record={record} />,
+    },
     {
       title: i18n.t("production.labels.touchtime"),
       dataIndex: "tt",
@@ -353,6 +407,14 @@ const r = ({ technician, state, activeStatuses }) => {
       title: i18n.t("jobs.fields.employee_body"),
       dataIndex: "employee_body",
       key: "employee_body",
+      sortOrder:
+        state.sortedInfo.columnKey === "employee_body" &&
+        state.sortedInfo.order,
+      sorter: (a, b) =>
+        alphaSort(
+          bodyshop.employees.find((e) => e.id === a.employee_body)?.first_name,
+          bodyshop.employees.find((e) => e.id === b.employee_body)?.first_name
+        ),
       render: (text, record) => (
         <ProductionListEmployeeAssignment
           record={record}
@@ -364,6 +426,14 @@ const r = ({ technician, state, activeStatuses }) => {
       title: i18n.t("jobs.fields.employee_prep"),
       dataIndex: "employee_prep",
       key: "employee_prep",
+      sortOrder:
+        state.sortedInfo.columnKey === "employee_prep" &&
+        state.sortedInfo.order,
+      sorter: (a, b) =>
+        alphaSort(
+          bodyshop.employees.find((e) => e.id === a.employee_prep)?.first_name,
+          bodyshop.employees.find((e) => e.id === b.employee_prep)?.first_name
+        ),
       render: (text, record) => (
         <ProductionListEmployeeAssignment
           record={record}
@@ -375,6 +445,13 @@ const r = ({ technician, state, activeStatuses }) => {
       title: i18n.t("jobs.fields.employee_csr"),
       dataIndex: "employee_csr",
       key: "employee_csr",
+      sortOrder:
+        state.sortedInfo.columnKey === "employee_csr" && state.sortedInfo.order,
+      sorter: (a, b) =>
+        alphaSort(
+          bodyshop.employees.find((e) => e.id === a.employee_csr)?.first_name,
+          bodyshop.employees.find((e) => e.id === b.employee_csr)?.first_name
+        ),
       render: (text, record) => (
         <ProductionListEmployeeAssignment record={record} type="employee_csr" />
       ),
@@ -383,6 +460,16 @@ const r = ({ technician, state, activeStatuses }) => {
       title: i18n.t("jobs.fields.employee_refinish"),
       dataIndex: "employee_refinish",
       key: "employee_refinish",
+      sortOrder:
+        state.sortedInfo.columnKey === "employee_refinish" &&
+        state.sortedInfo.order,
+      sorter: (a, b) =>
+        alphaSort(
+          bodyshop.employees.find((e) => e.id === a.employee_refinish)
+            ?.first_name,
+          bodyshop.employees.find((e) => e.id === b.employee_refinish)
+            ?.first_name
+        ),
       render: (text, record) => (
         <ProductionListEmployeeAssignment
           record={record}

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

@@ -1,22 +1,28 @@
 import { useMutation } from "@apollo/client";
-import { DatePicker, Dropdown, TimePicker, Button, Card } from "antd";
+import { Button, Card, Dropdown, TimePicker } from "antd";
 import moment from "moment";
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { DateFormatter } from "../../utils/DateFormatter";
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
 
-import { useTranslation } from "react-i18next";
-
-const OneCalendarDay = 60 * 60 * 24 * 1000;
-const Now = new Date();
-
-export default function ProductionListDate({ record, field, time }) {
+export default function ProductionListDate({
+  record,
+  field,
+  time,
+  pastIndicator,
+}) {
   const [updateAlert] = useMutation(UPDATE_JOB);
   const [visible, setVisible] = useState(false);
   const { t } = useTranslation();
+
   const handleChange = (date) => {
     logImEXEvent("product_toggle_date", { field });
+    // if (date.isSame(record[field] && moment(record[field]))) {
+    //   return;
+    // }
 
     //e.stopPropagation();
     updateAlert({
@@ -34,6 +40,15 @@ export default function ProductionListDate({ record, field, time }) {
     });
   };
 
+  let className = "";
+  if (pastIndicator) {
+    className =
+      !!record[field] &&
+      ((moment().isSameOrAfter(moment(record[field]), "day") &&
+        "production-completion-past") ||
+        (moment().add(1, "day").isSame(moment(record[field]), "day") &&
+          "production-completion-soon"));
+  }
   return (
     <div>
       <Dropdown
@@ -47,17 +62,19 @@ export default function ProductionListDate({ record, field, time }) {
             style={{ padding: "1rem" }}
             onClick={(e) => e.stopPropagation()}
           >
-            <DatePicker
+            <FormDatePicker
               onClick={(e) => e.stopPropagation()}
               value={(record[field] && moment(record[field])) || null}
               onChange={handleChange}
               format="MM/DD/YYYY"
+              isDateOnly={!time}
             />
             {time && (
               <TimePicker
                 onClick={(e) => e.stopPropagation()}
                 value={(record[field] && moment(record[field])) || null}
                 onChange={handleChange}
+                minuteStep={15}
                 format="hh:mm a"
               />
             )}
@@ -72,17 +89,9 @@ export default function ProductionListDate({ record, field, time }) {
           style={{
             height: "19px",
           }}
+          className={className}
         >
-          <DateFormatter
-            bordered={false}
-            className={
-              !!record[field] && new Date(record[field]) - Now < OneCalendarDay
-                ? "production-completion-1"
-                : ""
-            }
-          >
-            {record[field]}
-          </DateFormatter>
+          <DateFormatter bordered={false}>{record[field]}</DateFormatter>
         </div>
       </Dropdown>
     </div>

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

@@ -41,7 +41,11 @@ export default function ProductionListColumnDetailPriority({ record }) {
             title={t("production.actions.detailpriority-set")}
           >
             {new Array(15).fill().map((value, index) => (
-              <Menu.Item key={index + 1}>{index + 1}</Menu.Item>
+              <Menu.Item key={index + 1}>
+                <div style={{ marginLeft: "2rem", marginRight: "2rem" }}>
+                  {index + 1}
+                </div>
+              </Menu.Item>
             ))}
           </Menu.SubMenu>
         </Menu>

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

@@ -116,15 +116,17 @@ export function ProductionListEmpAssignment({
             0
           }
         >
-          {bodyshop.employees.map((emp) => (
-            <Select.Option
-              value={emp.id}
-              key={emp.id}
-              name={`${emp.first_name} ${emp.last_name}`}
-            >
-              {`${emp.first_name} ${emp.last_name}`}
-            </Select.Option>
-          ))}
+          {bodyshop.employees
+            .filter((emp) => emp.active)
+            .map((emp) => (
+              <Select.Option
+                value={emp.id}
+                key={emp.id}
+                name={`${emp.first_name} ${emp.last_name}`}
+              >
+                {`${emp.first_name} ${emp.last_name}`}
+              </Select.Option>
+            ))}
         </Select>
       </Col>
       <Col span={24}>

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

@@ -41,7 +41,11 @@ export default function ProductionListColumnPaintPriority({ record }) {
             title={t("production.actions.paintpriority-set")}
           >
             {new Array(15).fill().map((value, index) => (
-              <Menu.Item key={index + 1}>{index + 1}</Menu.Item>
+              <Menu.Item key={index + 1}>
+                <div style={{ marginLeft: "2rem", marginRight: "2rem" }}>
+                  {index + 1}
+                </div>
+              </Menu.Item>
             ))}
           </Menu.SubMenu>
         </Menu>

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

@@ -0,0 +1,63 @@
+import { useMutation } from "@apollo/client";
+import { Dropdown, Menu, Spin } from "antd";
+import React, { useState } from "react";
+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";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+export function ProductionListColumnCategory({ record, bodyshop }) {
+  const [updateJob] = useMutation(UPDATE_JOB);
+  const [loading, setLoading] = useState(false);
+
+  const handleSetStatus = async (e) => {
+    logImEXEvent("production_change_status");
+
+    setLoading(true);
+    const { key } = e;
+    await updateJob({
+      variables: {
+        jobId: record.id,
+        job: {
+          category: key,
+        },
+      },
+    });
+
+    setLoading(false);
+  };
+
+  return (
+    <Dropdown
+      overlay={
+        <Menu
+          style={{ maxHeight: "200px", overflowY: "auto" }}
+          onClick={handleSetStatus}
+        >
+          {bodyshop.md_categories.map((item) => (
+            <Menu.Item key={item}>{item}</Menu.Item>
+          ))}
+        </Menu>
+      }
+      trigger={["click"]}
+    >
+      <div style={{ width: "100%", height: "19px", cursor: "pointer" }}>
+        {record.category}
+        {loading && <Spin />}
+      </div>
+    </Dropdown>
+  );
+}
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ProductionListColumnCategory);

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

@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client";
-import { Descriptions, Drawer, Space } from "antd";
+import { Descriptions, Drawer, Space, PageHeader, Button } from "antd";
 import queryString from "query-string";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -16,8 +16,25 @@ import JobEmployeeAssignments from "../job-employee-assignments/job-employee-ass
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import ProductionRemoveButton from "../production-remove-button/production-remove-button.component";
 import JobAtChange from "../job-at-change/job-at-change.component";
+import { PrinterFilled } from "@ant-design/icons";
 
-export default function ProductionListDetail({ jobs }) {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { setModalContext } from "../../redux/modals/modals.actions";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+});
+const mapDispatchToProps = (dispatch) => ({
+  setPrintCenterContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "printCenter" })),
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ProductionListDetail);
+
+export function ProductionListDetail({ jobs, setPrintCenterContext }) {
   const search = queryString.parse(useLocation().search);
   const history = useHistory();
   const { selected } = search;
@@ -39,11 +56,29 @@ export default function ProductionListDetail({ jobs }) {
   return (
     <Drawer
       title={
-        <Space>
-          <span>{t("production.labels.jobdetail")}</span>
-          <span>{theJob.ro_number}</span>
-          <ProductionRemoveButton jobId={theJob.id} />
-        </Space>
+        <PageHeader
+          title={theJob.ro_number}
+          extra={
+            <Space>
+              <ProductionRemoveButton jobId={theJob.id} />{" "}
+              <Button
+                onClick={() => {
+                  setPrintCenterContext({
+                    actions: { refetch: refetch },
+                    context: {
+                      id: theJob.id,
+                      job: theJob,
+                      type: "job",
+                    },
+                  });
+                }}
+              >
+                <PrinterFilled />
+                {t("jobs.actions.printCenter")}
+              </Button>
+            </Space>
+          }
+        />
       }
       placement="right"
       width={"33%"}

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

@@ -4,9 +4,25 @@ import { TemplateList } from "../../utils/TemplateConstants";
 import { useTranslation } from "react-i18next";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 const ProdTemplates = TemplateList("production");
+const { production_by_technician_one, production_by_category_one } =
+  TemplateList("special");
 
-export default function ProductionListPrint() {
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ProductionListPrint);
+
+export function ProductionListPrint({ bodyshop }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   return (
@@ -33,6 +49,52 @@ export default function ProductionListPrint() {
               {ProdTemplates[key].title}
             </Menu.Item>
           ))}
+          <Menu.SubMenu
+            title={t("reportcenter.templates.production_by_technician_one")}
+          >
+            {bodyshop.employees.map((e) => (
+              <Menu.Item
+                key={e.id}
+                onClick={async () => {
+                  setLoading(true);
+                  await GenerateDocument(
+                    {
+                      name: production_by_technician_one.key,
+                      variables: { id: e.id },
+                    },
+                    {},
+                    "p"
+                  );
+                  setLoading(false);
+                }}
+              >
+                {e.first_name} {e.last_name}
+              </Menu.Item>
+            ))}
+          </Menu.SubMenu>
+          <Menu.SubMenu
+            title={t("reportcenter.templates.production_by_category_one")}
+          >
+            {bodyshop.md_categories.map((e) => (
+              <Menu.Item
+                key={e}
+                onClick={async () => {
+                  setLoading(true);
+                  await GenerateDocument(
+                    {
+                      name: production_by_category_one.key,
+                      variables: { category: e },
+                    },
+                    {},
+                    "p"
+                  );
+                  setLoading(false);
+                }}
+              >
+                {e}
+              </Menu.Item>
+            ))}
+          </Menu.SubMenu>
         </Menu>
       }
     >

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

@@ -38,6 +38,7 @@ export function ProductionListTable({
         .columns.columnKeys.map((k) => {
           return {
             ...ProductionListColumns({
+              bodyshop,
               technician,
               state,
               activeStatuses: bodyshop.md_ro_statuses.active_statuses,

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

@@ -76,6 +76,7 @@ export function ProductionListTable({
       matchingColumnConfig.columns.columnKeys.map((k) => {
         return {
           ...ProductionListColumns({
+            bodyshop,
             technician,
             state,
             activeStatuses: bodyshop.md_ro_statuses.active_statuses,
@@ -87,6 +88,12 @@ export function ProductionListTable({
   );
 
   const handleTableChange = (pagination, filters, sorter) => {
+    console.log(
+      "🚀  ~ file: production-list-table.component.jsx  ~ line 91  ~ pagination, filters, sorter",
+      pagination,
+      filters,
+      sorter
+    );
     setState({
       ...state,
       filteredInfo: filters,
@@ -264,6 +271,7 @@ export function ProductionListTable({
           columns={columns.map((c, index) => {
             return {
               ...c,
+              filteredValue: state.filteredInfo[c.key] || null,
               sortOrder:
                 state.sortedInfo.columnKey === c.key && state.sortedInfo.order,
               title: headerItem(c),

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

@@ -38,13 +38,11 @@ export default function ProductionListTableContainer() {
       updatedJobs.jobs,
       (a, b) => a.id === b.id && a.updated_at === b.updated_at
     );
-    console.log(jobDiff);
+
     if (jobDiff.length > 1) {
       getUpdatedJobsData(jobDiff.map((j) => j.id));
     } else if (jobDiff.length === 1) {
-      console.log("length was 1");
       jobDiff.forEach((job) => {
-        console.log("Job ", job);
         getUpdatedJobData(job.id);
       });
     }

client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.js

@@ -25,15 +25,20 @@ export function ScheduleCalendarHeaderGraph({ bodyshop, loadData }) {
   const { ssbuckets } = bodyshop;
 
   const data = useMemo(() => {
-    return Object.keys(loadData.expectedLoad).map((key) => {
-      const metadataBucket = ssbuckets.filter((b) => b.id === key)[0];
+    return (
+      (loadData &&
+        loadData.expectedLoad &&
+        Object.keys(loadData.expectedLoad).map((key) => {
+          const metadataBucket = ssbuckets.filter((b) => b.id === key)[0];
 
-      return {
-        bucket: loadData.expectedLoad[key].label,
-        current: loadData.expectedLoad[key].count,
-        target: metadataBucket && metadataBucket.target,
-      };
-    });
+          return {
+            bucket: loadData.expectedLoad[key].label,
+            current: loadData.expectedLoad[key].count,
+            target: metadataBucket && metadataBucket.target,
+          };
+        })) ||
+      []
+    );
   }, [loadData, ssbuckets]);
 
   const popContent = (

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

@@ -10,13 +10,18 @@ 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";
+import { selectProblemJobs } from "../../redux/application/application.selectors";
+import { Alert } from "antd";
+import { useTranslation } from "react-i18next";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
+  problemJobs: selectProblemJobs,
 });
 const localizer = momentLocalizer(moment);
 export function ScheduleCalendarWrapperComponent({
   bodyshop,
+  problemJobs,
   data,
   refetch,
   defaultView,
@@ -26,7 +31,7 @@ export function ScheduleCalendarWrapperComponent({
 }) {
   const search = queryString.parse(useLocation().search);
   const history = useHistory();
-
+  const { t } = useTranslation();
   const handleEventPropStyles = (event, start, end, isSelected) => {
     return {
       ...(event.color
@@ -48,6 +53,18 @@ export function ScheduleCalendarWrapperComponent({
   return (
     <>
       <JobDetailCards />
+      {problemJobs &&
+        problemJobs.map((problem) => (
+          <Alert
+            key={problem.id}
+            type="error"
+            message={t("appointments.labels.dataconsistency", {
+              ro_number: problem.ro_number,
+              code: problem.code,
+            })}
+          />
+        ))}
+
       <Calendar
         events={data}
         defaultView={search.view || defaultView || "week"}

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

@@ -3,8 +3,9 @@ import { Button, Card, Col, PageHeader, Row, Space } from "antd";
 import React from "react";
 import ScheduleCalendarWrapperComponent from "../schedule-calendar-wrapper/scheduler-calendar-wrapper.component";
 import ScheduleModal from "../schedule-job-modal/schedule-job-modal.container";
-//import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
+import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
 import ScheduleProductionList from "../schedule-production-list/schedule-production-list.component";
+import ScheduleVerifyIntegrity from "../schedule-verify-integrity/schedule-verify-integrity.component";
 
 export default function ScheduleCalendarComponent({ data, refetch }) {
   return (
@@ -15,6 +16,7 @@ export default function ScheduleCalendarComponent({ data, refetch }) {
         <PageHeader
           extra={
             <Space wrap>
+              <ScheduleVerifyIntegrity />
               <Button
                 onClick={() => {
                   refetch();
@@ -23,9 +25,8 @@ export default function ScheduleCalendarComponent({ data, refetch }) {
                 <SyncOutlined />
               </Button>
               <ScheduleProductionList />
-              {
-                //   <ScheduleManualEvent />
-              }
+
+              <ScheduleManualEvent />
             </Space>
           }
         />

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

@@ -10,6 +10,7 @@ import ScheduleCalendarComponent from "./schedule-calendar.component";
 import { calculateScheduleLoad } from "../../redux/application/application.actions";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import moment from "moment";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
 });
@@ -26,7 +27,12 @@ export function ScheduleCalendarContainer({ calculateScheduleLoad }) {
   const { loading, error, data, refetch } = useQuery(
     QUERY_ALL_ACTIVE_APPOINTMENTS,
     {
-      variables: { start: range.start.toDate(), end: range.end.toDate() },
+      variables: {
+        start: range.start.toDate(),
+        end: range.end.toDate(),
+        startd: range.start,
+        endd: range.end,
+      },
       skip: !!!range.start || !!!range.end,
       fetchPolicy: "network-only",
       nextFetchPolicy: "network-only",
@@ -39,15 +45,31 @@ export function ScheduleCalendarContainer({ calculateScheduleLoad }) {
 
   if (loading) return <LoadingSpinner />;
   if (error) return <AlertComponent message={error.message} type="error" />;
-  let normalizedData = data.appointments.map((e) => {
-    //Required becuase Hasura returns a string instead of a date object.
-    return Object.assign(
-      {},
-      e,
-      { start: new Date(e.start) },
-      { end: new Date(e.end) }
-    );
-  });
+  let normalizedData = [
+    ...data.appointments.map((e) => {
+      //Required becuase Hasura returns a string instead of a date object.
+      return Object.assign(
+        {},
+        e,
+        { start: new Date(e.start) },
+        { end: new Date(e.end) }
+      );
+    }),
+    ...data.employee_vacation.map((e) => {
+      //Required becuase Hasura returns a string instead of a date object.
+      return {
+        ...e,
+        title: `${
+          (e.employee.first_name && e.employee.first_name.substr(0, 1)) || ""
+        } ${e.employee.last_name || ""} OUT`,
+        color: "red",
+        start: moment(e.start).startOf("day").toDate(),
+        end: moment(e.end).startOf("day").toDate(),
+        allDay: true,
+        vacation: true,
+      };
+    }),
+  ];
 
   return (
     <ScheduleCalendarComponent

client/src/components/schedule-day-view/schedule-day-view.container.jsx

@@ -5,11 +5,14 @@ import { QUERY_APPOINTMENT_BY_DATE } from "../../graphql/appointments.queries";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import moment from "moment";
 import { useTranslation } from "react-i18next";
+
 export default function ScheduleDayViewContainer({ day }) {
   const { loading, error, data } = useQuery(QUERY_APPOINTMENT_BY_DATE, {
     variables: {
       start: moment(day).startOf("day"),
       end: moment(day).endOf("day"),
+      startd: moment(day).startOf("day").format("YYYY-MM-DD"),
+      endd: moment(day).add(1, "day").format("YYYY-MM-DD"),
     },
     skip: !moment(day).isValid(),
     fetchPolicy: "network-only",
@@ -22,15 +25,30 @@ export default function ScheduleDayViewContainer({ day }) {
   let normalizedData;
 
   if (data) {
-    normalizedData = data.appointments.map((e) => {
-      //Required becuase Hasura returns a string instead of a date object.
-      return Object.assign(
-        {},
-        e,
-        { start: new Date(e.start) },
-        { end: new Date(e.end) }
-      );
-    });
+    normalizedData = [
+      ...data.appointments.map((e) => {
+        //Required becuase Hasura returns a string instead of a date object.
+        return Object.assign(
+          {},
+          e,
+          { start: new Date(e.start) },
+          { end: new Date(e.end) }
+        );
+      }),
+      ...data.employee_vacation.map((e) => {
+        //Required becuase Hasura returns a string instead of a date object.
+        return {
+          ...e,
+          title: `${
+            (e.employee.first_name && e.employee.first_name.substr(0, 1)) || ""
+          } ${e.employee.last_name || ""} OUT`,
+          color: "red",
+          start: moment(e.start).startOf("day").toDate(),
+          end: moment(e.end).startOf("day").toDate(),
+          vacation: true,
+        };
+      }),
+    ];
   }
 
   return (

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

@@ -5,8 +5,9 @@ import {
   Input,
   Row,
   Select,
-  Space, Switch,
-  Typography
+  Space,
+  Switch,
+  Typography,
 } from "antd";
 import axios from "axios";
 import moment from "moment";
@@ -75,10 +76,14 @@ export function ScheduleJobModalComponent({
     <Row gutter={[16, 16]}>
       <Col span={12}>
         <Space>
-          <Typography.Title level={3}>{lbrHrsData?.jobs_by_pk?.ro_number}</Typography.Title>
-          <Typography.Title
-            level={4}
-          >{`B/R Hrs:${lbrHrsData?.jobs_by_pk.labhrs?.aggregate.sum.mod_lb_hrs}/${lbrHrsData?.jobs_by_pk.larhrs?.aggregate.sum.mod_lb_hrs}`}</Typography.Title>
+          <Typography.Title level={3}>
+            {lbrHrsData?.jobs_by_pk?.ro_number}
+          </Typography.Title>
+          <Typography.Title level={4}>{`B/R Hrs:${
+            lbrHrsData?.jobs_by_pk.labhrs?.aggregate?.sum?.mod_lb_hrs || 0
+          }/${
+            lbrHrsData?.jobs_by_pk.larhrs?.aggregate?.sum?.mod_lb_hrs || 0
+          }`}</Typography.Title>
         </Space>
         <LayoutFormRow grow>
           <Form.Item
@@ -183,10 +188,9 @@ export function ScheduleJobModalComponent({
         />
       </Col>
       <Col span={12}>
-        <Form.Item shouldUpdate>
+        <Form.Item shouldUpdate={(prev, cur) => prev.start !== cur.start}>
           {() => {
             const values = form.getFieldsValue();
-
             return (
               <div className="schedule-job-modal">
                 <ScheduleDayViewContainer day={values.start} />

client/src/components/schedule-manual-event/schedule-manual-event.component.jsx

@@ -1,17 +1,32 @@
 import { useMutation } from "@apollo/client";
-import { Button, Card, Form, Input, Popover, Space } from "antd";
+import { Button, Card, Form, Input, Popover, Select, Space } from "antd";
+import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
-  INSERT_APPOINTMENT,
+  INSERT_MANUAL_APPT,
   UPDATE_APPOINTMENT,
 } from "../../graphql/appointments.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 
-export default function ScheduleManualEvent({ event }) {
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ScheduleManualEvent);
+
+export function ScheduleManualEvent({ bodyshop, event }) {
   const { t } = useTranslation();
-  const [insertAppointment] = useMutation(INSERT_APPOINTMENT);
+  const [insertAppointment] = useMutation(INSERT_MANUAL_APPT);
   const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
   const [loading, setLoading] = useState(false);
   const [form] = Form.useForm();
@@ -22,26 +37,27 @@ export default function ScheduleManualEvent({ event }) {
 
   useEffect(() => {
     if (visibility && event) {
-      form.setFieldsValue({ event });
+      form.setFieldsValue(event);
     }
   }, [visibility, form, event]);
 
-  useEffect(() => {
-    //     if (entryData && entryData.scoreboard && entryData.scoreboard[0]) {
-    //       console.log("Setting FOrm");
-    //   //    form.setFieldsValue(entryData.scoreboard[0]);
-    //     }
-  }, [form]);
-
   const handleFinish = async (values) => {
-    logImEXEvent("job_close_add_to_scoreboard");
+    logImEXEvent("schedule_manual_event");
 
     setLoading(true);
     try {
       if (event && event.id) {
-        updateAppointment();
+        updateAppointment({
+          variables: { appid: event.id, app: values },
+          refetchQueries: ["QUERY_ALL_ACTIVE_APPOINTMENTS"],
+        });
       } else {
-        insertAppointment();
+        insertAppointment({
+          variables: {
+            apt: { ...values, isintake: false, bodyshopid: bodyshop.id },
+          },
+          refetchQueries: ["QUERY_ALL_ACTIVE_APPOINTMENTS"],
+        });
       }
     } catch (error) {
       console.log(error);
@@ -56,8 +72,8 @@ export default function ScheduleManualEvent({ event }) {
       <div>
         <Form form={form} layout="vertical" onFinish={handleFinish}>
           <Form.Item
-            label={t("schedule.fields.note")}
-            name="note"
+            label={t("appointments.fields.title")}
+            name="title"
             rules={[
               {
                 required: true,
@@ -67,8 +83,11 @@ export default function ScheduleManualEvent({ event }) {
           >
             <Input />
           </Form.Item>
+          <Form.Item label={t("appointments.fields.note")} name="note">
+            <Input />
+          </Form.Item>
           <Form.Item
-            label={t("schedule.fields.start")}
+            label={t("appointments.fields.start")}
             name="start"
             rules={[
               {
@@ -80,17 +99,42 @@ export default function ScheduleManualEvent({ event }) {
             <FormDateTimePickerComponent />
           </Form.Item>
           <Form.Item
-            label={t("schedule.fields.end")}
+            label={t("appointments.fields.end")}
             name="end"
             rules={[
               {
                 required: true,
                 //message: t("general.validation.required"),
               },
+              ({ getFieldValue }) => ({
+                async validator(rule, value) {
+                  if (value) {
+                    const { start } = form.getFieldsValue();
+                    if (moment(start).isAfter(moment(value))) {
+                      return Promise.reject(
+                        t("employees.labels.endmustbeafterstart")
+                      );
+                    } else {
+                      return Promise.resolve();
+                    }
+                  } else {
+                    return Promise.resolve();
+                  }
+                },
+              }),
             ]}
           >
             <FormDateTimePickerComponent />
           </Form.Item>
+          <Form.Item label={t("appointments.fields.color")} name="color">
+            <Select>
+              {bodyshop.appt_colors.map((col, idx) => (
+                <Select.Option key={idx} value={col.color.hex}>
+                  {col.label}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
 
           <Space wrap>
             <Button type="primary" htmlType="submit">
@@ -112,7 +156,9 @@ export default function ScheduleManualEvent({ event }) {
   return (
     <Popover content={overlay} visible={visibility}>
       <Button loading={loading} onClick={handleClick}>
-        {t("schedule.labels.manualevent")}
+        {event
+          ? t("appointments.actions.reschedule")
+          : t("appointments.labels.manualevent")}
       </Button>
     </Popover>
   );

client/src/components/schedule-verify-integrity/schedule-verify-integrity.component.jsx

@@ -0,0 +1,60 @@
+import { useApolloClient } from "@apollo/client";
+import { Button } from "antd";
+import moment from "moment";
+import React, { useState } from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { QUERY_SCHEDULE_LOAD_DATA } from "../../graphql/appointments.queries";
+import { selectCurrentUser } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ScheduleVerifyIntegrity);
+
+export function ScheduleVerifyIntegrity({ currentUser }) {
+  const [loading, setLoading] = useState(false);
+
+  const client = useApolloClient();
+  const handleVerify = async () => {
+    setLoading(true);
+    const {
+      data: { arrJobs, compJobs, prodJobs },
+    } = await client.query({
+      query: QUERY_SCHEDULE_LOAD_DATA,
+      variables: { start: moment(), end: moment().add(180, "days") },
+    });
+
+    //check that the leaving jobs are either in the arriving list, or in production.
+    const issues = [];
+
+    compJobs.forEach((j) => {
+      const inProdJobs = prodJobs.find((p) => p.id === j.id);
+      const inArrJobs = arrJobs.find((p) => p.id === j.id);
+
+      if (!(inProdJobs || inArrJobs)) {
+        // NOT FOUND!
+        issues.push(j);
+      }
+    });
+    console.log(
+      "The following completing jobs are not in production, or are arriving within the next 180 days. ",
+      issues
+    );
+
+    setLoading(false);
+  };
+
+  if (currentUser.email === "patrick@imex.prod")
+    return (
+      <Button loading={loading} onClick={handleVerify}>
+        Developer Use Only - Verify Schedule Integrity
+      </Button>
+    );
+  else return null;
+}

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

@@ -43,19 +43,28 @@ export function ScoreboardDisplayComponent({
   useEffect(() => {
     //Update the locals.
     async function setMomentSettings() {
-      const {
-        data: { appointments },
-      } = await client.query({
-        query: GET_BLOCKED_DAYS,
-        variables: {
-          start: moment().startOf("month"),
-          end: moment().endOf("month"),
-        },
-      });
+      let appointments;
+
+      if (!bodyshop.scoreboard_target.ignoreblockeddays) {
+        const { data } = await client.query({
+          query: GET_BLOCKED_DAYS,
+          variables: {
+            start: moment().startOf("month"),
+            end: moment().endOf("month"),
+          },
+        });
+        appointments = data.appointments;
+      }
 
       moment.updateLocale("ca", {
         workingWeekdays: translateSettingsToWorkingDays(bodyshop.workingdays),
-        holidays: appointments.map((h) => moment(h.start).format("MM-DD-YYYY")),
+        ...(appointments
+          ? {
+              holidays: appointments.map((h) =>
+                moment(h.start).format("MM-DD-YYYY")
+              ),
+            }
+          : {}),
         holidayFormat: "MM-DD-YYYY",
       });
     }

client/src/components/scoreboard-targets-table/scoreboard-targets-table.component.jsx

@@ -1,6 +1,8 @@
 import { CalendarOutlined } from "@ant-design/icons";
 import { Card, Col, Row, Statistic } from "antd";
-import React from "react";
+import _ from "lodash";
+import moment from "moment";
+import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -16,25 +18,78 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 const rowGutter = [16, 16];
-const statSpans = { xs: 24, sm: 6 };
+const statSpans = { xs: 24, sm: 3 };
 
 export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
   const { t } = useTranslation();
 
+  const values = useMemo(() => {
+    const dateHash = _.groupBy(scoreBoardlist, "date");
+    console.log(
+      "🚀 ~ file: scoreboard-targets-table.component.jsx ~ line 31 ~ values ~ dateHash",
+      dateHash
+    );
+
+    let ret = {
+      todayBody: 0,
+      todayPaint: 0,
+      weeklyPaint: 0,
+      weeklyBody: 0,
+      toDateBody: 0,
+      toDatePaint: 0,
+    };
+
+    const today = moment();
+    if (dateHash[today.format("YYYY-MM-DD")]) {
+      dateHash[today.format("YYYY-MM-DD")].forEach((d) => {
+        ret.todayBody = ret.todayBody + d.bodyhrs;
+        ret.todayPaint = ret.todayPaint + d.painthrs;
+      });
+    }
+
+    let StartOfWeek = moment().startOf("week");
+    while (StartOfWeek.isSameOrBefore(today)) {
+      if (dateHash[StartOfWeek.format("YYYY-MM-DD")]) {
+        dateHash[StartOfWeek.format("YYYY-MM-DD")].forEach((d) => {
+          ret.weeklyBody = ret.weeklyBody + d.bodyhrs;
+          ret.weeklyPaint = ret.weeklyPaint + d.painthrs;
+        });
+      }
+      StartOfWeek = StartOfWeek.add(1, "day");
+    }
+
+    let startOfMonth = moment().startOf("month");
+    while (startOfMonth.isSameOrBefore(today)) {
+      if (dateHash[startOfMonth.format("YYYY-MM-DD")]) {
+        dateHash[startOfMonth.format("YYYY-MM-DD")].forEach((d) => {
+          ret.toDateBody = ret.toDateBody + d.bodyhrs;
+          ret.toDatePaint = ret.toDatePaint + d.painthrs;
+        });
+      }
+      startOfMonth = startOfMonth.add(1, "day");
+    }
+
+    return ret;
+  }, [scoreBoardlist]);
+  console.log(
+    "🚀 ~ file: scoreboard-targets-table.component.jsx ~ line 51 ~ values ~ values",
+    values
+  );
+
   return (
     <Card
       title={t("scoreboard.labels.targets")}
       extra={<ScoreboardJobsList scoreBoardlist={scoreBoardlist} />}
     >
       <Row gutter={rowGutter}>
-        <Col xs={24} sm={{ offset: 0, span: 4 }} lg={{ offset: 5, span: 4 }}>
+        <Col xs={24} sm={{ offset: 0, span: 4 }} lg={{ span: 4 }}>
           <Statistic
             title={t("scoreboard.labels.workingdays")}
             value={Util.CalculateWorkingDaysThisMonth()}
             prefix={<CalendarOutlined />}
           />
         </Col>
-        <Col xs={24} sm={{ offset: 0, span: 20 }} lg={{ offset: 0, span: 13 }}>
+        <Col xs={24} sm={{ offset: 0, span: 20 }} lg={{ offset: 0, span: 20 }}>
           <Row>
             <Col {...statSpans}>
               <Statistic
@@ -43,6 +98,12 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
                 prefix="B"
               />
             </Col>
+            <Col {...statSpans}>
+              <Statistic
+                title={t("scoreboard.labels.dailyactual")}
+                value={values.todayBody.toFixed(1)}
+              />
+            </Col>
             <Col {...statSpans}>
               <Statistic
                 title={t("scoreboard.labels.weeklytarget")}
@@ -52,6 +113,12 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
                 )}
               />
             </Col>
+            <Col {...statSpans}>
+              <Statistic
+                title={t("scoreboard.labels.weeklyactual")}
+                value={values.weeklyBody.toFixed(1)}
+              />
+            </Col>
             <Col {...statSpans}>
               <Statistic
                 title={t("scoreboard.labels.monthlytarget")}
@@ -70,6 +137,12 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
                 )}
               />
             </Col>
+            <Col {...statSpans}>
+              <Statistic
+                title={t("scoreboard.labels.todateactual")}
+                value={values.toDateBody.toFixed(1)}
+              />
+            </Col>
           </Row>
           <Row>
             <Col {...statSpans}>
@@ -78,6 +151,9 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
                 prefix="P"
               />
             </Col>
+            <Col {...statSpans}>
+              <Statistic value={values.todayPaint.toFixed(1)} />
+            </Col>
             <Col {...statSpans}>
               <Statistic
                 value={Util.WeeklyTargetHrs(
@@ -86,6 +162,9 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
                 )}
               />
             </Col>
+            <Col {...statSpans}>
+              <Statistic value={values.weeklyPaint.toFixed(1)} />
+            </Col>
             <Col {...statSpans}>
               <Statistic
                 value={Util.MonthlyTargetHrs(
@@ -102,6 +181,9 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
                 )}
               />
             </Col>
+            <Col {...statSpans}>
+              <Statistic value={values.toDatePaint.toFixed(1)} />
+            </Col>
           </Row>
         </Col>
       </Row>

client/src/components/shop-employees/shop-employees-add-vacation.component.jsx

@@ -0,0 +1,124 @@
+import { useMutation } from "@apollo/client";
+import { Button, Card, Form, notification, Popover, Space } from "antd";
+import moment from "moment";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { INSERT_VACATION } from "../../graphql/employees.queries";
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
+
+export default function ShopEmployeeAddVacation({ employee }) {
+  const { t } = useTranslation();
+  const [insertVacation] = useMutation(INSERT_VACATION);
+
+  const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
+  const [visibility, setVisibility] = useState(false);
+
+  const handleFinish = async (values) => {
+    logImEXEvent("employee_add_vacation");
+
+    setLoading(true);
+    let result;
+
+    result = await insertVacation({
+      variables: { vacation: { ...values, employeeid: employee.id } },
+      update(cache, { data }) {
+        cache.modify({
+          id: cache.identify({ id: employee.id, __typename: "employees" }),
+          fields: {
+            employee_vacations(ex) {
+              return [data.insert_employee_vacation_one, ...ex];
+            },
+          },
+        });
+      },
+    });
+
+    if (!!result.errors) {
+      notification["error"]({
+        message: t("employees.errors.adding", {
+          message: JSON.stringify(result.errors),
+        }),
+      });
+    } else {
+      notification["success"]({
+        message: t("employees.successes.added"),
+      });
+    }
+    setLoading(false);
+    setVisibility(false);
+  };
+
+  const overlay = (
+    <Card>
+      <Form form={form} layout="vertical" onFinish={handleFinish}>
+        <Form.Item
+          label={t("employees.fields.vacation.start")}
+          name="start"
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <FormDatePicker />
+        </Form.Item>
+        <Form.Item
+          label={t("employees.fields.vacation.end")}
+          name="end"
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+            ({ getFieldValue }) => ({
+              async validator(rule, value) {
+                if (value) {
+                  const { start } = form.getFieldsValue();
+                  if (moment(start).isAfter(moment(value))) {
+                    return Promise.reject(
+                      t("employees.labels.endmustbeafterstart")
+                    );
+                  } else {
+                    return Promise.resolve();
+                  }
+                } else {
+                  return Promise.resolve();
+                }
+              },
+            }),
+          ]}
+        >
+          <FormDatePicker />
+        </Form.Item>
+
+        <Space wrap>
+          <Button type="primary" htmlType="submit">
+            {t("general.actions.save")}
+          </Button>
+          <Button onClick={() => setVisibility(false)}>
+            {t("general.actions.cancel")}
+          </Button>
+        </Space>
+      </Form>
+    </Card>
+  );
+
+  const handleClick = (e) => {
+    setVisibility(true);
+  };
+
+  return (
+    <Popover content={overlay} visible={visibility}>
+      <Button
+        loading={loading}
+        disabled={!employee?.active}
+        onClick={handleClick}
+      >
+        {t("employees.actions.addvacation")}
+      </Button>
+    </Popover>
+  );
+}

client/src/components/shop-employees/shop-employees-form.component.jsx

@@ -1,20 +1,41 @@
 import { DeleteFilled } from "@ant-design/icons";
-import { Button, Card, Form, Input, InputNumber, Select, Switch } from "antd";
+import { useApolloClient, useMutation, useQuery } from "@apollo/client";
+import {
+  Button,
+  Card,
+  Form,
+  Input,
+  InputNumber,
+  notification,
+  Select,
+  Switch,
+  Table,
+} from "antd";
+import { useForm } from "antd/es/form/Form";
 import moment from "moment";
+import querystring from "query-string";
 import React, { useEffect } from "react";
-import { useApolloClient } from "@apollo/client";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   CHECK_EMPLOYEE_NUMBER,
+  DELETE_VACATION,
+  INSERT_EMPLOYEES,
+  QUERY_EMPLOYEE_BY_ID,
   QUERY_USERS_BY_EMAIL,
+  UPDATE_EMPLOYEE,
 } from "../../graphql/employees.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import CiecaSelect from "../../utils/Ciecaselect";
+import { DateFormatter } from "../../utils/DateFormatter";
+import AlertComponent from "../alert/alert.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-import CiecaSelect from "../../utils/Ciecaselect";
+import ShopEmployeeAddVacation from "./shop-employees-add-vacation.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -23,20 +44,129 @@ const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-export function ShopEmployeesFormComponent({
-  bodyshop,
-  form,
-  selectedEmployee,
-  handleFinish,
-}) {
+export function ShopEmployeesFormComponent({ bodyshop }) {
   const { t } = useTranslation();
+  const [form] = useForm();
+  const history = useHistory();
+  const search = querystring.parse(useLocation().search);
+  const [deleteVacation] = useMutation(DELETE_VACATION);
+  const { error, data } = useQuery(QUERY_EMPLOYEE_BY_ID, {
+    variables: { id: search.employeeId },
+    skip: !search.employeeId || search.employeeId === "new",
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+  });
 
   const client = useApolloClient();
   useEffect(() => {
-    if (selectedEmployee) form.resetFields();
-  }, [selectedEmployee, form]);
+    if (data && data.employees_by_pk) form.setFieldsValue(data.employees_by_pk);
+    else {
+      form.resetFields();
+    }
+  }, [form, data, search.employeeId]);
 
-  if (!selectedEmployee) return null;
+  const [updateEmployee] = useMutation(UPDATE_EMPLOYEE);
+  const [insertEmployees] = useMutation(INSERT_EMPLOYEES);
+
+  const handleFinish = (values) => {
+    if (search.employeeId && search.employeeId !== "new") {
+      //Update a record.
+      logImEXEvent("shop_employee_update");
+
+      updateEmployee({
+        variables: {
+          id: search.employeeId,
+          employee: {
+            ...values,
+            user_email: values.user_email === "" ? null : values.user_email,
+          },
+        },
+      })
+        .then((r) => {
+          notification["success"]({
+            message: t("employees.successes.save"),
+          });
+        })
+        .catch((error) => {
+          notification["error"]({
+            message: t("employees.errors.save", {
+              message: JSON.stringify(error),
+            }),
+          });
+        });
+    } else {
+      //New record, insert it.
+      logImEXEvent("shop_employee_insert");
+
+      insertEmployees({
+        variables: { employees: [{ ...values, shopid: bodyshop.id }] },
+        refetchQueries: ["QUERY_EMPLOYEES"],
+      }).then((r) => {
+        search.employeeId = r.data.insert_employees.returning[0].id;
+        history.push({ search: querystring.stringify(search) });
+        notification["success"]({
+          message: t("employees.successes.save"),
+        });
+      });
+    }
+  };
+
+  if (!search.employeeId) return null;
+  if (error) return <AlertComponent message={error.message} type="error" />;
+
+  const columns = [
+    {
+      title: t("employees.fields.vacation.start"),
+      dataIndex: "start",
+      key: "start",
+      render: (text, record) => <DateFormatter>{text}</DateFormatter>,
+    },
+    {
+      title: t("employees.fields.vacation.end"),
+      dataIndex: "end",
+      key: "end",
+      render: (text, record) => <DateFormatter>{text}</DateFormatter>,
+    },
+    {
+      title: t("employees.fields.vacation.length"),
+      dataIndex: "length",
+      key: "length",
+      render: (text, record) =>
+        moment(record.end).diff(moment(record.start), "days", true).toFixed(1),
+    },
+    {
+      title: t("general.labels.actions"),
+      dataIndex: "actions",
+      key: "actions",
+      render: (text, record) => (
+        <Button
+          onClick={async () => {
+            await deleteVacation({
+              variables: { id: record.id },
+              update(cache) {
+                cache.modify({
+                  id: cache.identify({
+                    id: data.employees_by_pk.id,
+                    __typename: "employees",
+                  }),
+
+                  fields: {
+                    employee_vacations(ex, { readField }) {
+                      return ex.filter(
+                        (vacaref) => record.id !== readField("id", vacaref)
+                      );
+                    },
+                  },
+                });
+              },
+            });
+          }}
+        >
+          <DeleteFilled />
+        </Button>
+      ),
+    },
+  ];
 
   return (
     <Card
@@ -51,15 +181,6 @@ export function ShopEmployeesFormComponent({
         autoComplete={"off"}
         layout="vertical"
         form={form}
-        initialValues={{
-          ...selectedEmployee,
-          hire_date: selectedEmployee.hire_date
-            ? moment(selectedEmployee.hire_date)
-            : null,
-          termination_date: selectedEmployee.termination_date
-            ? moment(selectedEmployee.termination_date)
-            : null,
-        }}
       >
         <LayoutFormRow>
           <Form.Item
@@ -288,6 +409,15 @@ export function ShopEmployeesFormComponent({
           }}
         </Form.List>
       </Form>
+
+      <Table
+        title={() => (
+          <ShopEmployeeAddVacation employee={data && data.employees_by_pk} />
+        )}
+        columns={columns}
+        rowKey={"id"}
+        dataSource={data ? data.employees_by_pk.employee_vacations : []}
+      />
     </Card>
   );
 }

client/src/components/shop-employees/shop-employees-list.component.jsx

@@ -1,19 +1,22 @@
 import { Button, Table } from "antd";
+import queryString from "query-string";
 import React from "react";
 import { useTranslation } from "react-i18next";
-export default function ShopEmployeesListComponent({
-  loading,
-  employees,
-  selectedEmployee,
-  setSelectedEmployee,
-  handleDelete,
-}) {
+import { useHistory, useLocation } from "react-router-dom";
+
+export default function ShopEmployeesListComponent({ loading, employees }) {
   const { t } = useTranslation();
+  const history = useHistory();
+  const search = queryString.parse(useLocation().search);
 
   const handleOnRowClick = (record) => {
     if (record) {
-      setSelectedEmployee(record);
-    } else setSelectedEmployee({});
+      search.employeeId = record.id;
+      history.push({ search: queryString.stringify(search) });
+    } else {
+      delete search.employeeId;
+      history.push({ search: queryString.stringify(search) });
+    }
   };
   const columns = [
     {
@@ -41,18 +44,6 @@ export default function ShopEmployeesListComponent({
           ? t("employees.labels.flat_rate")
           : t("employees.labels.straight_time"),
     },
-    // {
-    //   title: t("employees.labels.actions"),
-    //   dataIndex: "actions",
-    //   key: "actions",
-    //   render: (text, record) => (
-    //     <div>
-    //       <Button key="delete" onClick={() => handleDelete(record.id)}>
-    //         {t("general.actions.delete")}
-    //       </Button>
-    //     </div>
-    //   )
-    // }
   ];
   return (
     <div>
@@ -62,7 +53,8 @@ export default function ShopEmployeesListComponent({
             <Button
               type="primary"
               onClick={() => {
-                setSelectedEmployee({});
+                search.employeeId = "new";
+                history.push({ search: queryString.stringify(search) });
               }}
             >
               {t("employees.actions.new")}
@@ -76,10 +68,11 @@ export default function ShopEmployeesListComponent({
         dataSource={employees}
         rowSelection={{
           onSelect: (props) => {
-            setSelectedEmployee(props);
+            search.employeeId = props.id;
+            history.push({ search: queryString.stringify(search) });
           },
           type: "radio",
-          selectedRowKeys: [(selectedEmployee && selectedEmployee.id) || null],
+          selectedRowKeys: [search.employeeId],
         }}
         onRow={(record, rowIndex) => {
           return {

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

@@ -1,29 +0,0 @@
-import React from "react";
-import ShopEmployeesFormComponent from "./shop-employees-form.component";
-import ShopEmployeesListComponent from "./shop-employees-list.component";
-export default function ShopEmployeeComponent({
-  form,
-  loading,
-  employees,
-  employeeState,
-  handleFinish,
-  handleDelete
-}) {
-  const [selectedEmployee, setSelectedEmployee] = employeeState;
-  return (
-    <div>
-      <ShopEmployeesListComponent
-        employees={employees}
-        loading={loading}
-        selectedEmployee={selectedEmployee}
-        setSelectedEmployee={setSelectedEmployee}
-        handleDelete={handleDelete}
-      />
-      <ShopEmployeesFormComponent
-        handleFinish={handleFinish}
-        form={form}
-        selectedEmployee={selectedEmployee}
-      />
-    </div>
-  );
-}

client/src/components/shop-employees/shop-employees.container.jsx

@@ -1,120 +1,36 @@
-import { useMutation, useQuery } from "@apollo/client";
-import { Form, notification } from "antd";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
+import { useQuery } from "@apollo/client";
+import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import {
-  DELETE_EMPLOYEE,
-  INSERT_EMPLOYEES,
-  QUERY_EMPLOYEES,
-  UPDATE_EMPLOYEE,
-} from "../../graphql/employees.queries";
+import { QUERY_EMPLOYEES } from "../../graphql/employees.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
-import ShopEmployeeComponent from "./shop-employees.component";
+import ShopEmployeesFormComponent from "./shop-employees-form.component";
+import ShopEmployeesListComponent from "./shop-employees-list.component";
+import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 
 function ShopEmployeesContainer({ bodyshop }) {
-  const [form] = Form.useForm();
-  const { t } = useTranslation();
-  const employeeState = useState(null);
-  const { loading, error, data, refetch } = useQuery(QUERY_EMPLOYEES, {
+  const { loading, error, data } = useQuery(QUERY_EMPLOYEES, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
   });
 
-  const [updateEmployee] = useMutation(UPDATE_EMPLOYEE);
-  const [insertEmployees] = useMutation(INSERT_EMPLOYEES);
-  const [deleteEmployee] = useMutation(DELETE_EMPLOYEE);
-
-  const handleDelete = (id) => {
-    logImEXEvent("shop_employee_delete");
-
-    deleteEmployee({ variables: { id: id } })
-      .then((r) => {
-        notification["success"]({
-          message: t("employees.successes.delete"),
-        });
-
-        employeeState[1](null);
-        refetch().then((r) => form.resetFields());
-      })
-      .catch((error) => {
-        notification["error"]({
-          message: t("employees.errors.delete", {
-            message: JSON.stringify(error),
-          }),
-        });
-      });
-  };
-
-  const handleFinish = (values) => {
-    if (employeeState[0].id) {
-      //Update a record.
-      logImEXEvent("shop_employee_update");
-
-      updateEmployee({
-        variables: {
-          id: employeeState[0].id,
-          employee: {
-            ...values,
-            user_email: values.user_email === "" ? null : values.user_email,
-          },
-        },
-      })
-        .then((r) => {
-          notification["success"]({
-            message: t("employees.successes.save"),
-          });
-
-          employeeState[1](null);
-          refetch().then((r) => form.resetFields());
-        })
-        .catch((error) => {
-          notification["error"]({
-            message: t("employees.errors.save", {
-              message: JSON.stringify(error),
-            }),
-          });
-        });
-    } else {
-      //New record, insert it.
-      logImEXEvent("shop_employee_insert");
-
-      insertEmployees({
-        variables: { employees: [{ ...values, shopid: bodyshop.id }] },
-      }).then((r) => {
-        notification["success"]({
-          message: t("employees.successes.save"),
-        });
-        employeeState[1](null);
-        refetch().catch((error) => {
-          notification["error"]({
-            message: t("employees.errors.save", {
-              message: JSON.stringify(error),
-            }),
-          });
-        });
-      });
-    }
-  };
-
   if (error) return <AlertComponent message={error.message} type="error" />;
 
   return (
-    <ShopEmployeeComponent
-      handleFinish={handleFinish}
-      handleDelete={handleDelete}
-      form={form}
-      loading={loading}
-      employeeState={employeeState}
-      employees={data ? data.employees : []}
-    />
+    <div>
+      <RbacWrapper action="employees:page">
+        <ShopEmployeesListComponent
+          employees={data ? data.employees : []}
+          loading={loading}
+        />
+        <ShopEmployeesFormComponent />
+      </RbacWrapper>
+    </div>
   );
 }
 export default connect(mapStateToProps, null)(ShopEmployeesContainer);

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

@@ -19,6 +19,9 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 
+import momentTZ from "moment-timezone";
+const timeZonesList = momentTZ.tz.names();
+
 export default function ShopInfoGeneral({ form }) {
   const { t } = useTranslation();
   return (
@@ -84,6 +87,7 @@ export default function ShopInfoGeneral({ form }) {
         <Form.Item label={t("bodyshop.fields.email")} name="email">
           <Input />
         </Form.Item>
+
         <Form.Item
           label={t("bodyshop.fields.phone")}
           name="phone"
@@ -97,6 +101,23 @@ export default function ShopInfoGeneral({ form }) {
         <Form.Item label={t("bodyshop.fields.website")} name="website">
           <Input />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.timezone")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name="timezone"
+        >
+          <Select
+            showSearch
+            options={timeZonesList.map((z) => {
+              return { label: z, value: z };
+            })}
+          />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.insurance_vendor_id")}
           name="insurance_vendor_id"
@@ -354,6 +375,13 @@ export default function ShopInfoGeneral({ form }) {
         >
           <InputNumber min={0} max={12} precision={0} />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.ignoreblockeddays")}
+          name={["scoreboard_target", "ignoreblockeddays"]}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.prodtargethrs")}
           name={["prodtargethrs"]}
@@ -472,7 +500,6 @@ export default function ShopInfoGeneral({ form }) {
           label={t("bodyshop.fields.md_email_cc", { template: "parts_order" })}
           rules={[
             {
-             
               //message: t("general.validation.required"),
               type: "array",
             },
@@ -492,7 +519,6 @@ export default function ShopInfoGeneral({ form }) {
           label={t("bodyshop.fields.md_ded_notes")}
           rules={[
             {
-        
               //message: t("general.validation.required"),
               type: "array",
             },

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

@@ -180,6 +180,12 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
             ))}
           </Select>
         </Form.Item>
+        <Form.Item
+          name={["intakechecklist", "next_contact_hours"]}
+          label={t("bodyshop.fields.intake.next_contact_hours")}
+        >
+          <InputNumber min={0} precision={0} />
+        </Form.Item>
       </SelectorDiv>
 
       <LayoutFormRow header={t("bodyshop.labels.deliverchecklist")}>

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

@@ -75,9 +75,17 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
     <div>
       {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
         <>
-          <DataLabel label={t("bodyshop.labels.dms.cdk_dealerid")}>
-            {form.getFieldValue("cdk_dealerid")}
-          </DataLabel>
+          {bodyshop.cdk_dealerid && (
+            <DataLabel label={t("bodyshop.labels.dms.cdk_dealerid")}>
+              {form.getFieldValue("cdk_dealerid")}
+            </DataLabel>
+          )}
+          {bodyshop.pbs_serialnumber && (
+            <DataLabel label={t("bodyshop.labels.dms.pbs_serialnumber")}>
+              {form.getFieldValue("pbs_serialnumber")}
+            </DataLabel>
+          )}
+
           <LayoutFormRow>
             <Form.Item
               label={t("bodyshop.fields.dms.default_journal")}
@@ -121,6 +129,15 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
             >
               <Input />
             </Form.Item>
+            {bodyshop.pbs_serialnumber && (
+              <Form.Item
+                label={t("bodyshop.fields.dms.disablecontactvehiclecreation")}
+                valuePropName="checked"
+                name={["pbs_configuration", "disablecontactvehicle"]}
+              >
+                <Switch />
+              </Form.Item>
+            )}
           </LayoutFormRow>
           <LayoutFormRow header={t("bodyshop.labels.dms.cdk.payers")}>
             <Form.List name={["cdk_configuration", "payers"]}>
@@ -158,11 +175,11 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                             label={t("jobs.fields.dms.payer.control_type")}
                             key={`${index}control_type`}
                             name={[field.name, "control_type"]}
-                            rules={[
-                              {
-                                required: true,
-                              },
-                            ]}
+                            // rules={[
+                            //   {
+                            //     required: true,
+                            //   },
+                            // ]}
                           >
                             <Select showSearch>
                               <Select.Option value="ro_number">

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

@@ -49,9 +49,13 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
           <Select>
             {emps &&
               emps.rates.map((item) => (
-                <Select.Option key={item.cost_center}>
+                <Select.Option key={item.cost_center} value={item.cost_center}>
                   {item.cost_center === "timetickets.labels.shift"
                     ? t(item.cost_center)
+                    : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                    ? t(
+                        `joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`
+                      )
                     : item.cost_center}
                 </Select.Option>
               ))}

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

@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client";
-import { Button, Card, Form, notification } from "antd";
+import { Button, Card, Form, notification, Space } from "antd";
 import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -9,6 +9,7 @@ import { INSERT_NEW_TIME_TICKET } from "../../graphql/timetickets.queries";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import TechClockInComponent from "./tech-job-clock-in-form.component";
+import TechJobPrintTickets from "../tech-job-print-tickets/tech-job-print-tickets.component";
 
 const mapStateToProps = createStructuredSelector({
   technician: selectTechnician,
@@ -36,14 +37,17 @@ export function TechClockInContainer({ technician, bodyshop }) {
             clockon: theTime,
             jobid: values.jobid,
             cost_center: values.cost_center,
-            ciecacode: Object.keys(
-              bodyshop.md_responsibility_centers.defaults.costs
-            ).find((key) => {
-              return (
-                bodyshop.md_responsibility_centers.defaults.costs[key] ===
-                values.cost_center
-              );
-            }),
+            ciecacode:
+              bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                ? values.cost_center
+                : Object.keys(
+                    bodyshop.md_responsibility_centers.defaults.costs
+                  ).find((key) => {
+                    return (
+                      bodyshop.md_responsibility_centers.defaults.costs[key] ===
+                      values.cost_center
+                    );
+                  }),
           },
         ],
       },
@@ -68,9 +72,16 @@ export function TechClockInContainer({ technician, bodyshop }) {
     <Card
       title={t("timetickets.labels.clockintojob")}
       extra={
-        <Button type="primary" onClick={() => form.submit()} loading={loading}>
-          {t("timetickets.actions.clockin")}
-        </Button>
+        <Space wrap>
+          <TechJobPrintTickets />
+          <Button
+            type="primary"
+            onClick={() => form.submit()}
+            loading={loading}
+          >
+            {t("timetickets.actions.clockin")}
+          </Button>
+        </Space>
       }
     >
       <Form form={form} layout="vertical" onFinish={handleFinish}>

client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx

@@ -55,6 +55,20 @@ export function TechClockOffButton({
         timeticket: {
           clockoff: (await axios.post("/utils/time")).data,
           ...values,
+          rate: emps && emps.rates.filter(
+            (r) => r.cost_center === values.cost_center
+          )[0]?.rate,
+          ciecacode:
+            bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+              ? values.cost_center
+              : Object.keys(
+                  bodyshop.md_responsibility_centers.defaults.costs
+                ).find((key) => {
+                  return (
+                    bodyshop.md_responsibility_centers.defaults.costs[key] ===
+                    values.cost_center
+                  );
+                }),
         },
       },
     });
@@ -141,6 +155,10 @@ export function TechClockOffButton({
                       <Select.Option key={item.cost_center}>
                         {item.cost_center === "timetickets.labels.shift"
                           ? t(item.cost_center)
+                          : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                          ? t(
+                              `joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`
+                            )
                           : item.cost_center}
                       </Select.Option>
                     ))

client/src/components/tech-job-print-tickets/tech-job-print-tickets.component.jsx

@@ -0,0 +1,125 @@
+import { Button, Card, DatePicker, Form, Popover, Space } from "antd";
+import moment from "moment";
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
+import DatePIckerRanges from "../../utils/DatePickerRanges";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
+
+const mapStateToProps = createStructuredSelector({
+  technician: selectTechnician,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TechJobPrintTickets);
+
+export function TechJobPrintTickets({ technician, event }) {
+  const { t } = useTranslation();
+
+  const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
+  const [visibility, setVisibility] = useState(false);
+
+  useEffect(() => {
+    if (visibility && event) {
+      form.setFieldsValue(event);
+    }
+  }, [visibility, form, event]);
+
+  const handleFinish = async (values) => {
+    logImEXEvent("schedule_manual_event");
+
+    setLoading(true);
+    const start = values.dates[0];
+    const end = values.dates[1];
+
+    try {
+      await GenerateDocument(
+        {
+          name: TemplateList().timetickets_employee.key,
+          variables: {
+            ...(start
+              ? { start: moment(start).startOf("day").format("YYYY-MM-DD") }
+              : {}),
+            ...(end
+              ? { end: moment(end).endOf("day").format("YYYY-MM-DD") }
+              : {}),
+            ...(start ? { starttz: moment(start).startOf("day") } : {}),
+            ...(end ? { endtz: moment(end).endOf("day") } : {}),
+
+            id: technician.id,
+          },
+        },
+        {
+          to: technician.email,
+          subject: TemplateList().timetickets_employee.subject,
+        },
+        "p"
+      );
+    } catch (error) {
+      console.log(error);
+    } finally {
+      setLoading(false);
+      setVisibility(false);
+      form.resetFields();
+    }
+  };
+
+  const overlay = (
+    <Card>
+      <div>
+        <Form form={form} layout="vertical" onFinish={handleFinish}>
+          <Form.Item
+            label={t("reportcenter.labels.dates")}
+            name="dates"
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <DatePicker.RangePicker
+              ranges={DatePIckerRanges}
+              format={"MM/DD/YYYY"}
+            />
+          </Form.Item>
+
+          <Space wrap>
+            <Button type="primary" onClick={() => form.submit()}>
+              {t("general.actions.print")}
+            </Button>
+            <Button
+              onClick={() => {
+                setVisibility(false);
+                form.resetFields();
+              }}
+            >
+              {t("general.actions.cancel")}
+            </Button>
+          </Space>
+        </Form>
+      </div>
+    </Card>
+  );
+
+  const handleClick = (e) => {
+    setVisibility(true);
+  };
+
+  return (
+    <Popover content={overlay} visible={visibility}>
+      <Button loading={loading} onClick={handleClick}>
+        {t("general.actions.print")}
+      </Button>
+    </Popover>
+  );
+}

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

@@ -76,6 +76,21 @@ export function TimeTicketList({
         state.sortedInfo.columnKey === "employee" && state.sortedInfo.order,
       render: (text, record) =>
         `${record.employee.first_name} ${record.employee.last_name}`,
+      filters:
+        timetickets
+          .map((l) => l.employeeid)
+          .filter(onlyUnique)
+          .map((s) => {
+            return {
+              text: (() => {
+                const emp = bodyshop.employees.find((e) => e.id === s);
+
+                return `${emp.first_name} ${emp.last_name}`;
+              })(), //
+              value: [s],
+            };
+          }) || [],
+      onFilter: (value, record) => value.includes(record.employeeid),
     },
     {
       title: t("timetickets.fields.cost_center"),

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

@@ -159,8 +159,10 @@ export function TimeTicketModalComponent({
           name="flat_rate"
           label={t("timetickets.fields.flat_rate")}
           valuePropName="checked"
+          noStyle
+          style={{ display: "none" }}
         >
-          <Switch />
+          <Switch style={{ display: "none" }} />
         </Form.Item>
       </LayoutFormRow>
 
@@ -208,10 +210,11 @@ export function TimeTicketModalComponent({
         >
           <InputNumber min={0} precision={1} />
         </Form.Item>
-        {isEdit && (
+        {
           <>
             <Form.Item label={t("timetickets.fields.clockon")} name="clockon">
               <FormDateTimePicker
+                minuteStep={5}
                 disabled={
                   !HasRbacAccess({
                     bodyshop,
@@ -221,8 +224,31 @@ export function TimeTicketModalComponent({
                 }
               />
             </Form.Item>
-            <Form.Item label={t("timetickets.fields.clockoff")} name="clockoff">
+            <Form.Item
+              label={t("timetickets.fields.clockoff")}
+              name="clockoff"
+              rules={[
+                ({ getFieldValue }) => ({
+                  validator(rule, value) {
+                    const clockon = getFieldValue("clockon");
+
+                    if (!value) return Promise.resolve();
+                    if (!clockon && value)
+                      return Promise.reject(
+                        t("timetickets.validation.clockoffwithoutclockon")
+                      );
+                    if (!value.isSameOrAfter(clockon))
+                      return Promise.reject(
+                        t("timetickets.validation.clockoffmustbeafterclockon")
+                      );
+
+                    return Promise.resolve();
+                  },
+                }),
+              ]}
+            >
               <FormDateTimePicker
+                minuteStep={5}
                 disabled={
                   !HasRbacAccess({
                     bodyshop,
@@ -233,7 +259,7 @@ export function TimeTicketModalComponent({
               />
             </Form.Item>
           </>
-        )}
+        }
 
         <Form.Item label={t("timetickets.fields.memo")} name="memo">
           <MemoInput />

client/src/components/time-tickets-payroll-table/time-tickets-payroll-table.component.jsx

@@ -0,0 +1,41 @@
+import { Button } from "antd";
+import queryString from "query-string";
+import React, { useState } from "react";
+import { useLocation } from "react-router-dom";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
+import { useTranslation } from "react-i18next";
+import moment from "moment";
+const PayrollTemplate = TemplateList("special").exported_payroll;
+export default function TimeTicketsPayrollTable() {
+  const searchParams = queryString.parse(useLocation().search);
+  const { start, end } = searchParams;
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+
+  const handleClick = async () => {
+    setLoading(true);
+
+    await GenerateDocument(
+      {
+        name: PayrollTemplate.key,
+        variables: {
+          start: start
+            ? start
+            : moment().startOf("week").subtract(7, "days").format("YYYY-MM-DD"),
+          end: end ? end : moment().endOf("week").format("YYYY-MM-DD"),
+        },
+      },
+      {},
+      "x"
+    );
+
+    setLoading(false);
+  };
+
+  return (
+    <Button loading={loading} onClick={handleClick}>
+      {t("printcenter.payments.exported_payroll")}
+    </Button>
+  );
+}

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

@@ -1,12 +1,13 @@
 import { HeartOutlined } from "@ant-design/icons";
-import { Select, Tag } from "antd";
+import { Select, Space, Tag } from "antd";
 import React, { forwardRef, useEffect, useState } from "react";
+import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 const { Option } = Select;
 
 //To be used as a form element only.
 
 const VendorSearchSelect = (
-  { value, onChange, options, onSelect, disabled, preferredMake },
+  { value, onChange, options, onSelect, disabled, preferredMake, showPhone },
   ref
 ) => {
   const [option, setOption] = useState(value);
@@ -35,6 +36,7 @@ const VendorSearchSelect = (
       style={{
         width: "100%",
       }}
+      dropdownMatchSelectWidth={false}
       onChange={setOption}
       optionFilterProp="name"
       onSelect={onSelect}
@@ -50,10 +52,15 @@ const VendorSearchSelect = (
             >
               <div className="imex-flex-row">
                 <div style={{ flex: 1 }}>{o.name}</div>
-                <HeartOutlined />
-                {o.discount && o.discount !== 0 ? (
-                  <Tag color="green">{`${o.discount * 100}%`}</Tag>
-                ) : null}
+                <Space style={{ marginLeft: "1rem" }}>
+                  <HeartOutlined style={{ color: "red" }} />
+                  {o.phone && showPhone && (
+                    <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>
+                  )}
+                  {o.discount && o.discount !== 0 ? (
+                    <Tag color="green">{`${o.discount * 100}%`}</Tag>
+                  ) : null}
+                </Space>
               </div>
             </Option>
           ))
@@ -64,9 +71,14 @@ const VendorSearchSelect = (
               <div className="imex-flex-row" style={{ width: "100%" }}>
                 <div style={{ flex: 1 }}>{o.name}</div>
 
-                {o.discount && o.discount !== 0 ? (
-                  <Tag color="green">{`${o.discount * 100}%`}</Tag>
-                ) : null}
+                <Space style={{ marginLeft: "1rem" }}>
+                  {o.phone && showPhone && (
+                    <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>
+                  )}
+                  {o.discount && o.discount !== 0 ? (
+                    <Tag color="green">{`${o.discount * 100}%`}</Tag>
+                  ) : null}
+                </Space>
               </div>
             </Option>
           ))

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

@@ -32,7 +32,9 @@ export default function VendorsFormComponent({
   return (
     <div>
       <PageHeader
-        title={form.getFieldValue("name")}
+        title={
+          <Form.Item shouldUpdate>{() => form.getFieldValue("name")}</Form.Item>
+        }
         extra={
           <Space>
             <Form.Item
@@ -107,12 +109,14 @@ export default function VendorsFormComponent({
 
         <Form.Item
           label={t("vendors.fields.email")}
-          rules={[
-            {
-              type: "email",
-              message: t("general.validation.invalidemail"),
-            },
-          ]}
+          rules={
+            [
+              // {
+              //   type: "email",
+              //   message: t("general.validation.invalidemail"),
+              // },
+            ]
+          }
           name="email"
         >
           <FormItemEmail email={getFieldValue("email")} />
@@ -156,7 +160,7 @@ export default function VendorsFormComponent({
           <InputNumber min={0} max={1} precision={2} step={0.01} />
         </Form.Item>
         <Form.Item label={t("vendors.fields.due_date")} name="due_date">
-          <InputNumber />
+          <InputNumber min={0} />
         </Form.Item>
         {
           // <Form.Item

client/src/graphql/appointments.queries.js

@@ -4,7 +4,21 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
   query QUERY_ALL_ACTIVE_APPOINTMENTS(
     $start: timestamptz!
     $end: timestamptz!
+    $startd: date!
+    $endd: date!
   ) {
+    employee_vacation(
+      where: { _or: [{ start: { _gte: $startd } }, { end: { _lte: $endd } }] }
+    ) {
+      id
+      start
+      end
+      employee {
+        id
+        last_name
+        first_name
+      }
+    }
     appointments(
       where: {
         canceled: { _eq: false }
@@ -77,6 +91,26 @@ export const INSERT_APPOINTMENT_BLOCK = gql`
   }
 `;
 
+export const INSERT_MANUAL_APPT = gql`
+  mutation INSERT_MANUAL_APPT($apt: appointments_insert_input!) {
+    insert_appointments_one(object: $apt) {
+      start
+      id
+      end
+      arrived
+      title
+      isintake
+      block
+      color
+      note
+      canceled
+      job {
+        id
+      }
+    }
+  }
+`;
+
 export const INSERT_APPOINTMENT = gql`
   mutation INSERT_APPOINTMENT(
     $app: [appointments_insert_input!]!
@@ -109,7 +143,24 @@ export const INSERT_APPOINTMENT = gql`
 `;
 
 export const QUERY_APPOINTMENT_BY_DATE = gql`
-  query QUERY_APPOINTMENT_BY_DATE($start: timestamptz, $end: timestamptz) {
+  query QUERY_APPOINTMENT_BY_DATE(
+    $start: timestamptz
+    $end: timestamptz
+    $startd: date!
+    $endd: date!
+  ) {
+    employee_vacation(
+      where: { _or: [{ start: { _gte: $startd } }, { end: { _lte: $endd } }] }
+    ) {
+      id
+      start
+      end
+      employee {
+        id
+        last_name
+        first_name
+      }
+    }
     appointments(
       where: { start: { _lte: $end, _gte: $start }, canceled: { _eq: false } }
     ) {
@@ -212,7 +263,9 @@ export const QUERY_APPOINTMENTS_BY_JOBID = gql`
 `;
 export const QUERY_SCHEDULE_LOAD_DATA = gql`
   query QUERY_SCHEDULE_LOAD_DATA($start: timestamptz!, $end: timestamptz!) {
-    prodJobs: jobs(where: { inproduction: { _eq: true } }) {
+    prodJobs: jobs(
+      where: { inproduction: { _eq: true }, suspended: { _eq: false } }
+    ) {
       id
       labhrs: joblines_aggregate(
         where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
@@ -234,11 +287,22 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
       }
     }
     compJobs: jobs(
-      where: { scheduled_completion: { _gte: $start, _lte: $end } }
+      where: {
+        _and: [
+          { suspended: { _eq: false } }
+          {
+            _or: [
+              { scheduled_completion: { _gte: $start, _lte: $end } }
+              { actual_completion: { _gte: $start, _lte: $end } }
+            ]
+          }
+        ]
+      }
     ) {
       id
       ro_number
       scheduled_completion
+      actual_completion
       labhrs: joblines_aggregate(
         where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
       ) {
@@ -258,7 +322,12 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
         }
       }
     }
-    arrJobs: jobs(where: { scheduled_in: { _gte: $start, _lte: $end } }) {
+    arrJobs: jobs(
+      where: {
+        scheduled_in: { _gte: $start, _lte: $end }
+        suspended: { _eq: false }
+      }
+    ) {
       id
       scheduled_in
       ro_number

client/src/graphql/associations.queries.js

@@ -2,7 +2,7 @@ import { gql } from "@apollo/client";
 
 export const QUERY_ALL_ASSOCIATIONS = gql`
   query QUERY_ALL_ASSOCIATIONS {
-    associations {
+    associations(order_by: { bodyshop: { shopname: asc } }) {
       id
       active
       bodyshop {