Merge branch 'rome/master' into feature/payroll

.circleci/config.yml

@@ -132,6 +132,57 @@ jobs:
           to: "s3://rome-online-production/"
       - jira/notify
 
+  test-rome-hasura-migrate:
+    docker:
+      - image: cimg/node:16.15.0
+    parameters:
+      secret:
+        type: string
+        default: $HASURA_ROME_TEST_SECRET
+    working_directory: ~/repo/hasura
+    steps:
+      - checkout:
+          path: ~/repo
+      - run:
+          name: Execute migration
+          command: |
+            npm install hasura-cli -g
+            echo ${HASURA_TEST_SECRET}
+            hasura migrate apply --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
+            hasura metadata apply --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
+            hasura metadata reload --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
+
+  test-rome-app-build:
+    docker:
+      - image: cimg/node:16.15.0
+
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+
+      - restore_cache:
+          name: Restore Yarn Package Cache
+          keys:
+            - yarn-packages-{{ checksum "yarn.lock" }}
+      - run:
+          name: Install Dependencies
+          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+      - save_cache:
+          name: Save Yarn Package Cache
+          key: yarn-packages-{{ checksum "yarn.lock" }}
+          paths:
+            - ~/.cache/yarn
+
+      - run: yarn run build:test
+
+      - aws-s3/sync:
+          from: build
+          to: "s3://rome-online-test/"
+      - jira/notify
+
+
   test-hasura-migrate:
     docker:
       - image: cimg/node:16.15.0
@@ -250,6 +301,15 @@ workflows:
           filters:
             branches:
               only: test
+      - test-rome-app-build:
+          filters:
+            branches:
+              only: rome/test
+      - test-rome-hasura-migrate:
+          secret: ${HASURA_ROME_TEST_SECRET}
+          filters:
+            branches:
+              only: rome/test
       #- admin-app-build:
       #filters:
       #branches:

client/.env.test

@@ -1,14 +1,14 @@
-REACT_APP_GRAPHQL_ENDPOINT=https://db.test.bodyshop.app/v1/graphql
-REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.test.bodyshop.app/v1/graphql
-REACT_APP_GA_CODE=231099835
-REACT_APP_FIREBASE_CONFIG={   "apiKey":"AIzaSyBw7_GTy7GtQyfkIRPVrWHEGKfcqeyXw0c",   "authDomain":"imex-test.firebaseapp.com",   "projectId":"imex-test",   "storageBucket":"imex-test.appspot.com",   "messagingSenderId":"991923618608",   "appId":"1:991923618608:web:633437569cdad78299bef5",   "measurementId":"G-TW0XLZEH18"}
+REACT_APP_GRAPHQL_ENDPOINT=https://db.test.romeonline.io/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.test.romeonline.io/v1/graphql
+REACT_APP_GA_CODE=231103507
+REACT_APP_FIREBASE_CONFIG={  "apiKey": "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE",  "authDomain": "rome-prod-1.firebaseapp.com",  "projectId": "rome-prod-1",  "storageBucket": "rome-prod-1.appspot.com",  "messagingSenderId": "147786367145",  "appId": "1:147786367145:web:9d4cba68071c3f29a8a9b8",  "measurementId": "G-G8Z9DRHTZS"}
 REACT_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/bodyshop
 REACT_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/bodyshop
 REACT_APP_CLOUDINARY_API_KEY=473322739956866
 REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
-REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BN2GcDPjipR5MTEosO5dT4CfQ3cmrdBIsI4juoOQrRijn_5aRiHlwj1mlq0W145mOusx6xynEKl_tvYJhpCc9lo'
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
 REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-REACT_APP_AXIOS_BASE_API_URL=https://api.romeonline.io/
-REACT_APP_REPORTS_SERVER_URL=https://reports.romeonline.io
+REACT_APP_AXIOS_BASE_API_URL=https://api.test.romeonline.io/
+REACT_APP_REPORTS_SERVER_URL=https://reports.test.romeonline.io
 REACT_APP_IS_TEST=true
 REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc

client/public/index.html

@@ -8,25 +8,6 @@
     <meta name="description" content="Rome Online" />
     <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
     <link rel="apple-touch-icon" href="logo192.png" />
-    <script type="text/javascript">
-      var $zoho = $zoho || {};
-      $zoho.salesiq = $zoho.salesiq || {
-        widgetcode:
-          "2ee4b2212fbdb380fb1e5e612f1e2dd7fe52032bee013140e27458e960add8e65b3cc65a44e7ecddabee40ced28dcfbd",
-        values: {},
-        ready: function () {},
-      };
-      var d = document;
-      s = d.createElement("script");
-      s.type = "text/javascript";
-      s.id = "zsiqscript";
-      s.defer = true;
-      s.src = "https://salesiq.zoho.com/widget";
-      t = d.getElementsByTagName("script")[0];
-      t.parentNode.insertBefore(s, t);
-      d.write("<div id='zsiqwidget'></div>");
-    </script>
-
     <script>
       !(function () {
         "use strict";

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

@@ -320,12 +320,12 @@ function BillEnterModalContainer({
     });
 
     if (enterAgain) {
-      form.resetFields();
-      form.resetFields();
+      // form.resetFields();
       form.setFieldsValue({
         ...formValues,
         billlines: [],
       });
+      form.resetFields();
     } else {
       toggleModalVisible();
     }

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

@@ -1,6 +1,6 @@
 import Icon, { UploadOutlined } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
-import { MdOpenInNew } from "react-icons/md";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import {
   Alert,
   Divider,
@@ -12,14 +12,17 @@ import {
   Switch,
   Upload,
 } from "antd";
+import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
+import { MdOpenInNew } from "react-icons/md";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { CHECK_BILL_INVOICE_NUMBER } from "../../graphql/bills.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
+import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
@@ -28,8 +31,6 @@ 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,
@@ -58,6 +59,11 @@ export function BillFormComponent({
     {},
     bodyshop.imexshopid
   );
+  const { ClosingPeriod } = useTreatments(
+    ["ClosingPeriod"],
+    {},
+    bodyshop.imexshopid
+  );
 
   const handleVendorSelect = (props, opt) => {
     setDiscount(opt.discount);
@@ -259,6 +265,37 @@ export function BillFormComponent({
               required: true,
               //message: t("general.validation.required"),
             },
+            ({ getFieldValue }) => ({
+              validator(rule, value) {
+                if (
+                  ClosingPeriod.treatment === "on" &&
+                  bodyshop.accountingconfig.ClosingPeriod
+                ) {
+                  if (
+                    moment(value)
+                      .startOf("day")
+                      .isSameOrAfter(
+                        moment(
+                          bodyshop.accountingconfig.ClosingPeriod[0]
+                        ).startOf("day")
+                      ) &&
+                    moment(value)
+                      .startOf("day")
+                      .isSameOrBefore(
+                        moment(
+                          bodyshop.accountingconfig.ClosingPeriod[1]
+                        ).endOf("day")
+                      )
+                  ) {
+                    return Promise.resolve();
+                  } else {
+                    return Promise.reject(t("bills.validation.closingperiod"));
+                  }
+                } else {
+                  return Promise.resolve();
+                }
+              },
+            }),
           ]}
         >
           <FormDatePicker disabled={disabled} />
@@ -327,13 +364,15 @@ export function BillFormComponent({
         )}
       </LayoutFormRow>
       <LayoutFormRow>
-        <Form.Item
-          span={3}
-          label={t("bills.fields.federal_tax_rate")}
-          name="federal_tax_rate"
-        >
-          <CurrencyInput min={0} disabled={disabled} />
-        </Form.Item>
+        {
+          // <Form.Item
+          //   span={3}
+          //   label={t("bills.fields.federal_tax_rate")}
+          //   name="federal_tax_rate"
+          // >
+          //   <CurrencyInput min={0} disabled={disabled} />
+          // </Form.Item>
+        }
         <Form.Item
           span={3}
           label={t("bills.fields.state_tax_rate")}
@@ -341,13 +380,15 @@ export function BillFormComponent({
         >
           <CurrencyInput min={0} disabled={disabled} />
         </Form.Item>
-        <Form.Item
-          span={3}
-          label={t("bills.fields.local_tax_rate")}
-          name="local_tax_rate"
-        >
-          <CurrencyInput min={0} />
-        </Form.Item>
+        {
+          //   <Form.Item
+          //     span={3}
+          //     label={t("bills.fields.local_tax_rate")}
+          //     name="local_tax_rate"
+          //   >
+          //     <CurrencyInput min={0} />
+          //   </Form.Item>
+        }
         <Form.Item shouldUpdate span={15}>
           {() => {
             const values = form.getFieldsValue([
@@ -373,21 +414,25 @@ export function BillFormComponent({
                       value={totals.subtotal.toFormat()}
                       precision={2}
                     />
-                    <Statistic
-                      title={t("bills.labels.federal_tax")}
-                      value={totals.federalTax.toFormat()}
-                      precision={2}
-                    />
+                    {
+                      // <Statistic
+                      //   title={t("bills.labels.federal_tax")}
+                      //   value={totals.federalTax.toFormat()}
+                      //   precision={2}
+                      // />
+                    }
                     <Statistic
                       title={t("bills.labels.state_tax")}
                       value={totals.stateTax.toFormat()}
                       precision={2}
                     />
-                    <Statistic
-                      title={t("bills.labels.local_tax")}
-                      value={totals.localTax.toFormat()}
-                      precision={2}
-                    />
+                    {
+                      // <Statistic
+                      //   title={t("bills.labels.local_tax")}
+                      //   value={totals.localTax.toFormat()}
+                      //   precision={2}
+                      // />
+                    }
                     <Statistic
                       title={t("bills.labels.entered_total")}
                       value={totals.enteredTotal.toFormat()}

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

@@ -458,21 +458,21 @@ export function BillEnterModalLinesComponent({
           </Form.Item>
         ),
       },
-      {
-        title: t("billlines.fields.federal_tax_applicable"),
-        dataIndex: "applicable_taxes.federal",
-        editable: true,
+      // {
+      //   title: t("billlines.fields.federal_tax_applicable"),
+      //   dataIndex: "applicable_taxes.federal",
+      //   editable: true,
 
-        formItemProps: (field) => {
-          return {
-            key: `${field.index}fedtax`,
-            valuePropName: "checked",
-            //  initialValue: true,
-            name: [field.name, "applicable_taxes", "federal"],
-          };
-        },
-        formInput: (record, index) => <Switch disabled={disabled} />,
-      },
+      //   formItemProps: (field) => {
+      //     return {
+      //       key: `${field.index}fedtax`,
+      //       valuePropName: "checked",
+      //       //  initialValue: true,
+      //       name: [field.name, "applicable_taxes", "federal"],
+      //     };
+      //   },
+      //   formInput: (record, index) => <Switch disabled={disabled} />,
+      // },
       {
         title: t("billlines.fields.state_tax_applicable"),
         dataIndex: "applicable_taxes.state",
@@ -487,20 +487,20 @@ export function BillEnterModalLinesComponent({
         },
         formInput: (record, index) => <Switch disabled={disabled} />,
       },
-      {
-        title: t("billlines.fields.local_tax_applicable"),
-        dataIndex: "applicable_taxes.local",
-        editable: true,
+      // {
+      //   title: t("billlines.fields.local_tax_applicable"),
+      //   dataIndex: "applicable_taxes.local",
+      //   editable: true,
 
-        formItemProps: (field) => {
-          return {
-            key: `${field.index}localtax`,
-            valuePropName: "checked",
-            name: [field.name, "applicable_taxes", "local"],
-          };
-        },
-        formInput: (record, index) => <Switch disabled={disabled} />,
-      },
+      //   formItemProps: (field) => {
+      //     return {
+      //       key: `${field.index}localtax`,
+      //       valuePropName: "checked",
+      //       name: [field.name, "applicable_taxes", "local"],
+      //     };
+      //   },
+      //   formInput: (record, index) => <Switch disabled={disabled} />,
+      // },
       {
         title: t("general.labels.actions"),
 

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

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

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

@@ -22,7 +22,7 @@ function CardPaymentModalContainer({
   toggleModalVisible,
   bodyshop,
 }) {
-  const { context, visible } = cardPaymentModal;
+  const { visible } = cardPaymentModal;
   const { t } = useTranslation();
 
   const handleCancel = () => {
@@ -35,7 +35,7 @@ function CardPaymentModalContainer({
 
   return (
     <Modal
-      visible={visible}
+      open={visible}
       onOk={handleOK}
       onCancel={handleCancel}
       footer={[
@@ -43,10 +43,10 @@ function CardPaymentModalContainer({
           {t("job_payments.buttons.goback")}
         </Button>,
       ]}
-      width="60%"
+      width="80%"
       destroyOnClose
     >
-      <CardPaymentModalComponent bodyshop={bodyshop} context={context} />
+      <CardPaymentModalComponent />
     </Modal>
   );
 }

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

@@ -23,36 +23,40 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
 
   const appt = []; // Flatten Data
   data.scheduled_in_today.forEach((item) => {
-    var i = {
-      canceled: item.canceled,
-      id: item.id,
-      alt_transport: item.job.alt_transport,
-      clm_no: item.job.clm_no,
-      jobid: item.job.jobid,
-      ins_co_nm: item.job.ins_co_nm,
-      iouparent: item.job.iouparent,
-      ownerid: item.job.ownerid,
-      ownr_co_nm: item.job.ownr_co_nm,
-      ownr_ea: item.job.ownr_ea,
-      ownr_fn: item.job.ownr_fn,
-      ownr_ln: item.job.ownr_ln,
-      ownr_ph1: item.job.ownr_ph1,
-      ownr_ph2: item.job.ownr_ph2,
-      production_vars: item.job.production_vars,
-      ro_number: item.job.ro_number,
-      suspended: item.job.suspended,
-      v_make_desc: item.job.v_make_desc,
-      v_model_desc: item.job.v_model_desc,
-      v_model_yr: item.job.v_model_yr,
-      v_vin: item.job.v_vin,
-      vehicleid: item.job.vehicleid,
-      note: item.note,
-      start: moment(item.start).format("hh:mm a"),
-      title: item.title,
-    };
-    appt.push(i);
+    if (item.job) {
+      var i = {
+        canceled: item.canceled,
+        id: item.id,
+        alt_transport: item.job.alt_transport,
+        clm_no: item.job.clm_no,
+        jobid: item.job.jobid,
+        ins_co_nm: item.job.ins_co_nm,
+        iouparent: item.job.iouparent,
+        ownerid: item.job.ownerid,
+        ownr_co_nm: item.job.ownr_co_nm,
+        ownr_ea: item.job.ownr_ea,
+        ownr_fn: item.job.ownr_fn,
+        ownr_ln: item.job.ownr_ln,
+        ownr_ph1: item.job.ownr_ph1,
+        ownr_ph2: item.job.ownr_ph2,
+        production_vars: item.job.production_vars,
+        ro_number: item.job.ro_number,
+        suspended: item.job.suspended,
+        v_make_desc: item.job.v_make_desc,
+        v_model_desc: item.job.v_model_desc,
+        v_model_yr: item.job.v_model_yr,
+        v_vin: item.job.v_vin,
+        vehicleid: item.job.vehicleid,
+        note: item.note,
+        start: moment(item.start).format("hh:mm a"),
+        title: item.title,
+      };
+      appt.push(i);
+    }
+  });
+  appt.sort(function (a, b) {
+    return new moment(a.start) - new moment(b.start);
   });
-  appt.sort ( function (a, b) { return new Date(a.start) - new Date(b.start); });
 
   const columns = [
     {
@@ -182,7 +186,12 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
   };
 
   return (
-    <Card title={t("dashboard.titles.scheduledintoday", {date: moment().startOf("day").format("MM/DD/YYYY")})} {...cardProps}>
+    <Card
+      title={t("dashboard.titles.scheduledintoday", {
+        date: moment().startOf("day").format("MM/DD/YYYY"),
+      })}
+      {...cardProps}
+    >
       <div style={{ height: "100%" }}>
         <Table
           onChange={handleTableChange}

client/src/components/data-label/data-label.component.jsx

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

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

@@ -40,22 +40,22 @@ class ErrorBoundary extends React.Component {
   }
 
   handleErrorSubmit = () => {
-    window.$crisp.push([
-      "do",
-      "message:send",
-      [
-        "text",
-        `I hit the following error: \n\n 
-    ${this.state.error.message}\n\n
-    ${this.state.error.stack}\n\n
-    URL:${window.location} as ${this.props.currentUser.email} for ${
-          this.props.bodyshop && this.props.bodyshop.name
-        }
-    `,
-      ],
-    ]);
+    // window.$crisp.push([
+    //   "do",
+    //   "message:send",
+    //   [
+    //     "text",
+    //     `I hit the following error: \n\n 
+    // ${this.state.error.message}\n\n
+    // ${this.state.error.stack}\n\n
+    // URL:${window.location} as ${this.props.currentUser.email} for ${
+    //       this.props.bodyshop && this.props.bodyshop.name
+    //     }
+    // `,
+    //   ],
+    // ]);
 
-    window.$crisp.push(["do", "chat:open"]);
+    // window.$crisp.push(["do", "chat:open"]);
     //     const errorDescription = `**Please add relevant details about what you were doing before you encountered this issue**
 
     // ----

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

@@ -1,10 +1,9 @@
-import { useTreatments } from "@splitsoftware/splitio-react";
 import Icon, {
   BankFilled,
   BarChartOutlined,
   CarFilled,
-  ClockCircleFilled,
   CheckCircleOutlined,
+  ClockCircleFilled,
   DashboardFilled,
   DollarCircleFilled,
   ExportOutlined,
@@ -26,6 +25,7 @@ import Icon, {
   UnorderedListOutlined,
   UserOutlined,
 } from "@ant-design/icons";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import { Layout, Menu } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -97,6 +97,11 @@ function Header({
     {},
     bodyshop && bodyshop.imexshopid
   );
+  const { ImEXPay } = useTreatments(
+    ["ImEXPay"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
 
   const { t } = useTranslation();
 
@@ -243,19 +248,20 @@ function Header({
           >
             {t("menus.header.enterpayment")}
           </Menu.Item>
-          {/* TODO: Enter Card Payment */}
-          <Menu.Item
-            key="entercardpayments"
-            onClick={() => {
-              setCardPaymentContext({
-                actions: {},
-                context: null,
-              });
-            }}
-            icon={<Icon component={FaCreditCard} />}
-          >
-            {t("menus.header.entercardpayment")}
-          </Menu.Item>
+          {ImEXPay.treatment === "on" && (
+            <Menu.Item
+              key="entercardpayments"
+              onClick={() => {
+                setCardPaymentContext({
+                  actions: {},
+                  context: {},
+                });
+              }}
+              icon={<Icon component={FaCreditCard} />}
+            >
+              {t("menus.header.entercardpayment")}
+            </Menu.Item>
+          )}
           <Menu.Divider key="div5" />
           <Menu.Item key="timetickets" icon={<FieldTimeOutlined />}>
             <Link to="/manage/timetickets">
@@ -275,7 +281,11 @@ function Header({
             onClick={() => {
               setTimeTicketContext({
                 actions: {},
-                context: {},
+                context: {
+                  created_by: currentUser.displayName
+                    ? currentUser.email.concat(" | ", currentUser.displayName)
+                    : currentUser.email,
+                },
               });
             }}
           >
@@ -379,20 +389,12 @@ function Header({
           <Menu.Item
             key="help"
             onClick={() => {
-              window.open("https://help.imex.online/", "_blank");
+              window.open("https://rometech.com/", "_blank");
             }}
             icon={<Icon component={QuestionCircleFilled} />}
           >
             {t("menus.header.help")}
           </Menu.Item>
-          <Menu.Item
-            key="rescue"
-            onClick={() => {
-              window.open("https://imexrescue.com/", "_blank");
-            }}
-          >
-            {t("menus.header.rescueme")}
-          </Menu.Item>
           <Menu.Item key="shiftclock">
             <Link to="/manage/shiftclock">{t("menus.header.shiftclock")}</Link>
           </Menu.Item>

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

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

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

@@ -29,11 +29,11 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -208,46 +208,56 @@ export function ScheduleEventComponent({
             <Button>{t("appointments.actions.sendreminder")}</Button>
           </Dropdown>
         ) : null}
-        <Popover
-          trigger="click"
-          disabled={event.arrived}
-          content={
-            <Form
-              layout="vertical"
-              onFinish={({ lost_sale_reason }) => {
-                handleCancel({ id: event.id, lost_sale_reason });
-              }}
-            >
-              <Form.Item
-                name="lost_sale_reason"
-                label={t("jobs.fields.lost_sale_reason")}
-                rules={[
-                  {
-                    required: true,
-                    //message: t("general.validation.required"),
-                  },
-                ]}
-              >
-                <Select
-                  options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
-                    label: lsr,
-                    value: lsr,
-                  }))}
-                />
-              </Form.Item>
-              <Button htmlType="submit">
-                {t("appointments.actions.cancel")}
-              </Button>
-            </Form>
-          }
-        >
+        {event.arrived ? (
           <Button
             // onClick={() => handleCancel(event.id)}
             disabled={event.arrived}
           >
             {t("appointments.actions.cancel")}
           </Button>
-        </Popover>
+        ) : (
+          <Popover
+            trigger="click"
+            disabled={event.arrived}
+            content={
+              <Form
+                layout="vertical"
+                onFinish={({ lost_sale_reason }) => {
+                  handleCancel({ id: event.id, lost_sale_reason });
+                }}
+              >
+                <Form.Item
+                  name="lost_sale_reason"
+                  label={t("jobs.fields.lost_sale_reason")}
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <Select
+                    options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
+                      label: lsr,
+                      value: lsr,
+                    }))}
+                  />
+                </Form.Item>
+                <Button htmlType="submit">
+                  {t("appointments.actions.cancel")}
+                </Button>
+              </Form>
+            }
+          >
+            <Button
+              // onClick={() => handleCancel(event.id)}
+              disabled={event.arrived}
+            >
+              {t("appointments.actions.cancel")}
+            </Button>
+          </Popover>
+        )}
+
         {event.isintake ? (
           <Button
             disabled={event.arrived}

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

@@ -8,7 +8,18 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
 
-export default function JobLinesExpander({ jobline, jobid }) {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobLinesExpander);
+
+export function JobLinesExpander({ jobline, jobid, bodyshop }) {
   const { t } = useTranslation();
   const { loading, error, data } = useQuery(GET_JOB_LINE_ORDERS, {
     fetchPolicy: "network-only",
@@ -23,7 +34,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
 
   return (
     <Row>
-      <Col md={24} lg={12}>
+      <Col md={24} lg={8}>
         <Typography.Title level={4}>
           {t("parts_orders.labels.parts_orders")}
         </Typography.Title>
@@ -49,7 +60,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
           )}
         </Timeline>
       </Col>
-      <Col md={24} lg={12}>
+      <Col md={24} lg={8}>
         <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
         <Timeline>
           {data.billlines.length > 0 ? (
@@ -71,7 +82,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
                   </Col>
                   <Col span={4}>
                     <span>
-                    {`${t("billlines.fields.actual_cost")}: `}
+                      {`${t("billlines.fields.actual_cost")}: `}
                       <CurrencyFormatter>{line.actual_cost}</CurrencyFormatter>
                     </span>
                   </Col>
@@ -89,6 +100,37 @@ export default function JobLinesExpander({ jobline, jobid }) {
           )}
         </Timeline>
       </Col>
+      <Col md={24} lg={8}>
+        <Typography.Title level={4}>
+          {t("parts_dispatch.labels.parts_dispatch")}
+        </Typography.Title>
+        <Timeline>
+          {data.parts_dispatch_lines.length > 0 ? (
+            data.parts_dispatch_lines.map((line) => (
+              <Timeline.Item key={line.id}>
+                <Space split={<Divider type="vertical" />} wrap>
+                  <Link to={`/manage/jobs/${jobid}?partsorderid=${line.id}`}>
+                    {line.parts_dispatch.number}
+                  </Link>
+                  {
+                    bodyshop.employees.find(
+                      (e) => e.id === line.parts_dispatch.employeeid
+                    )?.first_name
+                  }
+                  <Space>
+                    {t("parts_dispatch_lines.fields.accepted_at")}
+                    <DateFormatter>{line.accepted_at}</DateFormatter>
+                  </Space>
+                </Space>
+              </Timeline.Item>
+            ))
+          ) : (
+            <Timeline.Item>
+              {t("parts_orders.labels.notyetordered")}
+            </Timeline.Item>
+          )}
+        </Timeline>
+      </Col>
     </Row>
   );
 }

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

@@ -86,6 +86,10 @@ export function JobLinesComponent({
     bodyshop.imexshopid
   );
   const [selectedLines, setSelectedLines] = useState([]);
+  console.log(
+    "🚀 ~ file: job-lines.component.jsx:89 ~ selectedLines:",
+    selectedLines
+  );
   const [state, setState] = useState({
     sortedInfo: {},
     filteredInfo: {},
@@ -114,9 +118,7 @@ export function JobLinesComponent({
       onCell: (record) => ({
         className: record.manual_line && "job-line-manual",
         style: {
-          ...(record.critical || true
-            ? { boxShadow: " -.5em 0 0 #FFC107" }
-            : {}),
+          ...(record.critical ? { boxShadow: " -.5em 0 0 #FFC107" } : {}),
         },
       }),
       sortOrder:
@@ -134,7 +136,7 @@ export function JobLinesComponent({
       onCell: (record) => ({
         className: record.manual_line && "job-line-manual",
         style: {
-          ...(record.parts_dispatch_lines[0]?.accepted_at || true
+          ...(record.parts_dispatch_lines[0]?.accepted_at
             ? { boxShadow: " -.5em 0 0 #FFC107" }
             : {}),
         },
@@ -426,7 +428,7 @@ export function JobLinesComponent({
       const markedTypes = [e.key];
       if (e.key === "PAN") markedTypes.push("PAP");
       if (e.key === "PAS") markedTypes.push("PASL");
-      setSelectedLines(
+      setSelectedLines((selectedLines) =>
         _.uniq([
           ...selectedLines,
           ...jobLines.filter(
@@ -664,8 +666,17 @@ export function JobLinesComponent({
           onSelectAll: (selected, selectedRows, changeRows) => {
             setSelectedLines(selectedRows);
           },
-          onSelect: (record, selected, selectedRows, nativeEvent) =>
-            setSelectedLines(selectedRows),
+          onSelect: (record, selected, selectedRows, nativeEvent) => {
+            if (selected) {
+              setSelectedLines((selectedLines) =>
+                _.uniqBy([...selectedLines, record], "id")
+              );
+            } else {
+              setSelectedLines((selectedLines) =>
+                selectedLines.filter((l) => l.id !== record.id)
+              );
+            }
+          },
         }}
       />
     </div>

client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx

@@ -70,7 +70,7 @@ export function JobLineDispatchButton({
         notification.open({
           type: "error",
           message: t("parts_dispatch.errors.creating", {
-            error: JSON.stringify(result.errors),
+            error: result.errors,
           }),
         });
       } else {
@@ -79,7 +79,7 @@ export function JobLineDispatchButton({
           {
             name: Templates.parts_dispatch.key,
             variables: {
-              id: result.data.insert_part_dispatch_one.id,
+              id: result.data.insert_parts_dispatch_one.id,
             },
           },
           {},
@@ -91,7 +91,7 @@ export function JobLineDispatchButton({
       notification.open({
         type: "error",
         message: t("parts_dispatch.errors.creating", {
-          error: JSON.stringify(error),
+          error: error,
         }),
       });
     } finally {
@@ -137,7 +137,12 @@ export function JobLineDispatchButton({
         </Form.Item>
 
         <Space wrap>
-          <Button type="danger" onClick={() => form.submit()} loading={loading}>
+          <Button
+            type="danger"
+            onClick={() => form.submit()}
+            loading={loading}
+            disabled={selectedLines.length === 0}
+          >
             {t("general.actions.save")}
           </Button>
           <Button onClick={() => setVisible(false)}>

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

@@ -1,4 +1,4 @@
-import { notification, Select } from "antd";
+import { notification, Select, Space } from "antd";
 import React, { useEffect, useState } from "react";
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
@@ -75,7 +75,10 @@ export function JobLineLocationPopup({ bodyshop, jobline, disabled }) {
       style={{ width: "100%", minHeight: "2rem", cursor: "pointer" }}
       onClick={() => !disabled && setEditing(true)}
     >
-      {jobline.location}
+      <Space wrap>
+        {jobline.location}
+        {jobline.parts_dispatch_lines?.length > 0 && "-Disp"}
+      </Space>
     </div>
   );
 }

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

@@ -1,26 +1,26 @@
-import { Button, Card, Space, Table } from "antd";
 import { EditFilled } from "@ant-design/icons";
+import { Button, Card, Space, Table } from "antd";
 import Dinero from "dinero.js";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import {
+  openChatByPhone,
+  setMessage,
+} from "../../redux/messaging/messaging.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
-import { alphaSort, dateSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { alphaSort, dateSort } from "../../utils/sorters";
 import DataLabel from "../data-label/data-label.component";
-import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
 import PaymentExpandedRowComponent from "../payment-expanded-row/payment-expanded-row.component";
-import {
-  setMessage,
-  openChatByPhone,
-} from "../../redux/messaging/messaging.actions";
-import { parsePhoneNumber } from "libphonenumber-js";
-import axios from "axios";
+import PaymentsGenerateLink from "../payments-generate-link/payments-generate-link.component";
+import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -46,12 +46,17 @@ export function JobPayments({
   setCardPaymentContext,
   refetch,
 }) {
+  const { ImEXPay } = useTreatments(
+    ["ImEXPay"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
+
   const { t } = useTranslation();
   const [state, setState] = useState({
     sortedInfo: {},
     filteredInfo: {},
   });
-  const [generatingURL, setGeneratingtURL] = useState(false);
 
   const columns = [
     {
@@ -165,39 +170,21 @@ export function JobPayments({
       title={t("payments.labels.title")}
       extra={
         <Space wrap>
-          <Button
-            disabled={!job.converted}
-            loading={generatingURL}
-            onClick={async () => {
-              const p = parsePhoneNumber(job.ownr_ph1, "CA");
-              setGeneratingtURL(true);
-              const response = await axios.post(
-                "/intellipay/generate_payment_url",
-                {
-                  bodyshop,
-                  amount: balance.getAmount(),
-                  account: job.ro_number,
+          {ImEXPay.treatment === "on" && (
+            <>
+              <Button
+                onClick={() =>
+                  setCardPaymentContext({
+                    actions: { refetch },
+                    context: { jobid: job.id, balance },
+                  })
                 }
-              );
-              setGeneratingtURL(false);
-
-              console.log("SMS", response);
-
-              openChatByPhone({
-                phone_num: p.formatInternational(),
-                jobid: job.id,
-              });
-              setMessage(
-                t("appointments.labels.smspaymentreminder", {
-                  shopname: bodyshop.shopname,
-                  amount: balance.toFormat(),
-                  payment_link: response.data.shorUrl,
-                })
-              );
-            }}
-          >
-            {t("menus.header.paymentremindersms")}
-          </Button>
+              >
+                {t("menus.header.entercardpayment")}
+              </Button>
+              <PaymentsGenerateLink job={job} />
+            </>
+          )}
           <Button
             disabled={!job.converted}
             onClick={() =>
@@ -209,16 +196,7 @@ export function JobPayments({
           >
             {t("menus.header.enterpayment")}
           </Button>
-          <Button
-            onClick={() =>
-              setCardPaymentContext({
-                actions: { refetch },
-                context: { jobid: job.id, balance },
-              })
-            }
-          >
-            {t("menus.header.entercardpayment")}
-          </Button>
+
           <DataLabel
             valueStyle={{ color: balance.getAmount() !== 0 ? "red" : "green" }}
             label={t("payments.labels.balance")}

client/src/components/job-profile-data-warning/job-profile-data-warning.component.jsx

@@ -0,0 +1,18 @@
+import { Alert } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+
+export default function JobProfileDataWarning({ job }) {
+  const { t } = useTranslation();
+
+  let missingProfileInfo =
+    Object.keys(job.cieca_pft).length === 0 ||
+    Object.keys(job.cieca_pfl).length === 0 ||
+    Object.keys(job.materials).length === 0;
+
+  if (missingProfileInfo)
+    return (
+      <Alert type="error" message={t("jobs.labels.missingprofileinfo")}></Alert>
+    );
+  return null;
+}

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

@@ -123,10 +123,10 @@ export default function JobTotalsTableLabor({ job }) {
               <Space>
                 {t("jobs.labels.mapa")}
                 {job.materials &&
-                  job.materials.mapa &&
-                  job.materials.mapa.cal_maxdlr !== undefined &&
+                  job.materials.MAPA &&
+                  job.materials.MAPA.cal_maxdlr !== undefined &&
                   t("jobs.labels.threshhold", {
-                    amount: job.materials.mapa.cal_maxdlr,
+                    amount: job.materials.MAPA.cal_maxdlr,
                   })}
               </Space>
             </Table.Summary.Cell>
@@ -147,10 +147,10 @@ export default function JobTotalsTableLabor({ job }) {
               <Space wrap>
                 {t("jobs.labels.mash")}
                 {job.materials &&
-                  job.materials.mash &&
-                  job.materials.mash.cal_maxdlr !== undefined &&
+                  job.materials.MASH &&
+                  job.materials.MASH.cal_maxdlr !== undefined &&
                   t("jobs.labels.threshhold", {
-                    amount: job.materials.mash.cal_maxdlr,
+                    amount: job.materials.MASH.cal_maxdlr,
                   })}
               </Space>
             </Table.Summary.Cell>

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

@@ -28,26 +28,46 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
         total: job.job_totals.totals.subtotal,
         bold: true,
       },
-      {
-        key: t("jobs.labels.local_tax_amt"),
-        total: job.job_totals.totals.local_tax,
-      },
-      {
-        key: t("jobs.labels.state_tax_amt"),
-        total: job.job_totals.totals.state_tax,
-      },
-      ...(bodyshop.region_config === "CA_BC"
+
+      ...(job.job_totals.totals.us_sales_tax_breakdown
         ? [
             {
-              key: t("jobs.fields.ca_bc_pvrt"),
-              total: job.job_totals.additional.pvrt,
+              key:
+                bodyshop.md_responsibility_centers.taxes.tax_ty1?.tax_type1 ||
+                "T1",
+              total: job.job_totals.totals.us_sales_tax_breakdown.ty1Tax,
+            },
+            {
+              key:
+                bodyshop.md_responsibility_centers.taxes.tax_ty2?.tax_type2 ||
+                "T2",
+              total: job.job_totals.totals.us_sales_tax_breakdown.ty2Tax,
+            },
+            {
+              key:
+                bodyshop.md_responsibility_centers.taxes.tax_ty3?.tax_type3 ||
+                "T3",
+              total: job.job_totals.totals.us_sales_tax_breakdown.ty3Tax,
+            },
+            {
+              key:
+                bodyshop.md_responsibility_centers.taxes.tax_ty4?.tax_type4 ||
+                "T4",
+              total: job.job_totals.totals.us_sales_tax_breakdown.ty4Tax,
+            },
+            {
+              key:
+                bodyshop.md_responsibility_centers.taxes.tax_ty5?.tax_type5 ||
+                "T5",
+              total: job.job_totals.totals.us_sales_tax_breakdown.ty5Tax,
             },
           ]
-        : []),
-      {
-        key: t("jobs.labels.federal_tax_amt"),
-        total: job.job_totals.totals.federal_tax,
-      },
+        : [
+            {
+              key: t("jobs.labels.state_tax_amt"),
+              total: job.job_totals.totals.state_tax,
+            },
+          ]),
       {
         key: t("jobs.labels.total_repairs"),
         total: job.job_totals.totals.total_repairs,
@@ -57,10 +77,10 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
         key: t("jobs.fields.ded_amt"),
         total: job.job_totals.totals.custPayable.deductible,
       },
-      {
-        key: t("jobs.fields.federal_tax_payable"),
-        total: job.job_totals.totals.custPayable.federal_tax,
-      },
+      // {
+      //   key: t("jobs.fields.federal_tax_payable"),
+      //   total: job.job_totals.totals.custPayable.federal_tax,
+      // },
       {
         key: t("jobs.fields.other_amount_payable"),
         total: job.job_totals.totals.custPayable.other_customer_amount,
@@ -81,7 +101,7 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
         bold: true,
       },
     ];
-  }, [job.job_totals, t, bodyshop.region_config]);
+  }, [job.job_totals, t, bodyshop.md_responsibility_centers]);
 
   const columns = [
     {

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

@@ -6,8 +6,9 @@ import {
   useQuery,
 } from "@apollo/client";
 import { useTreatments } from "@splitsoftware/splitio-react";
-import { Col, notification, Row } from "antd";
+import { Button, Col, Row, notification } from "antd";
 import Axios from "axios";
+import _ from "lodash";
 import moment from "moment";
 import queryString from "query-string";
 import React, { useCallback, useEffect, useState } from "react";
@@ -29,7 +30,6 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import confirmDialog from "../../utils/asyncConfirm";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import CriticalPartsScan from "../../utils/criticalPartsScan";
 import AlertComponent from "../alert/alert.component";
@@ -40,7 +40,6 @@ import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.contai
 import { GetSupplementDelta } from "./jobs-available-supplement.estlines.util";
 import HeaderFields from "./jobs-available-supplement.headerfields";
 import JobsAvailableTableComponent from "./jobs-available-table.component";
-import _ from "lodash";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -90,13 +89,14 @@ export function JobsAvailableContainer({
   const modalSearchState = useState("");
 
   //Import Scenario
-  const onOwnerFindModalOk = async () => {
+  const onOwnerFindModalOk = async (lazyData) => {
     logImEXEvent("job_import_new");
 
     setOwnerModalVisible(false);
     setInsertLoading(true);
-
-    const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
+    const estData = replaceEmpty(
+      lazyData?.available_jobs_by_pk || estDataRaw.data.available_jobs_by_pk
+    );
 
     if (!(estData && estData.est_data)) {
       //We don't have the right data. Error!
@@ -139,6 +139,7 @@ export function JobsAvailableContainer({
       // owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
       // job_totals: newTotals,
       date_open: moment(),
+      status: bodyshop.md_ro_statuses.default_imported,
       notes: {
         data: {
           created_by: currentUser.email,
@@ -160,47 +161,50 @@ export function JobsAvailableContainer({
       delete newJob.vehicle;
     }
 
-    insertNewJob({
-      variables: {
-        job: newJob,
-      },
-    })
-      .then((r) => {
-        Axios.post("/job/totalsssu", {
-          id: r.data.insert_jobs.returning[0].id,
-        });
+    if (typeof newJob.kmin === "string") {
+      newJob.kmin = null;
+    }
 
-        if (CriticalPartsScanning.treatment === "on") {
-          CriticalPartsScan(r.data.insert_jobs.returning[0].id);
-        }
-        notification["success"]({
-          message: t("jobs.successes.created"),
-          onClick: () => {
-            history.push(`/manage/jobs/${r.data.insert_jobs.returning[0].id}`);
-          },
-        });
-        //Job has been inserted. Clean up the available jobs record.
+    try {
+      const r = await insertNewJob({
+        variables: {
+          job: newJob,
+        },
+      });
+      await Axios.post("/job/totalsssu", {
+        id: r.data.insert_jobs.returning[0].id,
+      });
 
-        insertAuditTrail({
-          jobid: r.data.insert_jobs.returning[0].id,
-          operation: AuditTrailMapping.jobimported(),
-        });
+      if (CriticalPartsScanning.treatment === "on") {
+        CriticalPartsScan(r.data.insert_jobs.returning[0].id);
+      }
+      notification["success"]({
+        message: t("jobs.successes.created"),
+        onClick: () => {
+          history.push(`/manage/jobs/${r.data.insert_jobs.returning[0].id}`);
+        },
+      });
+      //Job has been inserted. Clean up the available jobs record.
 
-        deleteJob({
-          variables: { id: estData.id },
-        }).then((r) => {
-          refetch();
-          setInsertLoading(false);
-        });
-      })
-      .catch((r) => {
-        //error while inserting
-        notification["error"]({
-          message: t("jobs.errors.creating", { error: r.message }),
-        });
+      insertAuditTrail({
+        jobid: r.data.insert_jobs.returning[0].id,
+        operation: AuditTrailMapping.jobimported(),
+      });
+
+      await deleteJob({
+        variables: { id: estData.id },
+      }).then((r) => {
         refetch();
         setInsertLoading(false);
       });
+    } catch (r) {
+      //error while inserting
+      notification["error"]({
+        message: t("jobs.errors.creating", { error: r.message }),
+      });
+      refetch();
+      setInsertLoading(false);
+    }
   };
 
   //Suplement scenario
@@ -387,6 +391,25 @@ export function JobsAvailableContainer({
         onCancel={onJobModalCancel}
         modalSearchState={modalSearchState}
       />
+      {currentUser.email.includes("@rome.") ||
+      currentUser.email.includes("@imex.") ? (
+        <Button
+          onClick={async () => {
+            for (const record of data.available_jobs) {
+              //Query the data
+              console.log("Start Job", record.id);
+              const { data } = await loadEstData({
+                variables: { id: record.id },
+              });
+              console.log("Query has been awaited and is complete");
+              await onOwnerFindModalOk(data);
+            }
+          }}
+        >
+          Add all jobs as new.
+        </Button>
+      ) : null}
+
       <Row gutter={[16, 16]}>
         <Col span={24}>
           <JobsAvailableTableComponent
@@ -418,98 +441,104 @@ function replaceEmpty(someObj, replaceValue = null) {
 }
 
 async function CheckTaxRates(estData, bodyshop) {
-  //LKQ Check
-  if (
-    !estData.parts_tax_rates?.PAL ||
-    estData.parts_tax_rates?.PAL?.prt_tax_rt === null ||
-    estData.parts_tax_rates?.PAL?.prt_tax_rt === 0
-  ) {
-    const res = await confirmDialog(
-      `Rome Online has detected that there is a missing tax rate for LKQ parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
-    );
-    if (res) {
-      if (!estData.parts_tax_rates.PAL) {
-        estData.parts_tax_rates.PAL = {
-          prt_discp: 0,
-          prt_mktyp: true,
-          prt_mkupp: 0,
-          prt_type: "PAL",
-        };
-      }
-      estData.parts_tax_rates.PAL.prt_tax_rt =
-        bodyshop.bill_tax_rates.state_tax_rate / 100;
-      estData.parts_tax_rates.PAL.prt_tax_in = true;
-    }
-  }
-  //PAC Check
-  if (
-    !estData.parts_tax_rates?.PAC ||
-    estData.parts_tax_rates?.PAC?.prt_tax_rt === null ||
-    estData.parts_tax_rates?.PAC?.prt_tax_rt === 0
-  ) {
-    const res = await confirmDialog(
-      `Rome Online has detected that there is a missing tax rate for rechromed parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
-    );
-    if (res) {
-      if (!estData.parts_tax_rates.PAC) {
-        estData.parts_tax_rates.PAC = {
-          prt_discp: 0,
-          prt_mktyp: true,
-          prt_mkupp: 0,
-          prt_type: "PAC",
-        };
-      }
-      estData.parts_tax_rates.PAC.prt_tax_rt =
-        bodyshop.bill_tax_rates.state_tax_rate / 100;
-      estData.parts_tax_rates.PAC.prt_tax_in = true;
-    }
-  }
+  // //LKQ Check
+  // if (
+  //   !estData.parts_tax_rates?.PAL ||
+  //   estData.parts_tax_rates?.PAL?.prt_tax_rt === null ||
+  //   estData.parts_tax_rates?.PAL?.prt_tax_rt === 0
+  // ) {
+  //   const res = await confirmDialog(
+  //     `Rome Online has detected that there is a missing tax rate for LKQ parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+  //   );
+  //   if (res) {
+  //     if (!estData.parts_tax_rates.PAL) {
+  //       estData.parts_tax_rates.PAL = {
+  //         prt_discp: 0,
+  //         prt_mktyp: true,
+  //         prt_mkupp: 0,
+  //         prt_type: "PAL",
+  //       };
+  //     }
+  //     estData.parts_tax_rates.PAL.prt_tax_rt =
+  //       bodyshop.bill_tax_rates.state_tax_rate / 100;
+  //     estData.parts_tax_rates.PAL.prt_tax_in = true;
+  //   }
+  // }
+  // //PAC Check
+  // if (
+  //   !estData.parts_tax_rates?.PAC ||
+  //   estData.parts_tax_rates?.PAC?.prt_tax_rt === null ||
+  //   estData.parts_tax_rates?.PAC?.prt_tax_rt === 0
+  // ) {
+  //   const res = await confirmDialog(
+  //     `Rome Online has detected that there is a missing tax rate for rechromed parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+  //   );
+  //   if (res) {
+  //     if (!estData.parts_tax_rates.PAC) {
+  //       estData.parts_tax_rates.PAC = {
+  //         prt_discp: 0,
+  //         prt_mktyp: true,
+  //         prt_mkupp: 0,
+  //         prt_type: "PAC",
+  //       };
+  //     }
+  //     estData.parts_tax_rates.PAC.prt_tax_rt =
+  //       bodyshop.bill_tax_rates.state_tax_rate / 100;
+  //     estData.parts_tax_rates.PAC.prt_tax_in = true;
+  //   }
+  // }
+
   //PAM Check
-  if (
-    !estData.parts_tax_rates?.PAM ||
-    estData.parts_tax_rates?.PAM?.prt_tax_rt === null ||
-    estData.parts_tax_rates?.PAM?.prt_tax_rt === 0
-  ) {
-    const res = await confirmDialog(
-      `Rome Online has detected that there is a missing tax rate for remanufactured parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
-    );
-    if (res) {
-      if (!estData.parts_tax_rates.PAM) {
-        estData.parts_tax_rates.PAM = {
-          prt_discp: 0,
-          prt_mktyp: true,
-          prt_mkupp: 0,
-          prt_type: "PAM",
-        };
-      }
-      estData.parts_tax_rates.PAM.prt_tax_rt =
-        bodyshop.bill_tax_rates.state_tax_rate / 100;
-      estData.parts_tax_rates.PAM.prt_tax_in = true;
-    }
+  if (!estData.parts_tax_rates?.PAM) {
+    estData.parts_tax_rates.PAM = estData.parts_tax_rates.PAC;
   }
 
-  if (
-    !estData.parts_tax_rates?.PAR ||
-    estData.parts_tax_rates?.PAR?.prt_tax_rt === null ||
-    estData.parts_tax_rates?.PAR?.prt_tax_rt === 0
-  ) {
-    const res = await confirmDialog(
-      `Rome Online has detected that there is a missing tax rate for recored parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
-    );
-    if (res) {
-      if (!estData.parts_tax_rates.PAR) {
-        estData.parts_tax_rates.PAR = {
-          prt_discp: 0,
-          prt_mktyp: true,
-          prt_mkupp: 0,
-          prt_type: "PAR",
-        };
-      }
-      estData.parts_tax_rates.PAR.prt_tax_rt =
-        bodyshop.bill_tax_rates.state_tax_rate / 100;
-      estData.parts_tax_rates.PAR.prt_tax_in = true;
-    }
-  }
+  // //PAM Check
+  // if (
+  //   !estData.parts_tax_rates?.PAM ||
+  //   estData.parts_tax_rates?.PAM?.prt_tax_rt === null ||
+  //   estData.parts_tax_rates?.PAM?.prt_tax_rt === 0
+  // ) {
+  //   const res = await confirmDialog(
+  //     `Rome Online has detected that there is a missing tax rate for remanufactured parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+  //   );
+  //   if (res) {
+  //     if (!estData.parts_tax_rates.PAM) {
+  //       estData.parts_tax_rates.PAM = {
+  //         prt_discp: 0,
+  //         prt_mktyp: true,
+  //         prt_mkupp: 0,
+  //         prt_type: "PAM",
+  //       };
+  //     }
+  //     estData.parts_tax_rates.PAM.prt_tax_rt =
+  //       bodyshop.bill_tax_rates.state_tax_rate / 100;
+  //     estData.parts_tax_rates.PAM.prt_tax_in = true;
+  //   }
+  // }
+
+  // if (
+  //   !estData.parts_tax_rates?.PAR ||
+  //   estData.parts_tax_rates?.PAR?.prt_tax_rt === null ||
+  //   estData.parts_tax_rates?.PAR?.prt_tax_rt === 0
+  // ) {
+  //   const res = await confirmDialog(
+  //     `Rome Online has detected that there is a missing tax rate for recored parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+  //   );
+  //   if (res) {
+  //     if (!estData.parts_tax_rates.PAR) {
+  //       estData.parts_tax_rates.PAR = {
+  //         prt_discp: 0,
+  //         prt_mktyp: true,
+  //         prt_mkupp: 0,
+  //         prt_type: "PAR",
+  //       };
+  //     }
+  //     estData.parts_tax_rates.PAR.prt_tax_rt =
+  //       bodyshop.bill_tax_rates.state_tax_rate / 100;
+  //     estData.parts_tax_rates.PAR.prt_tax_in = true;
+  //   }
+  // }
 
   //IO-1387 If a sublet line is NOT R&R, use the labor tax. If it is, use the sublet tax rate.
   //Currently limited to SK shops only.
@@ -537,8 +566,7 @@ async function ResolveCCCLineIssues(estData, bodyshop) {
   //This needs to be done before cleansing unq_seq since some misc prices could move over.
   estData.joblines.data.forEach((line) => {
     if (line.misc_amt && line.misc_amt !== 0) {
-      line.act_price = line.misc_amt;
-      line.part_type = "PAS";
+      line.act_price = line.act_price + line.misc_amt;
       line.tax_part = !!line.misc_tax;
     }
   });

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

@@ -36,6 +36,8 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
             ret.profitcenter_part = defaults.profits["MAPA"];
           } else if (lineDesc.includes("ats amount")) {
             ret.profitcenter_part = defaults.profits["ATS"];
+          } else if (jl.act_price > 0) {
+            ret.profitcenter_part = defaults.profits["PAO"];
           } else {
             ret.profitcenter_part = null;
           }

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

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

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

@@ -1,4 +1,4 @@
-import { Collapse, Form, Input, InputNumber, Select, Switch } from "antd";
+import { Collapse, Form, Input, Select, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -12,6 +12,12 @@ import FormItemPhone, {
 } from "../form-items-formatted/phone-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
 import JobsDetailRatesParts from "../jobs-detail-rates/jobs-detail-rates.parts.component";
+
+import JobsDetailRatesLabor from "../jobs-detail-rates/jobs-detail-rates.labor.component";
+import JobsDetailRatesMaterials from "../jobs-detail-rates/jobs-detail-rates.materials.component";
+import JobsDetailRatesOther from "../jobs-detail-rates/jobs-detail-rates.other.component";
+import JobsDetailRatesTaxes from "../jobs-detail-rates/jobs-detail-rates.taxes.component";
+
 import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 const mapStateToProps = createStructuredSelector({
@@ -258,26 +264,28 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
               <CurrencyInput />
             </Form.Item>
           </LayoutFormRow>
-          <LayoutFormRow>
-            <Form.Item
-              label={t("jobs.fields.federal_tax_rate")}
-              name="federal_tax_rate"
-            >
-              <InputNumber min={0} max={1} precision={2} />
-            </Form.Item>
-            <Form.Item
-              label={t("jobs.fields.state_tax_rate")}
-              name="state_tax_rate"
-            >
-              <InputNumber min={0} max={1} precision={2} />
-            </Form.Item>
-            <Form.Item
-              label={t("jobs.fields.local_tax_rate")}
-              name="local_tax_rate"
-            >
-              <InputNumber min={0} max={1} precision={2} />
-            </Form.Item>
-          </LayoutFormRow>
+          {
+            // <LayoutFormRow>
+            //   <Form.Item
+            //     label={t("jobs.fields.federal_tax_rate")}
+            //     name="federal_tax_rate"
+            //   >
+            //     <InputNumber min={0} max={1} precision={2} />
+            //   </Form.Item>
+            //   <Form.Item
+            //     label={t("jobs.fields.state_tax_rate")}
+            //     name="state_tax_rate"
+            //   >
+            //     <InputNumber min={0} max={1} precision={2} />
+            //   </Form.Item>
+            //   <Form.Item
+            //     label={t("jobs.fields.local_tax_rate")}
+            //     name="local_tax_rate"
+            //   >
+            //     <InputNumber min={0} max={1} precision={2} />
+            //   </Form.Item>
+            // </LayoutFormRow>
+          }
           <LayoutFormRow>
             <Form.Item label={t("jobs.fields.rate_lab")} name="rate_lab">
               <CurrencyInput />
@@ -356,6 +364,10 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
         required={selected && true}
         form={form}
       />
+      <JobsDetailRatesLabor form={form} />
+      <JobsDetailRatesMaterials form={form} />
+      <JobsDetailRatesOther form={form} />
+      <JobsDetailRatesTaxes form={form} />
     </div>
   );
 }

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

@@ -143,63 +143,67 @@ export function JobsDetailHeaderActions({
       <Menu.Item
         disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
       >
-        <Popover
-          trigger="click"
-          disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
-          content={
-            <Form
-              layout="vertical"
-              onFinish={async ({ lost_sale_reason }) => {
-                const jobUpdate = await cancelAllAppointments({
-                  variables: {
-                    jobid: job.id,
-                    job: {
-                      date_scheduled: null,
-                      scheduled_in: null,
-                      scheduled_completion: null,
-                      lost_sale_reason,
-                      status: bodyshop.md_ro_statuses.default_imported,
+        {job.status !== bodyshop.md_ro_statuses.default_scheduled ? (
+          t("menus.jobsactions.cancelallappointments")
+        ) : (
+          <Popover
+            trigger="click"
+            disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
+            content={
+              <Form
+                layout="vertical"
+                onFinish={async ({ lost_sale_reason }) => {
+                  const jobUpdate = await cancelAllAppointments({
+                    variables: {
+                      jobid: job.id,
+                      job: {
+                        date_scheduled: null,
+                        scheduled_in: null,
+                        scheduled_completion: null,
+                        lost_sale_reason,
+                        status: bodyshop.md_ro_statuses.default_imported,
+                      },
                     },
-                  },
-                });
-                if (!jobUpdate.errors) {
-                  notification["success"]({
-                    message: t("appointments.successes.canceled"),
                   });
-                  return;
-                }
-              }}
-            >
-              <Form.Item
-                name="lost_sale_reason"
-                label={t("jobs.fields.lost_sale_reason")}
-                rules={[
-                  {
-                    required: true,
-                    //message: t("general.validation.required"),
-                  },
-                ]}
+                  if (!jobUpdate.errors) {
+                    notification["success"]({
+                      message: t("appointments.successes.canceled"),
+                    });
+                    return;
+                  }
+                }}
               >
-                <Select
-                  options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
-                    label: lsr,
-                    value: lsr,
-                  }))}
-                />
-              </Form.Item>
-              <Button
-                htmlType="submit"
-                disabled={
-                  job.status !== bodyshop.md_ro_statuses.default_scheduled
-                }
-              >
-                {t("appointments.actions.cancel")}
-              </Button>
-            </Form>
-          }
-        >
-          {t("menus.jobsactions.cancelallappointments")}
-        </Popover>
+                <Form.Item
+                  name="lost_sale_reason"
+                  label={t("jobs.fields.lost_sale_reason")}
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <Select
+                    options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
+                      label: lsr,
+                      value: lsr,
+                    }))}
+                  />
+                </Form.Item>
+                <Button
+                  htmlType="submit"
+                  disabled={
+                    job.status !== bodyshop.md_ro_statuses.default_scheduled
+                  }
+                >
+                  {t("appointments.actions.cancel")}
+                </Button>
+              </Form>
+            }
+          >
+            {t("menus.jobsactions.cancelallappointments")}
+          </Popover>
+        )}
       </Menu.Item>
       <Menu.Item
         disabled={
@@ -245,7 +249,12 @@ export function JobsDetailHeaderActions({
 
           setTimeTicketContext({
             actions: {},
-            context: { jobId: job.id },
+            context: {
+              jobId: job.id,
+              created_by: currentUser.displayName
+                ? currentUser.email.concat(" | ", currentUser.displayName)
+                : currentUser.email,
+            },
           });
         }}
       >

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

@@ -1,25 +1,21 @@
-import {
-  Divider,
-  Form,
-  Input,
-  InputNumber,
-  Select,
-  Space,
-  Switch,
-  Tooltip,
-} from "antd";
+import { Divider, Form, Input, Select, Space, Switch, Tooltip } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import CABCpvrtCalculator from "../ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component";
+
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
 import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
 import FormRow from "../layout-form-row/layout-form-row.component";
+import JobsDetailRatesLabor from "./jobs-detail-rates.labor.component";
+import JobsDetailRatesMaterials from "./jobs-detail-rates.materials.component";
+import JobsDetailRatesOther from "./jobs-detail-rates.other.component";
 import JobsDetailRatesParts from "./jobs-detail-rates.parts.component";
+import JobsDetailRatesTaxes from "./jobs-detail-rates.taxes.component";
+import JobsDetailRatesProfileOVerride from "./jobs-detail-rates.profile-override.component";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -84,14 +80,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
         >
           <CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} />
         </Form.Item>
-        {bodyshop.region_config === "CA_BC" && (
-          <Space align="center">
-            <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
-              <CurrencyInput disabled={jobRO} min={0} />
-            </Form.Item>
-            <CABCpvrtCalculator form={form} disabled={jobRO} />
-          </Space>
-        )}
+
         <Form.Item
           label={t("jobs.fields.auto_add_ats")}
           name="auto_add_ats"
@@ -120,41 +109,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
           }}
         </Form.Item>
       </FormRow>
-      <FormRow>
-        <Form.Item
-          label={t("jobs.fields.federal_tax_rate")}
-          name="federal_tax_rate"
-        >
-          <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
-        </Form.Item>
-        <Form.Item
-          label={t("jobs.fields.state_tax_rate")}
-          name="state_tax_rate"
-        >
-          <InputNumber
-            min={0}
-            max={1}
-            precision={2}
-            disabled={jobRO}
-            autoComplete="new-password"
-          />
-        </Form.Item>
-        <Form.Item
-          label={t("jobs.fields.local_tax_rate")}
-          name="local_tax_rate"
-        >
-          <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
-        </Form.Item>
-        {bodyshop.region_config.toLowerCase().startsWith("ca") && (
-          <Form.Item
-            label={t("jobs.fields.ca_gst_registrant")}
-            name="ca_gst_registrant"
-            valuePropName="checked"
-          >
-            <Switch disabled={jobRO} />
-          </Form.Item>
-        )}
-      </FormRow>
+
       <Divider
         orientation="left"
         type="horizontal"
@@ -242,7 +197,15 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
           <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
       </FormRow>
+      <Divider orientation="left">Tax Profile</Divider>
+
+      <JobsDetailRatesProfileOVerride form={form} />
+
       <JobsDetailRatesParts form={form} />
+      <JobsDetailRatesLabor form={form} />
+      <JobsDetailRatesMaterials form={form} />
+      <JobsDetailRatesOther form={form} />
+      <JobsDetailRatesTaxes form={form} />
     </div>
   );
 }

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

@@ -0,0 +1,427 @@
+import { Collapse, Form, Switch } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+const mapStateToProps = createStructuredSelector({
+  jobRO: selectJobReadOnly,
+});
+
+export function JobsDetailRatesLabor({
+  jobRO,
+  expanded,
+  required = true,
+  form,
+}) {
+  const { t } = useTranslation();
+
+  return (
+    <Collapse defaultActiveKey={expanded && "rates"}>
+      <Collapse.Panel
+        forceRender
+        header={t("jobs.labels.cieca_pfl")}
+        key="cieca_pfl"
+      >
+        <LayoutFormRow header={t("joblines.fields.lbr_types.LAB")}>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
+            name={["cieca_pfl", "LAB", "lbr_tax_in"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
+            name={["cieca_pfl", "LAB", "lbr_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in2")}
+            name={["cieca_pfl", "LAB", "lbr_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in3")}
+            name={["cieca_pfl", "LAB", "lbr_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in4")}
+            name={["cieca_pfl", "LAB", "lbr_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in5")}
+            name={["cieca_pfl", "LAB", "lbr_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+        </LayoutFormRow>
+        <LayoutFormRow header={t("joblines.fields.lbr_types.LAD")}>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
+            name={["cieca_pfl", "LAD", "lbr_tax_in"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
+            name={["cieca_pfl", "LAD", "lbr_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in2")}
+            name={["cieca_pfl", "LAD", "lbr_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in3")}
+            name={["cieca_pfl", "LAD", "lbr_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in4")}
+            name={["cieca_pfl", "LAD", "lbr_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in5")}
+            name={["cieca_pfl", "LAD", "lbr_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+        </LayoutFormRow>
+        <LayoutFormRow header={t("joblines.fields.lbr_types.LAE")}>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
+            name={["cieca_pfl", "LAE", "lbr_tax_in"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
+            name={["cieca_pfl", "LAE", "lbr_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in2")}
+            name={["cieca_pfl", "LAE", "lbr_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in3")}
+            name={["cieca_pfl", "LAE", "lbr_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in4")}
+            name={["cieca_pfl", "LAE", "lbr_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in5")}
+            name={["cieca_pfl", "LAE", "lbr_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+        </LayoutFormRow>
+        <LayoutFormRow header={t("joblines.fields.lbr_types.LAF")}>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
+            name={["cieca_pfl", "LAF", "lbr_tax_in"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
+            name={["cieca_pfl", "LAF", "lbr_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in2")}
+            name={["cieca_pfl", "LAF", "lbr_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in3")}
+            name={["cieca_pfl", "LAF", "lbr_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in4")}
+            name={["cieca_pfl", "LAF", "lbr_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in5")}
+            name={["cieca_pfl", "LAF", "lbr_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+        </LayoutFormRow>
+        <LayoutFormRow header={t("joblines.fields.lbr_types.LAG")}>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
+            name={["cieca_pfl", "LAG", "lbr_tax_in"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
+            name={["cieca_pfl", "LAG", "lbr_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in2")}
+            name={["cieca_pfl", "LAG", "lbr_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in3")}
+            name={["cieca_pfl", "LAG", "lbr_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in4")}
+            name={["cieca_pfl", "LAG", "lbr_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in5")}
+            name={["cieca_pfl", "LAG", "lbr_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+        </LayoutFormRow>
+        <LayoutFormRow header={t("joblines.fields.lbr_types.LAM")}>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
+            name={["cieca_pfl", "LAM", "lbr_tax_in"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
+            name={["cieca_pfl", "LAM", "lbr_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in2")}
+            name={["cieca_pfl", "LAM", "lbr_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in3")}
+            name={["cieca_pfl", "LAM", "lbr_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in4")}
+            name={["cieca_pfl", "LAM", "lbr_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in5")}
+            name={["cieca_pfl", "LAM", "lbr_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+        </LayoutFormRow>
+        <LayoutFormRow header={t("joblines.fields.lbr_types.LAR")}>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
+            name={["cieca_pfl", "LAR", "lbr_tax_in"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
+            name={["cieca_pfl", "LAR", "lbr_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in2")}
+            name={["cieca_pfl", "LAR", "lbr_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in3")}
+            name={["cieca_pfl", "LAR", "lbr_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in4")}
+            name={["cieca_pfl", "LAR", "lbr_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in5")}
+            name={["cieca_pfl", "LAR", "lbr_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+        </LayoutFormRow>
+        <LayoutFormRow header={t("joblines.fields.lbr_types.LAS")}>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
+            name={["cieca_pfl", "LAS", "lbr_tax_in"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
+            name={["cieca_pfl", "LAS", "lbr_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in2")}
+            name={["cieca_pfl", "LAS", "lbr_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in3")}
+            name={["cieca_pfl", "LAS", "lbr_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in4")}
+            name={["cieca_pfl", "LAS", "lbr_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in5")}
+            name={["cieca_pfl", "LAS", "lbr_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+        </LayoutFormRow>
+        <LayoutFormRow header={t("joblines.fields.lbr_types.LAU")}>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
+            name={["cieca_pfl", "LAU", "lbr_tax_in"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in1")}
+            name={["cieca_pfl", "LAU", "lbr_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in2")}
+            name={["cieca_pfl", "LAU", "lbr_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in3")}
+            name={["cieca_pfl", "LAU", "lbr_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in4")}
+            name={["cieca_pfl", "LAU", "lbr_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfl.lbr_tx_in5")}
+            name={["cieca_pfl", "LAU", "lbr_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+        </LayoutFormRow>
+      </Collapse.Panel>
+    </Collapse>
+  );
+}
+export default connect(mapStateToProps, null)(JobsDetailRatesLabor);

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

@@ -0,0 +1,145 @@
+import { Collapse, Form, Input, InputNumber, Switch } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+const mapStateToProps = createStructuredSelector({
+  jobRO: selectJobReadOnly,
+});
+
+export function JobsDetailRatesMaterials({
+  jobRO,
+  expanded,
+  required = true,
+  form,
+}) {
+  const { t } = useTranslation();
+
+  return (
+    <Collapse defaultActiveKey={expanded && "rates"}>
+      <Collapse.Panel
+        forceRender
+        header={t("jobs.fields.materials.materials")}
+        key="materials"
+      >
+        <LayoutFormRow header={t("jobs.fields.materials.MAPA")}>
+          <Form.Item
+            label={t("jobs.fields.materials.cal_maxdlr")}
+            name={["materials", "MAPA", "cal_maxdlr"]}
+          >
+            <InputNumber min={0} precision={2} disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.materials.cal_opcode")}
+            name={["materials", "MAPA", "cal_opcode"]}
+          >
+            <Input disabled={jobRO} />
+          </Form.Item>
+
+          <Form.Item
+            label={t("jobs.fields.materials.tax_ind")}
+            name={["materials", "MAPA", "tax_ind"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.materials.mat_tx_in1")}
+            name={["materials", "MAPA", "mat_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.materials.mat_tx_in2")}
+            name={["materials", "MAPA", "mat_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.materials.mat_tx_in3")}
+            name={["materials", "MAPA", "mat_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.materials.mat_tx_in4")}
+            name={["materials", "MAPA", "mat_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.materials.mat_tx_in5")}
+            name={["materials", "MAPA", "mat_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+        </LayoutFormRow>
+        <LayoutFormRow header={t("jobs.fields.materials.MASH")}>
+          <Form.Item
+            label={t("jobs.fields.materials.cal_maxdlr")}
+            name={["materials", "MASH", "cal_maxdlr"]}
+          >
+            <InputNumber min={0} precision={2} disabled={jobRO} />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.materials.cal_opcode")}
+            name={["materials", "MASH", "cal_opcode"]}
+          >
+            <Input disabled={jobRO} />
+          </Form.Item>
+
+          <Form.Item
+            label={t("jobs.fields.materials.tax_ind")}
+            name={["materials", "MASH", "tax_ind"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.materials.mat_tx_in1")}
+            name={["materials", "MASH", "mat_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.materials.mat_tx_in2")}
+            name={["materials", "MASH", "mat_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.materials.mat_tx_in3")}
+            name={["materials", "MASH", "mat_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.materials.mat_tx_in4")}
+            name={["materials", "MASH", "mat_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.materials.mat_tx_in5")}
+            name={["materials", "MASH", "mat_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+        </LayoutFormRow>
+      </Collapse.Panel>
+    </Collapse>
+  );
+}
+export default connect(mapStateToProps, null)(JobsDetailRatesMaterials);

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

@@ -0,0 +1,104 @@
+import { Collapse, Form, Switch } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+const mapStateToProps = createStructuredSelector({
+  jobRO: selectJobReadOnly,
+});
+
+export function JobsDetailRatesOther({
+  jobRO,
+  expanded,
+  required = true,
+  form,
+}) {
+  const { t } = useTranslation();
+
+  return (
+    <Collapse defaultActiveKey={expanded && "rates"}>
+      <Collapse.Panel
+        forceRender
+        header={t("jobs.labels.cieca_pfo")}
+        key="cieca_pfo"
+      >
+        <LayoutFormRow noDivider>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfo.tow_t_in1")}
+            name={["cieca_pfo", "tow_t_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfo.tow_t_in2")}
+            name={["cieca_pfo", "tow_t_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfo.tow_t_in3")}
+            name={["cieca_pfo", "tow_t_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfo.tow_t_in4")}
+            name={["cieca_pfo", "tow_t_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfo.tow_t_in5")}
+            name={["cieca_pfo", "tow_t_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+
+          <Form.Item
+            label={t("jobs.fields.cieca_pfo.stor_t_in1")}
+            name={["cieca_pfo", "stor_t_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfo.stor_t_in2")}
+            name={["cieca_pfo", "stor_t_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfo.stor_t_in3")}
+            name={["cieca_pfo", "stor_t_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfo.stor_t_in4")}
+            name={["cieca_pfo", "stor_t_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.cieca_pfo.stor_t_in5")}
+            name={["cieca_pfo", "stor_t_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+        </LayoutFormRow>
+      </Collapse.Panel>
+    </Collapse>
+  );
+}
+export default connect(mapStateToProps, null)(JobsDetailRatesOther);

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

@@ -68,11 +68,51 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                  <InputNumber
+                    min={0}
+                    max={100}
+                    precision={4}
+                    disabled={jobRO}
+                  />
                 </Form.Item>
               );
             }}
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in1")}
+            name={["parts_tax_rates", "PAA", "prt_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in2")}
+            name={["parts_tax_rates", "PAA", "prt_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in3")}
+            name={["parts_tax_rates", "PAA", "prt_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in4")}
+            name={["parts_tax_rates", "PAA", "prt_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in5")}
+            name={["parts_tax_rates", "PAA", "prt_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.PAC")}>
           <Form.Item
@@ -118,11 +158,51 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                  <InputNumber
+                    min={0}
+                    max={100}
+                    precision={4}
+                    disabled={jobRO}
+                  />
                 </Form.Item>
               );
             }}
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in1")}
+            name={["parts_tax_rates", "PAC", "prt_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in2")}
+            name={["parts_tax_rates", "PAC", "prt_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in3")}
+            name={["parts_tax_rates", "PAC", "prt_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in4")}
+            name={["parts_tax_rates", "PAC", "prt_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in5")}
+            name={["parts_tax_rates", "PAC", "prt_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.PAL")}>
           <Form.Item
@@ -168,11 +248,51 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                  <InputNumber
+                    min={0}
+                    max={100}
+                    precision={4}
+                    disabled={jobRO}
+                  />
                 </Form.Item>
               );
             }}
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in1")}
+            name={["parts_tax_rates", "PAL", "prt_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in2")}
+            name={["parts_tax_rates", "PAL", "prt_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in3")}
+            name={["parts_tax_rates", "PAL", "prt_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in4")}
+            name={["parts_tax_rates", "PAL", "prt_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in5")}
+            name={["parts_tax_rates", "PAL", "prt_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.PAG")}>
           <Form.Item
@@ -218,11 +338,51 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                  <InputNumber
+                    min={0}
+                    max={100}
+                    precision={4}
+                    disabled={jobRO}
+                  />
                 </Form.Item>
               );
             }}
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in1")}
+            name={["parts_tax_rates", "PAG", "prt_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in2")}
+            name={["parts_tax_rates", "PAG", "prt_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in3")}
+            name={["parts_tax_rates", "PAG", "prt_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in4")}
+            name={["parts_tax_rates", "PAG", "prt_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in5")}
+            name={["parts_tax_rates", "PAG", "prt_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.PAM")}>
           <Form.Item
@@ -268,11 +428,51 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                  <InputNumber
+                    min={0}
+                    max={100}
+                    precision={4}
+                    disabled={jobRO}
+                  />
                 </Form.Item>
               );
             }}
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in1")}
+            name={["parts_tax_rates", "PAM", "prt_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in2")}
+            name={["parts_tax_rates", "PAM", "prt_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in3")}
+            name={["parts_tax_rates", "PAM", "prt_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in4")}
+            name={["parts_tax_rates", "PAM", "prt_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in5")}
+            name={["parts_tax_rates", "PAM", "prt_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.PAN")}>
           <Form.Item
@@ -318,11 +518,51 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                  <InputNumber
+                    min={0}
+                    max={100}
+                    precision={4}
+                    disabled={jobRO}
+                  />
                 </Form.Item>
               );
             }}
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in1")}
+            name={["parts_tax_rates", "PAN", "prt_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in2")}
+            name={["parts_tax_rates", "PAN", "prt_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in3")}
+            name={["parts_tax_rates", "PAN", "prt_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in4")}
+            name={["parts_tax_rates", "PAN", "prt_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in5")}
+            name={["parts_tax_rates", "PAN", "prt_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.PAO")}>
           <Form.Item
@@ -368,11 +608,51 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                  <InputNumber
+                    min={0}
+                    max={100}
+                    precision={4}
+                    disabled={jobRO}
+                  />
                 </Form.Item>
               );
             }}
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in1")}
+            name={["parts_tax_rates", "PAO", "prt_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in2")}
+            name={["parts_tax_rates", "PAO", "prt_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in3")}
+            name={["parts_tax_rates", "PAO", "prt_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in4")}
+            name={["parts_tax_rates", "PAO", "prt_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in5")}
+            name={["parts_tax_rates", "PAO", "prt_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.PAP")}>
           <Form.Item
@@ -418,11 +698,51 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                  <InputNumber
+                    min={0}
+                    max={100}
+                    precision={4}
+                    disabled={jobRO}
+                  />
                 </Form.Item>
               );
             }}
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in1")}
+            name={["parts_tax_rates", "PAP", "prt_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in2")}
+            name={["parts_tax_rates", "PAP", "prt_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in3")}
+            name={["parts_tax_rates", "PAP", "prt_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in4")}
+            name={["parts_tax_rates", "PAP", "prt_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in5")}
+            name={["parts_tax_rates", "PAP", "prt_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.PAR")}>
           <Form.Item
@@ -468,11 +788,51 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                  <InputNumber
+                    min={0}
+                    max={100}
+                    precision={4}
+                    disabled={jobRO}
+                  />
                 </Form.Item>
               );
             }}
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in1")}
+            name={["parts_tax_rates", "PAR", "prt_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in2")}
+            name={["parts_tax_rates", "PAR", "prt_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in3")}
+            name={["parts_tax_rates", "PAR", "prt_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in4")}
+            name={["parts_tax_rates", "PAR", "prt_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in5")}
+            name={["parts_tax_rates", "PAR", "prt_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.PAS")}>
           <Form.Item
@@ -518,11 +878,51 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                  <InputNumber
+                    min={0}
+                    max={100}
+                    precision={4}
+                    disabled={jobRO}
+                  />
                 </Form.Item>
               );
             }}
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in1")}
+            name={["parts_tax_rates", "PAS", "prt_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in2")}
+            name={["parts_tax_rates", "PAS", "prt_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in3")}
+            name={["parts_tax_rates", "PAS", "prt_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in4")}
+            name={["parts_tax_rates", "PAS", "prt_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in5")}
+            name={["parts_tax_rates", "PAS", "prt_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.PASL")}>
           <Form.Item
@@ -568,11 +968,51 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
+                  <InputNumber
+                    min={0}
+                    max={100}
+                    precision={4}
+                    disabled={jobRO}
+                  />
                 </Form.Item>
               );
             }}
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in1")}
+            name={["parts_tax_rates", "PASL", "prt_tx_in1"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in2")}
+            name={["parts_tax_rates", "PASL", "prt_tx_in2"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in3")}
+            name={["parts_tax_rates", "PASL", "prt_tx_in3"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in4")}
+            name={["parts_tax_rates", "PASL", "prt_tx_in4"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.parts_tax_rates.prt_tx_in5")}
+            name={["parts_tax_rates", "PASL", "prt_tx_in5"]}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.CCDR")}>
           <Form.Item

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

@@ -0,0 +1,42 @@
+import { Button, Popconfirm } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsDetailRatesProfileOVerride);
+
+export function JobsDetailRatesProfileOVerride({ bodyshop, form }) {
+  const { t } = useTranslation();
+  return (
+    <Popconfirm
+      onConfirm={() => {
+        form.setFieldsValue({
+          cieca_pft: {
+            ...bodyshop.md_responsibility_centers.taxes.tax_ty1,
+            ...bodyshop.md_responsibility_centers.taxes.tax_ty2,
+            ...bodyshop.md_responsibility_centers.taxes.tax_ty3,
+            ...bodyshop.md_responsibility_centers.taxes.tax_ty4,
+            ...bodyshop.md_responsibility_centers.taxes.tax_ty5,
+          },
+          materials: bodyshop.md_responsibility_centers.cieca_pfm,
+          cieca_pfl: bodyshop.md_responsibility_centers.cieca_pfl,
+          parts_tax_rates: bodyshop.md_responsibility_centers.parts_tax_rates,
+        });
+      }}
+      title={t("jobs.actions.taxprofileoverride_confirm")}
+    >
+      <Button type="link">{t("jobs.actions.taxprofileoverride")}</Button>
+    </Popconfirm>
+  );
+}

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

@@ -0,0 +1,155 @@
+import { Collapse, Divider, Form, Input, InputNumber, Space } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  jobRO: selectJobReadOnly,
+  bodyshop: selectBodyshop,
+});
+
+export function JobsDetailRatesTaxes({
+  jobRO,
+  expanded,
+  bodyshop,
+  required = true,
+  form,
+}) {
+  const { t } = useTranslation();
+  const formItems = [];
+  for (let tyCounter = 1; tyCounter <= 5; tyCounter++) {
+    const section = [];
+
+    section.push(
+      TaxFormItems({
+        typeNum: tyCounter,
+        rootElements: true,
+        bodyshop,
+        jobRO,
+      })
+    );
+
+    for (let iterator = 1; iterator <= 5; iterator++) {
+      section.push(
+        TaxFormItems({
+          typeNum: tyCounter,
+          typeNumIterator: iterator,
+          rootElements: false,
+          jobRO,
+        })
+      );
+    }
+    formItems.push(Space({ children: section, wrap: true }));
+    formItems.push(<Divider />);
+  }
+  return (
+    <Collapse defaultActiveKey={expanded && "rates"}>
+      <Collapse.Panel
+        forceRender
+        header={t("jobs.labels.cieca_pft")}
+        key="cieca_pft"
+      >
+        {formItems}
+      </Collapse.Panel>
+    </Collapse>
+  );
+}
+export default connect(mapStateToProps, null)(JobsDetailRatesTaxes);
+
+function TaxFormItems({
+  typeNum,
+  typeNumIterator,
+  rootElements,
+  bodyshopjobRO,
+  jobRO,
+}) {
+  const { t } = useTranslation();
+
+  if (rootElements)
+    return (
+      <>
+        <Form.Item
+          label={t("bodyshop.fields.responsibilitycenter_tax_type", {
+            typeNum,
+            typeNumIterator,
+          })}
+          // rules={[
+          //   {
+          //     required: true,
+          //     //message: t("general.validation.required"),
+          //   },
+          // ]}
+          name={["cieca_pft", `tax_type${typeNum}`]}
+        >
+          <Input disabled={jobRO} />
+        </Form.Item>
+      </>
+    );
+
+  return (
+    <>
+      <Form.Item
+        label={t("bodyshop.fields.responsibilitycenter_tax_tier", {
+          typeNum,
+          typeNumIterator,
+        })}
+        rules={[
+          {
+            required: true,
+            //message: t("general.validation.required"),
+          },
+        ]}
+        name={["cieca_pft", `ty${typeNum}_tier${typeNumIterator}`]}
+      >
+        <InputNumber precision={0} min={0} disabled={jobRO} />
+      </Form.Item>
+      <Form.Item
+        label={t("bodyshop.fields.responsibilitycenter_tax_thres", {
+          typeNum,
+          typeNumIterator,
+        })}
+        rules={[
+          {
+            required: true,
+            //message: t("general.validation.required"),
+          },
+        ]}
+        name={["cieca_pft", `ty${typeNum}_thres${typeNumIterator}`]}
+      >
+        <InputNumber min={0} precision={2} disabled={jobRO} />
+      </Form.Item>
+      <Form.Item
+        label={t("bodyshop.fields.responsibilitycenter_tax_rate", {
+          typeNum,
+          typeNumIterator,
+        })}
+        rules={[
+          {
+            required: true,
+            //message: t("general.validation.required"),
+          },
+        ]}
+        name={["cieca_pft", `ty${typeNum}_rate${typeNumIterator}`]}
+      >
+        <InputNumber min={0} precision={2} disabled={jobRO} />
+      </Form.Item>
+      <Form.Item
+        label={t("bodyshop.fields.responsibilitycenter_tax_sur", {
+          typeNum,
+          typeNumIterator,
+        })}
+        rules={[
+          {
+            required: true,
+            //message: t("general.validation.required"),
+          },
+        ]}
+        name={["cieca_pft", `ty${typeNum}_sur${typeNumIterator}`]}
+      >
+        <InputNumber min={0} precision={2} disabled={jobRO} />
+      </Form.Item>
+    </>
+  );
+}

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

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

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

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

client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx

@@ -1,10 +1,35 @@
-import { Card, Col, Row, Table } from "antd";
+import { useMutation } from "@apollo/client";
+import { Button, Card, Col, Row, Table, notification } from "antd";
+import moment from "moment-business-days";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { UPDATE_PARTS_DISPATCH_LINE } from "../../graphql/parts-dispatch.queries";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 
 export default function PartsDispatchExpander({ dispatch, job }) {
   const { t } = useTranslation();
+  const [updateDispatchLine] = useMutation(UPDATE_PARTS_DISPATCH_LINE);
+
+  const handleAccept = async ({ partsDispatchLineId }) => {
+    const accepted_at = moment();
+    const result = await updateDispatchLine({
+      variables: { id: partsDispatchLineId, line: { accepted_at } },
+      optimisticResponse: {
+        update_parts_dispatch_lines_by_pk: {
+          accepted_at,
+          id: partsDispatchLineId,
+        },
+      },
+    });
+    if (result.errors) {
+      notification.open({
+        type: "error",
+        message: t("parts_dispatch.errors.accepting", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+  };
 
   const columns = [
     {
@@ -28,9 +53,16 @@ export default function PartsDispatchExpander({ dispatch, job }) {
       width: "20%",
 
       //sorter: (a, b) => alphaSort(a.number, b.number),
-      render: (text, record) => (
-        <DateTimeFormatter>{record.accepted_at}</DateTimeFormatter>
-      ),
+      render: (text, record) =>
+        record.accepted_at ? (
+          <DateTimeFormatter>{record.accepted_at}</DateTimeFormatter>
+        ) : (
+          <Button
+            onClick={() => handleAccept({ partsDispatchLineId: record.id })}
+          >
+            {t("parts_dispatch.actions.accept")}
+          </Button>
+        ),
     },
   ];
   return (
@@ -38,7 +70,7 @@ export default function PartsDispatchExpander({ dispatch, job }) {
       <Row gutter={[16, 16]}>
         <Col span={24}>
           <Table
-            pagination={false}
+            rowKey={"id"}
             dataSource={dispatch.parts_dispatch_lines}
             columns={columns}
           />

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

@@ -113,6 +113,8 @@ export function PartsOrderListTableComponent({
                   id: pol.id,
                   line_desc: pol.line_desc,
                   quantity: pol.quantity,
+                  act_price: pol.act_price,
+                  oem_partno: pol.oem_partno,
                 };
               }),
             },

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

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

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

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

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

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

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

@@ -1,15 +1,24 @@
-import React, { useState } from "react";
 import { useMutation, useQuery } from "@apollo/client";
+import {
+  Button,
+  Descriptions,
+  InputNumber,
+  Modal,
+  Space,
+  notification,
+} from "antd";
+import axios from "axios";
+import moment from "moment";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import {
   GET_REFUNDABLE_AMOUNT_BY_JOBID,
   INSERT_PAYMENT_RESPONSE,
   QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID,
 } from "../../graphql/payment_response.queries";
-import { Button, Descriptions, InputNumber, Modal, notification } from "antd";
-import moment from "moment";
-import axios from "axios";
 import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
-import { useTranslation } from "react-i18next";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
 
 const { confirm } = Modal;
 
@@ -137,10 +146,10 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
           {payment_response?.response?.nameOnCard ?? ""}
         </Descriptions.Item>
         <Descriptions.Item label={t("job_payments.titles.amount")}>
-          {record.amount}
+          <CurrencyFormatter>{record.amount}</CurrencyFormatter>
         </Descriptions.Item>
         <Descriptions.Item label={t("job_payments.titles.dateOfPayment")}>
-          {moment(record.created_at).format("YYYY-MM-DD HH:mm:ss")}
+          {<DateTimeFormatter>{record.created_at}</DateTimeFormatter>}
         </Descriptions.Item>
         <Descriptions.Item label={t("job_payments.titles.transactionid")}>
           {record.transactionid}
@@ -151,17 +160,22 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
         <Descriptions.Item label={t("job_payments.titles.paymenttype")}>
           {record.type}
         </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.paymentnum")}>
+          {record.paymentnum}
+        </Descriptions.Item>
         {payment_response && (
           <Descriptions.Item label={t("job_payments.titles.refundamount")}>
-            <InputNumber
-              onChange={setRefundAmount}
-              max={max_refundable_amount}
-              min={0}
-            />
+            <Space>
+              <InputNumber
+                onChange={setRefundAmount}
+                max={max_refundable_amount}
+                min={0}
+              />
 
-            <Button onClick={() => showConfirm(payment_response)}>
-              {t("job_payments.buttons.refundpayment")}
-            </Button>
+              <Button onClick={() => showConfirm(payment_response)}>
+                {t("job_payments.buttons.refundpayment")}
+              </Button>
+            </Space>
           </Descriptions.Item>
         )}
       </Descriptions>

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

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

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

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

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

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

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

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

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

@@ -1,31 +1,33 @@
+import { PrinterFilled } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
-import { Descriptions, Drawer, Space, PageHeader, Button } from "antd";
+import { Button, Descriptions, Drawer, PageHeader, Space } from "antd";
 import queryString from "query-string";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
 import { useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import { QUERY_JOB_CARD_DETAILS } from "../../graphql/jobs.queries";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
+import JobAtChange from "../job-at-change/job-at-change.component";
 import JobDetailCardsDocumentsComponent from "../job-detail-cards/job-detail-cards.documents.component";
 import JobDetailCardsNotesComponent from "../job-detail-cards/job-detail-cards.notes.component";
 import JobDetailCardsPartsComponent from "../job-detail-cards/job-detail-cards.parts.component";
 import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container";
-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";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { setModalContext } from "../../redux/modals/modals.actions";
 import ScoreboardAddButton from "../job-scoreboard-add-button/job-scoreboard-add-button.component";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import ProductionRemoveButton from "../production-remove-button/production-remove-button.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
+  technician: selectTechnician,
 });
 const mapDispatchToProps = (dispatch) => ({
   setPrintCenterContext: (context) =>
@@ -40,6 +42,7 @@ export function ProductionListDetail({
   bodyshop,
   jobs,
   setPrintCenterContext,
+  technician,
 }) {
   const search = queryString.parse(useLocation().search);
   const history = useHistory();
@@ -66,7 +69,9 @@ export function ProductionListDetail({
           title={theJob.ro_number}
           extra={
             <Space wrap>
-              <ProductionRemoveButton jobId={theJob.id} />{" "}
+              {!technician ? (
+                <ProductionRemoveButton jobId={theJob.id} />
+              ) : null}
               <Button
                 onClick={() => {
                   setPrintCenterContext({
@@ -82,7 +87,9 @@ export function ProductionListDetail({
                 <PrinterFilled />
                 {t("jobs.actions.printCenter")}
               </Button>
-              <ScoreboardAddButton job={data ? data.jobs_by_pk : {}} />
+              {!technician ? (
+                <ScoreboardAddButton job={data ? data.jobs_by_pk : {}} />
+              ) : null}
             </Space>
           }
         />

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

@@ -59,11 +59,12 @@ export function ScheduleManualEvent({ bodyshop, event }) {
           refetchQueries: ["QUERY_ALL_ACTIVE_APPOINTMENTS"],
         });
       }
+      form.resetFields();
+      setVisibility(false);
     } catch (error) {
       console.log(error);
     } finally {
       setLoading(false);
-      setVisibility(false);
     }
   };
 

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

@@ -47,9 +47,7 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) {
             bodyhrs: dayAcc.bodyhrs + dayVal.bodyhrs,
             painthrs: dayAcc.painthrs + dayVal.painthrs,
             sales:
-              dayAcc.painthrs +
-              dayVal.job.job_totals.totals.subtotal.amount / 100 +
-              2500,
+              dayAcc.sales + dayVal.job.job_totals.totals.subtotal.amount / 100,
           };
         },
         { bodyhrs: 0, painthrs: 0, sales: 0 }

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

@@ -1,14 +1,14 @@
-import React, { useEffect, useState } from "react";
-import ShopInfoComponent from "./shop-info.component";
+import { useMutation, useQuery } from "@apollo/client";
 import { Form, notification } from "antd";
-import { useQuery, useMutation } from "@apollo/client";
-import { QUERY_BODYSHOP, UPDATE_SHOP } from "../../graphql/bodyshop.queries";
-import LoadingSpinner from "../loading-spinner/loading-spinner.component";
-import AlertComponent from "../alert/alert.component";
+import moment from "moment";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { QUERY_BODYSHOP, UPDATE_SHOP } from "../../graphql/bodyshop.queries";
+import AlertComponent from "../alert/alert.component";
 import FormsFieldChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
-import moment from "moment";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import ShopInfoComponent from "./shop-info.component";
 export default function ShopInfoContainer() {
   const [form] = Form.useForm();
   const { t } = useTranslation();
@@ -52,13 +52,28 @@ export default function ShopInfoContainer() {
       onFinish={handleFinish}
       initialValues={
         data
-          ? {
-              ...data.bodyshops[0],
-              schedule_start_time: moment(
-                data.bodyshops[0].schedule_start_time
-              ),
-              schedule_end_time: moment(data.bodyshops[0].schedule_end_time),
-            }
+          ? data.bodyshops[0].accountingconfig.ClosingPeriod
+            ? {
+                ...data.bodyshops[0],
+                accountingconfig: {
+                  ...data.bodyshops[0].accountingconfig,
+                  ClosingPeriod: [
+                    moment(data.bodyshops[0].accountingconfig.ClosingPeriod[0]),
+                    moment(data.bodyshops[0].accountingconfig.ClosingPeriod[1]),
+                  ],
+                },
+                schedule_start_time: moment(
+                  data.bodyshops[0].schedule_start_time
+                ),
+                schedule_end_time: moment(data.bodyshops[0].schedule_end_time),
+              }
+            : {
+                ...data.bodyshops[0],
+                schedule_start_time: moment(
+                  data.bodyshops[0].schedule_start_time
+                ),
+                schedule_end_time: moment(data.bodyshops[0].schedule_end_time),
+              }
           : null
       }
     >

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

@@ -1,6 +1,8 @@
 import { DeleteFilled } from "@ant-design/icons";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import {
   Button,
+  DatePicker,
   Form,
   Input,
   InputNumber,
@@ -9,8 +11,13 @@ import {
   Space,
   Switch,
 } from "antd";
+import momentTZ from "moment-timezone";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import DatePickerRanges from "../../utils/DatePickerRanges";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import PhoneFormItem, {
@@ -18,12 +25,22 @@ import PhoneFormItem, {
 } from "../form-items-formatted/phone-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-
-import momentTZ from "moment-timezone";
 const timeZonesList = momentTZ.tz.names();
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoGeneral);
 
-export default function ShopInfoGeneral({ form }) {
+export function ShopInfoGeneral({ form, bodyshop }) {
   const { t } = useTranslation();
+  const { ClosingPeriod } = useTreatments(
+    ["ClosingPeriod"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
 
   return (
     <div>
@@ -171,20 +188,22 @@ export default function ShopInfoGeneral({ form }) {
           <Switch />
         </Form.Item>
 
-        <Form.Item shouldUpdate noStyle>
-          {() => (
-            <Form.Item
-              label={t("bodyshop.labels.qbo_usa")}
-              shouldUpdate
-              valuePropName="checked"
-              name={["accountingconfig", "qbo_usa"]}
-            >
-              <Switch
-                disabled={!form.getFieldValue(["accountingconfig", "qbo"])}
-              />
-            </Form.Item>
-          )}
-        </Form.Item>
+        {
+          // <Form.Item shouldUpdate noStyle>
+          //   {() => (
+          //     <Form.Item
+          //       label={t("bodyshop.labels.qbo_usa")}
+          //       shouldUpdate
+          //       valuePropName="checked"
+          //       name={["accountingconfig", "qbo_usa"]}
+          //     >
+          //       <Switch
+          //         disabled={!form.getFieldValue(["accountingconfig", "qbo"])}
+          //       />
+          //     </Form.Item>
+          //   )}
+          // </Form.Item>
+        }
         <Form.Item
           label={t("bodyshop.labels.qbo_departmentid")}
           name={["accountingconfig", "qbo_departmentid"]}
@@ -273,36 +292,34 @@ export default function ShopInfoGeneral({ form }) {
         >
           <InputNumber min={0} precision={2} />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.federal_tax_id")}
-          name="federal_tax_id"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
+        {
+          // <Form.Item
+          //   label={t("bodyshop.fields.federal_tax_id")}
+          //   name="federal_tax_id"
+          // >
+          //   <Input />
+          // </Form.Item>
+        }
         <Form.Item
           label={t("bodyshop.fields.state_tax_id")}
           name="state_tax_id"
         >
           <Input />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.invoice_federal_tax_rate")}
-          name={["bill_tax_rates", "federal_tax_rate"]}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <InputNumber />
-        </Form.Item>
+        {
+          // <Form.Item
+          //   label={t("bodyshop.fields.invoice_federal_tax_rate")}
+          //   name={["bill_tax_rates", "federal_tax_rate"]}
+          //   rules={[
+          //     {
+          //       required: true,
+          //       //message: t("general.validation.required"),
+          //     },
+          //   ]}
+          // >
+          //   <InputNumber />
+          // </Form.Item>
+        }
         <Form.Item
           label={t("bodyshop.fields.invoice_state_tax_rate")}
           name={["bill_tax_rates", "state_tax_rate"]}
@@ -392,6 +409,20 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Select mode="tags" />
         </Form.Item>
+        {ClosingPeriod.treatment === "on" && (
+          <>
+            <Form.Item
+              allowClear
+              name={["accountingconfig", "ClosingPeriod"]}
+              label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
+            >
+              <DatePicker.RangePicker
+                format="MM/DD/YYYY"
+                ranges={DatePickerRanges}
+              />
+            </Form.Item>
+          </>
+        )}
       </LayoutFormRow>
       <LayoutFormRow
         header={t("bodyshop.labels.scoreboardsetup")}
@@ -604,7 +635,9 @@ export default function ShopInfoGeneral({ form }) {
         </Form.Item>
         <Form.Item
           name={["md_email_cc", "parts_return_slip"]}
-          label={t("bodyshop.fields.md_email_cc", { template: "parts_return_slip" })}
+          label={t("bodyshop.fields.md_email_cc", {
+            template: "parts_return_slip",
+          })}
           rules={[
             {
               //message: t("general.validation.required"),

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

@@ -17,6 +17,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { useTreatments } from "@splitsoftware/splitio-react";
+import ShopInfoResponsibilitycentersTaxesComponent from "./shop-info.responsibilitycenters.taxes.component";
 
 const SelectorDiv = styled.div`
   .ant-form-item .ant-select {
@@ -4116,122 +4117,124 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         </LayoutFormRow>
       </SelectorDiv>
 
-      <LayoutFormRow
-        header={t("bodyshop.labels.responsibilitycenters.tax_accounts")}
-        id="tax_accounts"
-      >
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenters.federal_tax")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "taxes", "federal", "name"]}
-        >
-          <Input />
-        </Form.Item>
-        {/* <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={[
-            "md_responsibility_centers",
-            "taxes",
-            "federal",
-            "accountnumber",
-          ]}
-        >
-          <Input />
-        </Form.Item> */}
-        {/* <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountname")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={[
-            "md_responsibility_centers",
-            "taxes",
-            "federal",
-            "accountname",
-          ]}
-        >
-          <Input />
-        </Form.Item> */}
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={[
-            "md_responsibility_centers",
-            "taxes",
-            "federal",
-            "accountdesc",
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountitem")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={[
-            "md_responsibility_centers",
-            "taxes",
-            "federal",
-            "accountitem",
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
-          <Form.Item
-            label={t("bodyshop.fields.dms.dms_acctnumber")}
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-              },
-            ]}
-            name={[
-              "md_responsibility_centers",
-              "taxes",
-              "federal",
-              "dms_acctnumber",
-            ]}
-          >
-            <Input />
-          </Form.Item>
-        )}
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_rate")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "taxes", "federal", "rate"]}
-        >
-          <InputNumber precision={2} />
-        </Form.Item>
-      </LayoutFormRow>
+      {
+        //   <LayoutFormRow
+        //   header={t("bodyshop.labels.responsibilitycenters.tax_accounts")}
+        //   id="tax_accounts"
+        // >
+        //   <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenters.federal_tax")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={["md_responsibility_centers", "taxes", "federal", "name"]}
+        //   >
+        //     <Input />
+        //   </Form.Item>
+        //   {/* <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={[
+        //       "md_responsibility_centers",
+        //       "taxes",
+        //       "federal",
+        //       "accountnumber",
+        //     ]}
+        //   >
+        //     <Input />
+        //   </Form.Item> */}
+        //   {/* <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenter_accountname")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={[
+        //       "md_responsibility_centers",
+        //       "taxes",
+        //       "federal",
+        //       "accountname",
+        //     ]}
+        //   >
+        //     <Input />
+        //   </Form.Item> */}
+        //   <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={[
+        //       "md_responsibility_centers",
+        //       "taxes",
+        //       "federal",
+        //       "accountdesc",
+        //     ]}
+        //   >
+        //     <Input />
+        //   </Form.Item>
+        //   <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenter_accountitem")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={[
+        //       "md_responsibility_centers",
+        //       "taxes",
+        //       "federal",
+        //       "accountitem",
+        //     ]}
+        //   >
+        //     <Input />
+        //   </Form.Item>
+        //   {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
+        //     <Form.Item
+        //       label={t("bodyshop.fields.dms.dms_acctnumber")}
+        //       rules={[
+        //         {
+        //           required: true,
+        //           //message: t("general.validation.required"),
+        //         },
+        //       ]}
+        //       name={[
+        //         "md_responsibility_centers",
+        //         "taxes",
+        //         "federal",
+        //         "dms_acctnumber",
+        //       ]}
+        //     >
+        //       <Input />
+        //     </Form.Item>
+        //   )}
+        //   <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenter_rate")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={["md_responsibility_centers", "taxes", "federal", "rate"]}
+        //   >
+        //     <InputNumber precision={2} />
+        //   </Form.Item>
+        // </LayoutFormRow>
+      }
       {DmsAp.treatment === "on" && (
         <LayoutFormRow id="federal_tax_itc">
           <Form.Item
@@ -4347,104 +4350,107 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </Form.Item>
         </LayoutFormRow>
       )}
-      <LayoutFormRow id="state_tax">
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenters.state_tax")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "taxes", "state", "name"]}
-        >
-          <Input />
-        </Form.Item>
-        {/* <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={[
-            "md_responsibility_centers",
-            "taxes",
-            "state",
-            "accountnumber",
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountname")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "taxes", "state", "accountname"]}
-        >
-          <Input />
-        </Form.Item> */}
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "taxes", "state", "accountdesc"]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountitem")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "taxes", "state", "accountitem"]}
-        >
-          <Input />
-        </Form.Item>
-        {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
-          <Form.Item
-            label={t("bodyshop.fields.dms.dms_acctnumber")}
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-              },
-            ]}
-            name={[
-              "md_responsibility_centers",
-              "taxes",
-              "state",
-              "dms_acctnumber",
-            ]}
-          >
-            <Input />
-          </Form.Item>
-        )}
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_rate")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "taxes", "state", "rate"]}
-        >
-          <InputNumber precision={2} />
-        </Form.Item>
-      </LayoutFormRow>
+      {
+        //   <LayoutFormRow id="state_tax">
+        //   <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenters.state_tax")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={["md_responsibility_centers", "taxes", "state", "name"]}
+        //   >
+        //     <Input />
+        //   </Form.Item>
+        //   {/* <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={[
+        //       "md_responsibility_centers",
+        //       "taxes",
+        //       "state",
+        //       "accountnumber",
+        //     ]}
+        //   >
+        //     <Input />
+        //   </Form.Item>
+        //   <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenter_accountname")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={["md_responsibility_centers", "taxes", "state", "accountname"]}
+        //   >
+        //     <Input />
+        //   </Form.Item> */}
+        //   <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={["md_responsibility_centers", "taxes", "state", "accountdesc"]}
+        //   >
+        //     <Input />
+        //   </Form.Item>
+        //   <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenter_accountitem")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={["md_responsibility_centers", "taxes", "state", "accountitem"]}
+        //   >
+        //     <Input />
+        //   </Form.Item>
+        //   {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
+        //     <Form.Item
+        //       label={t("bodyshop.fields.dms.dms_acctnumber")}
+        //       rules={[
+        //         {
+        //           required: true,
+        //           //message: t("general.validation.required"),
+        //         },
+        //       ]}
+        //       name={[
+        //         "md_responsibility_centers",
+        //         "taxes",
+        //         "state",
+        //         "dms_acctnumber",
+        //       ]}
+        //     >
+        //       <Input />
+        //     </Form.Item>
+        //   )}
+        //   <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenter_rate")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={["md_responsibility_centers", "taxes", "state", "rate"]}
+        //   >
+        //     <InputNumber precision={2} />
+        //   </Form.Item>
+        // </LayoutFormRow>
+      }
+      <ShopInfoResponsibilitycentersTaxesComponent form={form} />
       <Form.Item
         label={t("bodyshop.fields.responsibilitycenters.itemexemptcode")}
         rules={[
@@ -4470,104 +4476,116 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         <Input />
       </Form.Item>
 
-      <LayoutFormRow id="local_tax">
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenters.local_tax")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "taxes", "local", "name"]}
-        >
-          <Input />
-        </Form.Item>
-        {/* <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={[
-            "md_responsibility_centers",
-            "taxes",
-            "local",
-            "accountnumber",
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountname")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "taxes", "local", "accountname"]}
-        >
-          <Input />
-        </Form.Item> */}
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "taxes", "local", "accountdesc"]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountitem")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "taxes", "local", "accountitem"]}
-        >
-          <Input />
-        </Form.Item>
-        {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
-          <Form.Item
-            label={t("bodyshop.fields.dms.dms_acctnumber")}
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-              },
-            ]}
-            name={[
-              "md_responsibility_centers",
-              "taxes",
-              "local",
-              "dms_acctnumber",
-            ]}
-          >
-            <Input />
-          </Form.Item>
-        )}
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_rate")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "taxes", "local", "rate"]}
-        >
-          <InputNumber precision={2} />
-        </Form.Item>
-      </LayoutFormRow>
+      {
+        // <LayoutFormRow id="local_tax">
+        //   <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenters.local_tax")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={["md_responsibility_centers", "taxes", "local", "name"]}
+        //   >
+        //     <Input />
+        //   </Form.Item>
+        //   {/* <Form.Item
+        //   label={t("bodyshop.fields.responsibilitycenter_accountnumber")}
+        //   rules={[
+        //     {
+        //       required: true,
+        //       //message: t("general.validation.required"),
+        //     },
+        //   ]}
+        //   name={[
+        //     "md_responsibility_centers",
+        //     "taxes",
+        //     "local",
+        //     "accountnumber",
+        //   ]}
+        // >
+        //   <Input />
+        // </Form.Item>
+        // <Form.Item
+        //   label={t("bodyshop.fields.responsibilitycenter_accountname")}
+        //   rules={[
+        //     {
+        //       required: true,
+        //       //message: t("general.validation.required"),
+        //     },
+        //   ]}
+        //   name={["md_responsibility_centers", "taxes", "local", "accountname"]}
+        // >
+        //   <Input />
+        // </Form.Item> */}
+        //   <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={[
+        //       "md_responsibility_centers",
+        //       "taxes",
+        //       "local",
+        //       "accountdesc",
+        //     ]}
+        //   >
+        //     <Input />
+        //   </Form.Item>
+        //   <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenter_accountitem")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={[
+        //       "md_responsibility_centers",
+        //       "taxes",
+        //       "local",
+        //       "accountitem",
+        //     ]}
+        //   >
+        //     <Input />
+        //   </Form.Item>
+        //   {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
+        //     <Form.Item
+        //       label={t("bodyshop.fields.dms.dms_acctnumber")}
+        //       rules={[
+        //         {
+        //           required: true,
+        //           //message: t("general.validation.required"),
+        //         },
+        //       ]}
+        //       name={[
+        //         "md_responsibility_centers",
+        //         "taxes",
+        //         "local",
+        //         "dms_acctnumber",
+        //       ]}
+        //     >
+        //       <Input />
+        //     </Form.Item>
+        //   )}
+        //   <Form.Item
+        //     label={t("bodyshop.fields.responsibilitycenter_rate")}
+        //     rules={[
+        //       {
+        //         required: true,
+        //         //message: t("general.validation.required"),
+        //       },
+        //     ]}
+        //     name={["md_responsibility_centers", "taxes", "local", "rate"]}
+        //   >
+        //     <InputNumber precision={2} />
+        //   </Form.Item>
+        // </LayoutFormRow>
+      }
       <LayoutFormRow header={<div>AR</div>} id="AR">
         {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.ar")}

client/src/components/sign-in-form/sign-in-form.component.jsx

@@ -1,12 +1,12 @@
 import { LockOutlined, UserOutlined } from "@ant-design/icons";
-import { Button, Form, Input, Typography } from "antd";
+import { Button, Form, Input } from "antd";
 import queryString from "query-string";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, Redirect, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import RomeLogo from "../../assets/romelogo.png";
+import RomeLogo from "../../assets/RomeOnlineBlue.png";
 import {
   emailSignInStart,
   sendPasswordReset,
@@ -54,7 +54,6 @@ export function SignInComponent({
     <div className="login-container">
       <div className="login-logo-container">
         <img src={RomeLogo} width={200} alt="Rome Online" />
-        <Typography.Title>{t("titles.app")}</Typography.Title>
       </div>
       <Form onFinish={handleFinish} form={form} size="large">
         <Form.Item

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

@@ -1,22 +1,27 @@
 import { useMutation } from "@apollo/client";
 import { Button, Card, Form, notification, Space } from "antd";
 import axios from "axios";
+import moment from "moment";
+import momenttz from "moment-timezone";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 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";
-import moment from "moment";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import TechJobPrintTickets from "../tech-job-print-tickets/tech-job-print-tickets.component";
+import TechClockInComponent from "./tech-job-clock-in-form.component";
 import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   technician: selectTechnician,
   bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
   setTimeTicketContext: (context) =>
@@ -26,6 +31,7 @@ export function TechClockInContainer({
   setTimeTicketContext,
   technician,
   bodyshop,
+  currentUser,
 }) {
   const { Enhanced_Payroll } = useTreatments(
     ["Enhanced_Payroll"],
@@ -46,14 +52,20 @@ export function TechClockInContainer({
   const handleFinish = async (values) => {
     setLoading(true);
     const theTime = (await axios.post("/utils/time")).data;
-
     const result = await insertTimeTicket({
       variables: {
         timeTicketInput: [
           {
             bodyshopid: bodyshop.id,
             employeeid: technician.id,
-            date: moment(theTime).format("YYYY-MM-DD"),
+            date:
+              typeof bodyshop.timezone === "string"
+                ? momenttz.tz(theTime, bodyshop.timezone).format("YYYY-MM-DD")
+                : typeof bodyshop.timezone === "number"
+                ? moment(theTime)
+                    .format("YYYY-MM-DD")
+                    .utcOffset(bodyshop.timezone)
+                : moment(theTime).format("YYYY-MM-DD"),
             clockon: moment(theTime),
             jobid: values.jobid,
             cost_center: values.cost_center,
@@ -68,6 +80,12 @@ export function TechClockInContainer({
                       values.cost_center
                     );
                   }),
+            created_by: currentUser.email.concat(
+              " | ",
+              technician.employee_number
+                .concat(" ", technician.first_name, " ", technician.last_name)
+                .trim()
+            ),
           },
         ],
       },
@@ -102,13 +120,24 @@ export function TechClockInContainer({
                     employeeid: technician.id,
                     flat_rate: emps.flat_rate,
                   },
+                  created_by: currentUser.email.concat(
+                    " | ",
+                    technician.employee_number
+                      .concat(
+                        " ",
+                        technician.first_name,
+                        " ",
+                        technician.last_name
+                      )
+                      .trim()
+                  ),
                 },
               });
             }}
           >
             {t("timetickets.actions.enter")}
           </Button>
-          <TechJobPrintTickets />
+          <TechJobPrintTickets attendacePrint={false} />
           <Button
             type="primary"
             onClick={() => form.submit()}

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

@@ -1,4 +1,4 @@
-import { Button, Card, DatePicker, Form, Popover, Space } from "antd";
+import { Button, Card, DatePicker, Form, Popover, Radio, Space } from "antd";
 import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -21,12 +21,13 @@ export default connect(
   mapDispatchToProps
 )(TechJobPrintTickets);
 
-export function TechJobPrintTickets({ technician, event }) {
+export function TechJobPrintTickets({ technician, event, attendacePrint }) {
   const { t } = useTranslation();
 
   const [loading, setLoading] = useState(false);
   const [form] = Form.useForm();
   const [visibility, setVisibility] = useState(false);
+  const Templates = TemplateList("report_center");
 
   useEffect(() => {
     if (visibility && event) {
@@ -44,7 +45,10 @@ export function TechJobPrintTickets({ technician, event }) {
     try {
       await GenerateDocument(
         {
-          name: TemplateList().timetickets_employee.key,
+          name:
+            attendacePrint === true
+              ? Templates.attendance_employee.key
+              : Templates.timetickets_employee.key,
           variables: {
             ...(start
               ? { start: moment(start).startOf("day").format("YYYY-MM-DD") }
@@ -60,9 +64,12 @@ export function TechJobPrintTickets({ technician, event }) {
         },
         {
           to: technician.email,
-          subject: TemplateList().timetickets_employee.subject,
+          subject:
+            attendacePrint === true
+              ? Templates.attendance_employee.subject
+              : Templates.timetickets_employee.subject,
         },
-        "p"
+        values.sendby // === "email" ? "e" : "p"
       );
     } catch (error) {
       console.log(error);
@@ -92,10 +99,25 @@ export function TechJobPrintTickets({ technician, event }) {
               format={"MM/DD/YYYY"}
             />
           </Form.Item>
-
+          <Form.Item dependencies={["dates"]}>
+            {() => {
+              return (
+                <Form.Item
+                  label={t("general.labels.sendby")}
+                  name="sendby"
+                  initialValue="p"
+                >
+                  <Radio.Group>
+                    <Radio value="e">{t("general.labels.email")}</Radio>
+                    <Radio value="p">{t("general.labels.print")}</Radio>
+                  </Radio.Group>
+                </Form.Item>
+              );
+            }}
+          </Form.Item>
           <Space wrap>
             <Button type="primary" onClick={() => form.submit()}>
-              {t("general.actions.print")}
+              {t("reportcenter.actions.generate")}
             </Button>
             <Button
               onClick={() => {
@@ -118,7 +140,7 @@ export function TechJobPrintTickets({ technician, event }) {
   return (
     <Popover content={overlay} visible={visibility}>
       <Button loading={loading} onClick={handleClick}>
-        {t("general.actions.print")}
+        {t("general.labels.reports")}
       </Button>
     </Popover>
   );

client/src/components/tech-sider/tech-sider.component.jsx

@@ -2,6 +2,7 @@ import Icon, {
   SearchOutlined,
   ScheduleOutlined,
   UserAddOutlined,
+  CarOutlined,
 } from "@ant-design/icons";
 import { Layout, Menu } from "antd";
 import React, { useState } from "react";
@@ -113,6 +114,15 @@ export function TechSider({
         <Menu.Item key="5" disabled={!!!technician} icon={<ScheduleOutlined />}>
           <Link to={`/tech/list`}>{t("menus.tech.productionlist")}</Link>
         </Menu.Item>
+        <Menu.Item
+          key="dispatchedparts"
+          disabled={!!!technician}
+          icon={<CarOutlined />}
+        >
+          <Link to={`/tech/dispatchedparts`}>
+            {t("menus.tech.dispatchedparts")}
+          </Link>
+        </Menu.Item>
         <Menu.Item
           key="6"
           disabled={!!!technician}

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

@@ -10,6 +10,7 @@ import { setModalContext } from "../../redux/modals/modals.actions";
 import {
   selectAuthLevel,
   selectBodyshop,
+  selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
 import { onlyUnique } from "../../utils/arrayHelper";
@@ -23,6 +24,7 @@ import { useTreatments } from "@splitsoftware/splitio-react";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   authLevel: selectAuthLevel,
+  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
   setTimeTicketTaskContext: (context) =>
@@ -34,6 +36,7 @@ export function TimeTicketList({
   bodyshop,
   setTimeTicketTaskContext,
   authLevel,
+  currentUser,
   disabled,
   loading,
   timetickets,
@@ -238,7 +241,15 @@ export function TimeTicketList({
             },
           },
         ]),
-
+    {
+      title: t("timetickets.fields.created_by"),
+      dataIndex: "created_by",
+      key: "created_by",
+      sorter: (a, b) => alphaSort(a.created_by, b.created_by),
+      sortOrder:
+        state.sortedInfo.columnKey === "created_by" && state.sortedInfo.order,
+      render: (text, record) => record.created_by,
+    },
     // {
     //   title: "Pay",
     //   dataIndex: "pay",
@@ -326,7 +337,12 @@ export function TimeTicketList({
             (techConsole ? null : (
               <TimeTicketEnterButton
                 actions={{ refetch }}
-                context={{ jobId: jobId }}
+                context={{
+                  jobId: jobId,
+                  created_by: currentUser.displayName
+                    ? currentUser.email.concat(" | ", currentUser.displayName)
+                    : currentUser.email,
+                }}
                 disabled={disabled}
               >
                 {t("timetickets.actions.enter")}

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

@@ -1,5 +1,5 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { Button, Form, Modal, notification, PageHeader, Space } from "antd";
+import { Button, Form, Modal, PageHeader, Space, notification } from "antd";
 import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -83,6 +83,7 @@ export function TimeTicketModalContainer({
                     )[0].rate
                   : null,
               bodyshopid: bodyshop.id,
+              created_by: timeTicketModal.context.created_by,
             },
           ],
         },

client/src/components/time-ticket-shift-active/time-ticket-shift-active.component.jsx

@@ -4,48 +4,67 @@ import { useTranslation } from "react-i18next";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import DataLabel from "../data-label/data-label.component";
 import TechClockOffButton from "../tech-job-clock-out-button/tech-job-clock-out-button.component";
+import TechJobPrintTickets from "../tech-job-print-tickets/tech-job-print-tickets.component";
 
-export default function TimeTicketShiftActive({ timetickets, refetch }) {
+export default function TimeTicketShiftActive({
+  timetickets,
+  refetch,
+  isTechConsole,
+}) {
   const { t } = useTranslation();
 
   return (
     <div>
       {timetickets.length > 0 ? (
-        <div>
-          <Typography.Title level={2}>
-            {t("timetickets.labels.shiftalreadyclockedon")}
-          </Typography.Title>
-          <List
-            grid={{
-              gutter: 32,
-              xs: 1,
-              sm: 2,
-              md: 3,
-              lg: 4,
-              xl: 5,
-              xxl: 6,
-            }}
-            dataSource={timetickets || []}
-            renderItem={(ticket) => (
-              <List.Item>
-                <Card
-                  title={t(ticket.memo)}
-                  actions={[
-                    <TechClockOffButton
-                      jobId={ticket.jobid}
-                      timeTicketId={ticket.id}
-                      completedCallback={refetch}
-                      isShiftTicket
-                    />,
-                  ]}
-                >
-                  <DataLabel label={t("timetickets.fields.clockon")}>
-                    <DateTimeFormatter>{ticket.clockon}</DateTimeFormatter>
-                  </DataLabel>
-                </Card>
-              </List.Item>
-            )}
-          ></List>
+        <div
+          style={{
+            display: "flex",
+            justifyContent: "space-between",
+            flexDirection: "column",
+            height: "100%",
+          }}
+        >
+          <div style={{ display: "flex", justifyContent: "space-between" }}>
+            <Typography.Title level={2}>
+              {t("timetickets.labels.shiftalreadyclockedon")}
+            </Typography.Title>
+            {isTechConsole ? (
+              <TechJobPrintTickets attendacePrint={true} />
+            ) : null}
+          </div>
+          <div style={{ flexGrow: 1 }}>
+            <List
+              grid={{
+                gutter: 32,
+                xs: 1,
+                sm: 2,
+                md: 3,
+                lg: 4,
+                xl: 5,
+                xxl: 6,
+              }}
+              dataSource={timetickets || []}
+              renderItem={(ticket) => (
+                <List.Item>
+                  <Card
+                    title={t(ticket.memo)}
+                    actions={[
+                      <TechClockOffButton
+                        jobId={ticket.jobid}
+                        timeTicketId={ticket.id}
+                        completedCallback={refetch}
+                        isShiftTicket
+                      />,
+                    ]}
+                  >
+                    <DataLabel label={t("timetickets.fields.clockon")}>
+                      <DateTimeFormatter>{ticket.clockon}</DateTimeFormatter>
+                    </DataLabel>
+                  </Card>
+                </List.Item>
+              )}
+            ></List>
+          </div>
         </div>
       ) : null}
     </div>

client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx

@@ -1,7 +1,8 @@
 import { useMutation } from "@apollo/client";
-import { Button, Form, notification } from "antd";
+import { Button, Form, Space, notification } from "antd";
 import axios from "axios";
 import moment from "moment";
+import momenttz from "moment-timezone";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -12,6 +13,7 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import TechJobPrintTickets from "../tech-job-print-tickets/tech-job-print-tickets.component";
 import TimeTicektShiftComponent from "./time-ticket-shift-form.component";
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -29,6 +31,10 @@ export function TimeTicektShiftContainer({
   isTechConsole,
   checkIfAlreadyClocked,
 }) {
+  console.log(
+    "🚀 ~ file: time-ticket-shift-form.container.jsx:28 ~ technician:",
+    technician
+  );
   const [form] = Form.useForm();
   const [insertTimeTicket] = useMutation(INSERT_NEW_TIME_TICKET);
   const { t } = useTranslation();
@@ -63,8 +69,30 @@ export function TimeTicektShiftContainer({
               employeeid: isTechConsole ? technician.id : employeeId,
               cost_center: "timetickets.labels.shift",
               clockon: theTime,
-              date: theTime,
+              date:
+                typeof bodyshop.timezone === "string"
+                  ? momenttz.tz(theTime, bodyshop.timezone).format("YYYY-MM-DD")
+                  : typeof bodyshop.timezone === "number"
+                  ? moment(theTime)
+                      .utcOffset(bodyshop.timezone)
+                      .format("YYYY-MM-DD")
+                  : moment(theTime).format("YYYY-MM-DD"),
               memo: values.memo,
+              created_by: isTechConsole
+                ? currentUser.email.concat(
+                    " | ",
+                    technician.employee_number
+                      .concat(
+                        " ",
+                        technician.first_name,
+                        " ",
+                        technician.last_name
+                      )
+                      .trim()
+                  )
+                : currentUser.displayName
+                ? currentUser.email.concat(" | ", currentUser.displayName)
+                : currentUser.email,
             },
           ],
         },
@@ -98,9 +126,14 @@ export function TimeTicektShiftContainer({
         initialValues={{ cost_center: t("timetickets.labels.shift") }}
       >
         <TimeTicektShiftComponent form={form} />
-        <Button htmlType="submit" loading={loading}>
-          {t("timetickets.actions.clockin")}
-        </Button>
+        <Space wrap>
+          <Button htmlType="submit" loading={loading} type="primary">
+            {t("timetickets.actions.clockin")}
+          </Button>
+          {isTechConsole === true ? (
+            <TechJobPrintTickets attendacePrint={true} />
+          ) : null}
+        </Space>
       </Form>
     </div>
   );

client/src/components/time-ticket-shift/time-ticket-shift.container.jsx

@@ -76,6 +76,7 @@ export function TimeTicketShiftContainer({
         <TimeTicketShiftActive
           timetickets={data ? data.timetickets : []}
           refetch={refetch}
+          isTechConsole={isTechConsole}
         />
       ) : (
         <TimeTicketShiftFormContainer

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

@@ -6,8 +6,9 @@ import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import VehicleDetailUpdateJobsComponent from "../vehicle-detail-update-jobs/vehicle-detail-update-jobs.component";
+import { alphaSort, statusSort } from "../../utils/sorters";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import VehicleDetailUpdateJobsComponent from "../vehicle-detail-update-jobs/vehicle-detail-update-jobs.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -16,6 +17,14 @@ const mapStateToProps = createStructuredSelector({
 export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
   const { t } = useTranslation();
   const [selectedJobs, setSelectedJobs] = useState([]);
+  const [state, setState] = useState({
+    sortedInfo: {},
+    filteredInfo: { text: "" },
+  });
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  };
 
   const columns = [
     {
@@ -28,6 +37,9 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
           {record.ro_number || t("general.labels.na")}
         </Link>
       ),
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+      sortOrder:
+        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
     },
     {
       title: t("jobs.fields.owner"),
@@ -43,11 +55,17 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
       title: t("jobs.fields.clm_no"),
       dataIndex: "clm_no",
       key: "clm_no",
+      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
+      sortOrder:
+        state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
     },
     {
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
+      sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
+      sortOrder:
+        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
     },
 
     {
@@ -57,6 +75,9 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
       render: (text, record) => (
         <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
       ),
+      sorter: (a, b) => a.clm_total - b.clm_total,
+      sortOrder:
+        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
     },
   ];
 
@@ -76,6 +97,7 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
         rowKey="id"
         scroll={{ x: true }}
         dataSource={vehicle.jobs}
+        onChange={handleTableChange}
         rowSelection={{
           onSelect: (record, selected, selectedRows) => {
             setSelectedJobs(selectedRows ? selectedRows.map((i) => i.id) : []);

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

@@ -57,6 +57,7 @@ export const GET_LINE_TICKET_BY_PK = gql`
       actualhrs
       ciecacode
       cost_center
+      created_by
       date
       id
       jobid

client/src/graphql/jobs.queries.js

@@ -574,7 +574,6 @@ export const GET_JOB_BY_PK = gql`
       est_co_nm
       est_ct_fn
       est_ct_ln
-
       est_ph1
       est_ea
       selling_dealer
@@ -756,8 +755,8 @@ export const GET_JOB_BY_PK = gql`
         jobid
         amount
         payer
+        paymentnum
         created_at
-        stripeid
         transactionid
         memo
         date
@@ -780,6 +779,10 @@ export const GET_JOB_BY_PK = gql`
         }
       }
       cieca_ttl
+      cieca_pfo
+      cieca_pfl
+      cieca_pft
+      materials
       csiinvites {
         id
         completedon
@@ -913,6 +916,18 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         ioucreated
         convertedtolbr
         critical
+        parts_dispatch_lines {
+          id
+          accepted_at
+          quantity
+          parts_dispatch {
+            id
+            employeeid
+            dispatched_at
+            dispatched_by
+            number
+          }
+        }
       }
       owner {
         id
@@ -2181,6 +2196,18 @@ export const GET_JOB_LINE_ORDERS = gql`
         }
       }
     }
+    parts_dispatch_lines(where: { joblineid: { _eq: $joblineid } }) {
+      id
+      accepted_at
+      quantity
+      parts_dispatch {
+        id
+        employeeid
+        dispatched_at
+        dispatched_by
+        number
+      }
+    }
     parts_order_lines(where: { job_line_id: { _eq: $joblineid } }) {
       id
       act_price

client/src/graphql/owners.queries.js

@@ -69,7 +69,7 @@ export const QUERY_OWNER_BY_ID = gql`
       preferred_contact
       note
       tax_number
-      jobs {
+      jobs(order_by: { date_open: desc }) {
         id
         ro_number
         clm_no

client/src/graphql/parts-dispatch.queries.js

@@ -15,3 +15,65 @@ export const INSERT_PARTS_DISPATCH = gql`
     }
   }
 `;
+
+export const GET_UNACCEPTED_PARTS_DISPATCH = gql`
+  query GET_UNACCEPTED_PARTS_DISPATCH(
+    $techId: uuid!
+    $offset: Int
+    $limit: Int
+  ) {
+    parts_dispatch_aggregate(
+      where: {
+        employeeid: { _eq: $techId }
+        parts_dispatch_lines: { accepted_at: { _is_null: true } }
+      }
+    ) {
+      aggregate {
+        count(distinct: true)
+      }
+    }
+    parts_dispatch(
+      offset: $offset
+      limit: $limit
+      where: {
+        employeeid: { _eq: $techId }
+        parts_dispatch_lines: { accepted_at: { _is_null: true } }
+      }
+    ) {
+      id
+      job {
+        id
+        ro_number
+        status
+        v_make_desc
+        v_model_desc
+        v_model_yr
+        v_color
+      }
+      dispatched_at
+      dispatched_by
+      parts_dispatch_lines {
+        id
+        accepted_at
+        jobline {
+          line_desc
+          id
+        }
+        quantity
+        joblineid
+      }
+    }
+  }
+`;
+
+export const UPDATE_PARTS_DISPATCH_LINE = gql`
+  mutation UPDATE_PARTS_DISPATCH_LINE(
+    $id: uuid!
+    $line: parts_dispatch_lines_set_input!
+  ) {
+    update_parts_dispatch_lines_by_pk(pk_columns: { id: $id }, _set: $line) {
+      accepted_at
+      id
+    }
+  }
+`;

client/src/graphql/payment_response.queries.js

@@ -28,16 +28,14 @@ export const QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID = gql`
   }
 `;
 
-export const QUERY_RO_AND_OWNER_BY_JOB_PK = gql`
-  query QUERY_RO_AND_OWNER_BY_JOB_PK($jobid: uuid!) {
-    jobs_by_pk(id: $jobid) {
+export const QUERY_RO_AND_OWNER_BY_JOB_PKS = gql`
+  query QUERY_RO_AND_OWNER_BY_JOB_PKS($jobids: [uuid!]!) {
+    jobs(where: { id: { _in: $jobids } }) {
       ro_number
-      owner {
-        ownr_fn
-        ownr_ln
-        ownr_ea
-        ownr_zip
-      }
+      ownr_fn
+      ownr_ln
+      ownr_ea
+      ownr_zip
     }
   }
 `;

client/src/graphql/payments.queries.js

@@ -5,6 +5,15 @@ export const INSERT_NEW_PAYMENT = gql`
     insert_payments(objects: $paymentInput) {
       returning {
         id
+        jobid
+        amount
+        payer
+        created_at
+        transactionid
+        memo
+        date
+        type
+        exportedat
       }
     }
   }

client/src/graphql/timetickets.queries.js

@@ -39,6 +39,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE = gql`
       clockon
       cost_center
       created_at
+      created_by
       date
       id
       rate
@@ -85,6 +86,7 @@ export const QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE = gql`
       clockon
       cost_center
       created_at
+      created_by
       date
       id
       rate
@@ -119,6 +121,7 @@ export const QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE = gql`
       clockon
       cost_center
       created_at
+      created_by
       date
       id
       rate
@@ -160,6 +163,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
       clockon
       cost_center
       created_at
+      created_by
       date
       id
       rate
@@ -194,6 +198,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
       clockon
       cost_center
       created_at
+      created_by
       date
       id
       rate
@@ -223,6 +228,7 @@ export const INSERT_NEW_TIME_TICKET = gql`
     insert_timetickets(objects: $timeTicketInput) {
       returning {
         id
+        created_by
         clockon
         clockoff
         employeeid

client/src/graphql/vehicles.queries.js

@@ -28,11 +28,10 @@ export const QUERY_VEHICLE_BY_ID = gql`
       updated_at
       trim_color
       notes
-      jobs {
+      jobs(order_by: { date_open: desc }) {
         id
         ro_number
         ownr_fn
-
         ownr_ln
         owner {
           id

client/src/landing/data.source.js

@@ -3,7 +3,7 @@ import ImexOnlineLogoLight from "../assets/ImEX Online Logo.png";
 import i18n from "../translations/i18n";
 
 import TechnologySvg from "../assets/icons/technology.svg";
-import RomeLogo from "../assets/romelogo.png";
+import RomeLogo from "../assets/RomeOnline.png";
 export const Nav00DataSource = {
   wrapper: { className: "header0 home-page-wrapper" },
   page: { className: "home-page" },

client/src/pages/dms/dms.container.jsx

@@ -43,10 +43,10 @@ const mapDispatchToProps = (dispatch) => ({
 export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
 
 export const socket = SocketIO(
-  process.env.NODE_ENV === "production"
-    ? process.env.REACT_APP_AXIOS_BASE_API_URL
-    : window.location.origin,
-    // "http://localhost:4000",  // for dev testing,
+  // process.env.NODE_ENV === "production"
+  //   ? process.env.REACT_APP_AXIOS_BASE_API_URL
+  //   : window.location.origin,
+     "http://localhost:4000",  // for dev testing,
   {
     path: "/ws",
     withCredentials: true,

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -8,7 +8,6 @@ import {
   Form,
   Input,
   InputNumber,
-  notification,
   PageHeader,
   Popconfirm,
   Row,
@@ -17,12 +16,14 @@ import {
   Statistic,
   Switch,
   Typography,
+  notification,
 } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 //import { useHistory } from "react-router-dom";
 import { useTreatments } from "@splitsoftware/splitio-react";
+import Dinero from "dinero.js";
 import moment from "moment";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
@@ -37,7 +38,6 @@ import { generateJobLinesUpdatesForInvoicing } from "../../graphql/jobs-lines.qu
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import Dinero from "dinero.js";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   jobRO: selectJobReadOnly,
@@ -55,6 +55,11 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
     {},
     bodyshop && bodyshop.imexshopid
   );
+  const { ClosingPeriod } = useTreatments(
+    ["ClosingPeriod"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
 
   const handleFinish = async ({ removefromproduction, ...values }) => {
     setLoading(true);
@@ -254,12 +259,40 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
                   if (!value || moment(value).isSameOrAfter(moment(), "day")) {
                     return Promise.resolve();
                   }
-
                   return Promise.reject(
                     new Error(t("jobs.labels.dms.invoicedatefuture"))
                   );
                 },
               }),
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (
+                    ClosingPeriod.treatment === "on" &&
+                    bodyshop.accountingconfig.ClosingPeriod
+                  ) {
+                    if (
+                      moment(value).isSameOrAfter(
+                        moment(
+                          bodyshop.accountingconfig.ClosingPeriod[0]
+                        ).startOf("day")
+                      ) &&
+                      moment(value).isSameOrBefore(
+                        moment(
+                          bodyshop.accountingconfig.ClosingPeriod[1]
+                        ).endOf("day")
+                      )
+                    ) {
+                      return Promise.resolve();
+                    } else {
+                      return Promise.reject(
+                        new Error(t("jobs.labels.closingperiod"))
+                      );
+                    }
+                  } else {
+                    return Promise.resolve();
+                  }
+                },
+              }),
             ]}
           >
             <DateTimePicker

client/src/pages/jobs-create/jobs-create.container.jsx

@@ -169,96 +169,16 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
             federal_tax_rate: bodyshop.bill_tax_rates.federal_tax_rate / 100,
             state_tax_rate: bodyshop.bill_tax_rates.state_tax_rate / 100,
             local_tax_rate: bodyshop.bill_tax_rates.local_tax_rate / 100,
-            parts_tax_rates: {
-              PAA: {
-                prt_type: "PAA",
-                prt_discp: 0,
-                prt_mktyp: false,
-                prt_mkupp: 0,
-                prt_tax_in: true,
-                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-              },
-              PAC: {
-                prt_type: "PAC",
-                prt_discp: 0,
-                prt_mktyp: false,
-                prt_mkupp: 0,
-                prt_tax_in: true,
-                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-              },
-              PAG: {
-                prt_type: "PAG",
-                prt_discp: 0,
-                prt_mktyp: false,
-                prt_mkupp: 0,
-                prt_tax_in: true,
-                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-              },
-              PAL: {
-                prt_type: "PAL",
-                prt_discp: 0,
-                prt_mktyp: false,
-                prt_mkupp: 0,
-                prt_tax_in: true,
-                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-              },
-              PAM: {
-                prt_type: "PAM",
-                prt_discp: 0,
-                prt_mktyp: false,
-                prt_mkupp: 0,
-                prt_tax_in: true,
-                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-              },
-              PAN: {
-                prt_type: "PAN",
-                prt_discp: 0,
-                prt_mktyp: false,
-                prt_mkupp: 0,
-                prt_tax_in: true,
-                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-              },
-              PAR: {
-                prt_type: "PAR",
-                prt_discp: 0,
-                prt_mktyp: false,
-                prt_mkupp: 0,
-                prt_tax_in: true,
-                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-              },
-              PAS: {
-                prt_type: "PAS",
-                prt_discp: 0,
-                prt_mktyp: false,
-                prt_mkupp: 0,
-                prt_tax_in: true,
-                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-              },
-              PASL: {
-                prt_type: "PASL",
-                prt_discp: 0,
-                prt_mktyp: false,
-                prt_mkupp: 0,
-                prt_tax_in: true,
-                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-              },
-              PAP: {
-                prt_type: "PAP",
-                prt_discp: 0,
-                prt_mktyp: false,
-                prt_mkupp: 0,
-                prt_tax_in: true,
-                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-              },
-              PAO: {
-                prt_type: "PAO",
-                prt_discp: 0,
-                prt_mktyp: false,
-                prt_mkupp: 0,
-                prt_tax_in: true,
-                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
-              },
+            cieca_pft: {
+              ...bodyshop.md_responsibility_centers.taxes.tax_ty1,
+              ...bodyshop.md_responsibility_centers.taxes.tax_ty2,
+              ...bodyshop.md_responsibility_centers.taxes.tax_ty3,
+              ...bodyshop.md_responsibility_centers.taxes.tax_ty4,
+              ...bodyshop.md_responsibility_centers.taxes.tax_ty5,
             },
+            materials: bodyshop.md_responsibility_centers.cieca_pfm,
+            cieca_pfl: bodyshop.md_responsibility_centers.cieca_pfl,
+            parts_tax_rates: bodyshop.md_responsibility_centers.parts_tax_rates,
           }}
         >
           <JobsCreateComponent form={form} />

client/src/pages/jobs-detail/jobs-detail.page.component.jsx

@@ -53,6 +53,8 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
 import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import NoteUpsertModalComponent from "../../components/note-upsert-modal/note-upsert-modal.container";
+import _ from "lodash";
+import JobProfileDataWarning from "../../components/job-profile-data-warning/job-profile-data-warning.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -103,86 +105,121 @@ export function JobsDetailPage({
             "category",
             "referral_source",
           ]),
-          parts_tax_rates: {
-            ...job.parts_tax_rates,
-            ...values.parts_tax_rates,
-          },
+          // The union and spread is required to keep values coming in from the estimating system that aren't displayed.
+          parts_tax_rates: _.union(
+            Object.keys(job.parts_tax_rates),
+            Object.keys(values.parts_tax_rates)
+          ).reduce((acc, val) => {
+            acc[val] = {
+              ...job.parts_tax_rates[val],
+              ...values.parts_tax_rates[val],
+            };
+            return acc;
+          }, {}),
+          materials: _.union(
+            Object.keys(job.materials),
+            Object.keys(values.materials)
+          ).reduce((acc, val) => {
+            acc[val] = {
+              ...job.materials[val],
+              ...values.materials[val],
+            };
+            return acc;
+          }, {}),
+          cieca_pfl: _.union(
+            Object.keys(job.cieca_pfl),
+            Object.keys(values.cieca_pfl)
+          ).reduce((acc, val) => {
+            acc[val] = {
+              ...job.cieca_pfl[val],
+              ...values.cieca_pfl[val],
+            };
+            return acc;
+          }, {}),
+          cieca_pfo: { ...job.cieca_pfo, ...values.cieca_pfo },
         },
       },
     });
-    const newTotals = await Axios.post("/job/totalsssu", {
-      id: job.id,
-    });
+    try {
+      const newTotals = await Axios.post("/job/totalsssu", {
+        id: job.id,
+      });
 
-    if (newTotals.status !== 200 || result.errors) {
+      if (newTotals.status !== 200 || result.errors) {
+        notification["error"]({
+          message: t("jobs.errors.totalscalc"),
+        });
+      } else {
+        notification["success"]({
+          message: t("jobs.successes.savetitle"),
+        });
+        const changedAuditFields = form.getFieldsValue(
+          [
+            "scheduled_in",
+            "actual_in",
+            "scheduled_completion",
+            "actual_completion",
+            "scheduled_delivery",
+            "actual_delivery",
+            "date_invoiced",
+            "ins_co_nm",
+            "ded_amt",
+            "ded_status",
+            "date_exported",
+            "special_coverage_policy",
+            "ca_gst_registrant",
+            "ca_bc_pvrt",
+            "scheduled_in",
+            "rate_la1",
+            "rate_la2",
+            "rate_la3",
+            "rate_la4",
+            "rate_laa",
+            "rate_lab",
+            "rate_lad",
+            "rate_lae",
+            "rate_laf",
+            "rate_lag",
+            "rate_lam",
+            "rate_lar",
+            "rate_las",
+            "rate_lau",
+            "rate_ma2s",
+            "rate_ma2t",
+            "rate_ma3s",
+            "rate_mabl",
+            "rate_macs",
+            "rate_mapa",
+            "rate_mahw",
+            "rate_mash",
+            "rate_matd",
+          ],
+          (meta) => meta && meta.touched
+        );
+
+        Object.keys(changedAuditFields).forEach((key) => {
+          insertAuditTrail({
+            jobid: job.id,
+            operation: AuditTrailMapping.jobfieldchange(
+              key,
+              changedAuditFields[key] instanceof moment
+                ? moment(changedAuditFields[key]).format("MM/DD/YYYY hh:mm a")
+                : changedAuditFields[key]
+            ),
+          });
+        });
+
+        await refetch();
+        form.setFieldsValue(transormJobToForm(job));
+        form.resetFields();
+      }
+    } catch (error) {
       notification["error"]({
         message: t("jobs.errors.totalscalc"),
       });
-    } else {
-      notification["success"]({
-        message: t("jobs.successes.savetitle"),
-      });
-      const changedAuditFields = form.getFieldsValue(
-        [
-          "scheduled_in",
-          "actual_in",
-          "scheduled_completion",
-          "actual_completion",
-          "scheduled_delivery",
-          "actual_delivery",
-          "date_invoiced",
-          "ins_co_nm",
-          "ded_amt",
-          "ded_status",
-          "date_exported",
-          "special_coverage_policy",
-          "ca_gst_registrant",
-          "ca_bc_pvrt",
-          "scheduled_in",
-          "rate_la1",
-          "rate_la2",
-          "rate_la3",
-          "rate_la4",
-          "rate_laa",
-          "rate_lab",
-          "rate_lad",
-          "rate_lae",
-          "rate_laf",
-          "rate_lag",
-          "rate_lam",
-          "rate_lar",
-          "rate_las",
-          "rate_lau",
-          "rate_ma2s",
-          "rate_ma2t",
-          "rate_ma3s",
-          "rate_mabl",
-          "rate_macs",
-          "rate_mapa",
-          "rate_mahw",
-          "rate_mash",
-          "rate_matd",
-        ],
-        (meta) => meta && meta.touched
-      );
-
-      Object.keys(changedAuditFields).forEach((key) => {
-        insertAuditTrail({
-          jobid: job.id,
-          operation: AuditTrailMapping.jobfieldchange(
-            key,
-            changedAuditFields[key] instanceof moment
-              ? moment(changedAuditFields[key]).format("MM/DD/YYYY hh:mm a")
-              : changedAuditFields[key]
-          ),
-        });
-      });
-
-      await refetch();
-      form.setFieldsValue(transormJobToForm(job));
-      form.resetFields();
+    } finally {
+      setLoading(false);
     }
-    setLoading(false);
   };
 
   const menuExtra = (
@@ -252,6 +289,7 @@ export function JobsDetailPage({
         />
         <JobsDetailHeader job={job} />
         <Divider type="horizontal" />
+        <JobProfileDataWarning job={job} />
         <FormFieldsChanged form={form} />
         <Tabs
           defaultActiveKey={search.tab}
@@ -389,6 +427,21 @@ export function JobsDetailPage({
 export default connect(mapStateToProps, mapDispatchToProps)(JobsDetailPage);
 
 const transormJobToForm = (job) => {
+  Object.keys(job.parts_tax_rates).forEach((parttype) => {
+    Object.keys(job.parts_tax_rates[parttype]).forEach((key) => {
+      if (key.includes("tx_in")) {
+        if (
+          job.parts_tax_rates[parttype][key] === "Y" ||
+          job.parts_tax_rates[parttype][key] === true
+        ) {
+          job.parts_tax_rates[parttype][key] = true;
+        } else {
+          job.parts_tax_rates[parttype][key] = false;
+        }
+      }
+    });
+  });
+
   return {
     ...job,
     loss_date: job.loss_date ? moment(job.loss_date) : null,

client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx

@@ -0,0 +1,139 @@
+import {
+  MinusCircleTwoTone,
+  PlusCircleTwoTone,
+  SyncOutlined,
+} from "@ant-design/icons";
+import { useQuery } from "@apollo/client";
+import { Button, Card, Space, Table } from "antd";
+import queryString from "query-string";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import AlertComponent from "../../components/alert/alert.component";
+import PartsDispatchExpander from "../../components/parts-dispatch-expander/parts-dispatch-expander.component";
+import { GET_UNACCEPTED_PARTS_DISPATCH } from "../../graphql/parts-dispatch.queries";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { alphaSort } from "../../utils/sorters";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  technician: selectTechnician,
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({});
+
+export function TechDispatchedParts({ technician, bodyshop }) {
+  const searchParams = queryString.parse(useLocation().search);
+  const { page } = searchParams;
+
+  const { loading, error, data, refetch } = useQuery(
+    GET_UNACCEPTED_PARTS_DISPATCH,
+    {
+      variables: {
+        techId: technician.id,
+        offset: page ? (page - 1) * 25 : 0,
+        limit: 25,
+      },
+    }
+  );
+
+  const { t } = useTranslation();
+  const history = useHistory();
+
+  if (error) return <AlertComponent message={error.message} type="error" />;
+
+  const parts_dispatch = data?.parts_dispatch;
+
+  const columns = [
+    {
+      title: t("jobs.fields.ro_number"),
+      dataIndex: "job.ro_number",
+      key: "ro_number",
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+
+      render: (text, record) => record.job.ro_number || t("general.labels.na"),
+    },
+    {
+      title: t("jobs.fields.status"),
+      dataIndex: "status",
+      key: "status",
+      sorter: (a, b) => alphaSort(a.status, b.status),
+      render: (text, record) => {
+        return record.job.status || t("general.labels.na");
+      },
+    },
+
+    {
+      title: t("jobs.fields.vehicle"),
+      dataIndex: "vehicle",
+      key: "vehicle",
+      ellipsis: true,
+      render: (text, record) => (
+        <span>{`${record.job.v_model_yr || ""} ${
+          record.job.v_make_desc || ""
+        } ${record.job.v_model_desc || ""}`}</span>
+      ),
+    },
+    {
+      title: t("general.labels.actions"),
+      dataIndex: "actions",
+      key: "actions",
+      render: (text, record) => (
+        <Button onClick={() => {}}>
+          {t("timetickets.actions.claimtasks")}
+        </Button>
+      ),
+    },
+  ];
+  const handleTableChange = (pagination, filters, sorter) => {
+    searchParams.page = pagination.current;
+    history.push({ search: queryString.stringify(searchParams) });
+  };
+
+  return (
+    <Card
+      extra={
+        <Space wrap>
+          <Button onClick={() => refetch()}>
+            <SyncOutlined />
+          </Button>
+        </Space>
+      }
+    >
+      <Table
+        loading={loading}
+        pagination={{
+          pageSize: 25,
+          current: parseInt(page || 1),
+          total: data ? data.parts_dispatch_aggregate.aggregate.count : 0,
+          showSizeChanger: false,
+        }}
+        columns={columns}
+        rowKey="id"
+        dataSource={parts_dispatch}
+        scroll={{ x: true }}
+        onChange={handleTableChange}
+        expandable={{
+          expandedRowRender: (record) => (
+            <PartsDispatchExpander dispatch={record} />
+          ),
+          rowExpandable: (record) => true,
+          //expandRowByClick: true,
+          expandIcon: ({ expanded, onExpand, record }) =>
+            expanded ? (
+              <MinusCircleTwoTone onClick={(e) => onExpand(record, e)} />
+            ) : (
+              <PlusCircleTwoTone onClick={(e) => onExpand(record, e)} />
+            ),
+        }}
+      />
+    </Card>
+  );
+}
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TechDispatchedParts);

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

@@ -1,23 +1,26 @@
 import { BackTop, Layout } from "antd";
-import React, { lazy, Suspense, useEffect } from "react";
+import React, { Suspense, lazy, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Redirect, Route, Switch } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import ErrorBoundary from "../../components/error-boundary/error-boundary.component";
 
+import FeatureWrapper from "../../components/feature-wrapper/feature-wrapper.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import TechHeader from "../../components/tech-header/tech-header.component";
-import TechSider from "../../components/tech-sider/tech-sider.component";
-import { selectTechnician } from "../../redux/tech/tech.selectors";
-import FeatureWrapper from "../../components/feature-wrapper/feature-wrapper.component";
-import "./tech.page.styles.scss";
 import TechLookupJobsDrawer from "../../components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component";
-
+import TechSider from "../../components/tech-sider/tech-sider.component";
 import UpdateAlert from "../../components/update-alert/update-alert.component";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
+import "./tech.page.styles.scss";
+import "./tech.page.styles.scss";
 const TimeTicketModalContainer = lazy(() =>
   import("../../components/time-ticket-modal/time-ticket-modal.container")
 );
+const EmailOverlayContainer = lazy(() =>
+  import("../../components/email-overlay/email-overlay.container.jsx")
+);
 const PrintCenterModalContainer = lazy(() =>
   import("../../components/print-center-modal/print-center-modal.container")
 );
@@ -45,6 +48,10 @@ const TimeTicketModalTask = lazy(() =>
 const TechAssignedProdJobs = lazy(() =>
   import("../tech-assigned-prod-jobs/tech-assigned-prod-jobs.component")
 );
+const TechDispatchedParts = lazy(() =>
+  import("../tech-dispatched-parts/tech-dispatched-parts.page")
+);
+
 const { Content } = Layout;
 
 const mapStateToProps = createStructuredSelector({
@@ -78,6 +85,7 @@ export function TechPage({ technician, match }) {
             >
               <FeatureWrapper featureName="tech-console">
                 <TimeTicketModalContainer />
+                <EmailOverlayContainer />
                 <PrintCenterModalContainer />
                 <TimeTicketModalTask />
                 <Switch>
@@ -116,6 +124,11 @@ export function TechPage({ technician, match }) {
                     path={`${match.path}/assigned`}
                     component={TechAssignedProdJobs}
                   />
+                  <Route
+                    exact
+                    path={`${match.path}/dispatchedparts`}
+                    component={TechDispatchedParts}
+                  />
                 </Switch>
               </FeatureWrapper>
             </Suspense>

client/src/redux/user/user.sagas.js

@@ -197,11 +197,13 @@ export function* signInSuccessSaga({ payload }) {
   LogRocket.identify(payload.email);
 
   try {
-    window.$zoho.salesiq.visitor.name(payload.displayName);
-    window.$zoho.salesiq.visitor.email(payload.email);
-    window.$zoho.salesiq.visitor.id(payload.email);
+    // window.$crisp.push([
+    //   "set",
+    //   "user:nickname",
+    //   [payload.displayName || payload.email],
+    // ]);
 
-    window.$zoho.salesiq.chat.waitime(60 * 30); //Wait up to 30 minutes for the chat response.
+    // window.$crisp.push(["set", "session:segments", [["rome-user"]]]);
 
     Sentry.setUser({
       email: payload.email,
@@ -286,9 +288,10 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
       )
     );
     try {
-      window.$zoho.salesiq.visitor.info({
-        Shop: payload.shopname,
-      });
+      // window.$crisp.push(["set", "user:company", [payload.shopname]]);
+      // if (authRecord[0] && authRecord[0].user.validemail) {
+      //   window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
+      // }
     } catch (error) {
       console.error("Couldnt find $crisp.");
     }

client/src/translations/en_us/common.json

@@ -179,7 +179,7 @@
 				"is_credit_memo_short": "CM",
 				"local_tax_rate": "Local Tax Rate",
 				"ro_number": "RO Number",
-				"state_tax_rate": "Provincial/State Tax Rate",
+				"state_tax_rate": "State Tax Rate",
 				"total": "Bill Total",
 				"vendor": "Vendor",
 				"vendorname": "Vendor Name"
@@ -212,7 +212,7 @@
 				"onlycmforinvoiced": "Only credit memos can be entered for any job that has been invoiced,  exported,  or voided.",
 				"retailtotal": "Bills Retail Total",
 				"savewithdiscrepancy": "You are about to save this bill with a discrepancy.  The system will continue to use the calculated amount using the bill lines.  Press cancel to return to the bill.",
-				"state_tax": "Provincial/State Tax",
+				"state_tax": "State Tax",
 				"subtotal": "Subtotal",
 				"totalreturns": "Total Returns"
 			},
@@ -224,6 +224,7 @@
 				"reexport": "Bill marked for re-export."
 			},
 			"validation": {
+				"closingperiod": "This Bill Date is outside of the Closing Period.",
 				"inventoryquantity": "Quantity must be greater than or equal to what has been added to inventory ({{number}}).",
 				"manualinhouse": "Manual posting to the in house vendor is restricted. ",
 				"unique_invoice_number": "This invoice number has already been entered for this vendor."
@@ -260,9 +261,10 @@
 				"attach_pdf_to_email": "Attach PDF copy to sent emails?",
 				"bill_allow_post_to_closed": "Allow Bills to be posted to Closed Jobs",
 				"bill_federal_tax_rate": "Bills - Federal Tax Rate %",
-				"bill_local_tax_rate": "Bill - Provincial/State Tax Rate %",
-				"bill_state_tax_rate": "Bill - Provincial/State Tax Rate %",
+				"bill_local_tax_rate": "Bill - Local Tax Rate %",
+				"bill_state_tax_rate": "Bill - State Tax Rate %",
 				"city": "City",
+				"closingperiod": "Closing Period",
 				"country": "Country",
 				"dailybodytarget": "Scoreboard - Daily Body Target",
 				"dailypainttarget": "Scoreboard - Daily Paint Target",
@@ -303,7 +305,7 @@
 				},
 				"invoice_federal_tax_rate": "Invoices - Federal Tax Rate",
 				"invoice_local_tax_rate": "Invoices - Local Tax Rate",
-				"invoice_state_tax_rate": "Invoices - Provincial/State Tax Rate",
+				"invoice_state_tax_rate": "Invoices - State Tax Rate",
 				"jc_hourly_rates": {
 					"mapa": "Job Costing - Paint Materials Hourly Cost Rate",
 					"mash": "Job Costing - Shop Materials Hourly Cost Rate"
@@ -471,6 +473,11 @@
 				"responsibilitycenter_accountname": "Account Name",
 				"responsibilitycenter_accountnumber": "Account Number",
 				"responsibilitycenter_rate": "Rate",
+				"responsibilitycenter_tax_rate": "Tax {{typeNum}} Tier {{typeNumIterator}} Rate",
+				"responsibilitycenter_tax_sur": "Tax {{typeNum}} Tier {{typeNumIterator}} Surcharge",
+				"responsibilitycenter_tax_thres": "Tax {{typeNum}} Tier {{typeNumIterator}} Threshold",
+				"responsibilitycenter_tax_tier": "Tax {{typeNum}} Tier {{typeNumIterator}}",
+				"responsibilitycenter_tax_type": "Tax {{typeNum}} Type",
 				"responsibilitycenters": {
 					"ap": "Accounts Payable",
 					"ar": "Accounts Receivable",
@@ -493,7 +500,7 @@
 					"lam": "Mechanical",
 					"lar": "Refinish",
 					"las": "Structural",
-					"lau": "Detail",
+					"lau": "User Defined",
 					"local_tax": "Local Tax",
 					"mapa": "Paint Materials",
 					"mash": "Shop Materials",
@@ -514,9 +521,9 @@
 						"description": "Description",
 						"federal": "Federal Tax Applies",
 						"local": "Local Tax Applies",
-						"state": "Provincial/State Tax Applies"
+						"state": "State Tax Applies"
 					},
-					"state_tax": "Provincial/State Tax",
+					"state_tax": "State Tax",
 					"tow": "Towing"
 				},
 				"schedule_end_time": "Schedule Ending Time",
@@ -539,7 +546,7 @@
 					"target": "Target (count)"
 				},
 				"state": "Province/State",
-				"state_tax_id": "Provincial/State Tax ID (PST,  QST)",
+				"state_tax_id": "State Tax ID",
 				"status": "Status Label",
 				"statuses": {
 					"active_statuses": "Active Statuses (Filtering for Active Jobs throughout system)",
@@ -570,7 +577,7 @@
 				"timezone": "Timezone",
 				"tt_allow_post_to_invoiced": "Allow Time Tickets to be posted to Invoiced & Exported Jobs",
 				"tt_enforce_hours_for_tech_console": "Restrict Claimable hours from Tech Console",
-				"use_fippa": "Use FIPPA for Names on Generated Documents?",
+				"use_fippa": "Conceal Customer Information on Generated Documents?",
 				"use_paint_scale_data": "Use Paint Scale Data for Job Costing?",
 				"uselocalmediaserver": "Use Local Media Server?",
 				"website": "Website",
@@ -611,8 +618,8 @@
 				"jobstatuses": "Job Statuses",
 				"laborrates": "Labor Rates",
 				"licensing": "Licensing",
-				"md_tasks_presets": "Tasks Presets",
 				"md_parts_scan": "Parts Scan Rules",
+				"md_tasks_presets": "Tasks Presets",
 				"md_to_emails": "Preset To Emails",
 				"md_to_emails_emails": "Emails",
 				"messagingpresets": "Messaging Presets",
@@ -722,7 +729,7 @@
 				"refuelcharge": "Refuel Charge (per liter/gallon)",
 				"scheduledreturn": "Scheduled Return",
 				"start": "Contract Start",
-				"statetax": "Provincial/State Taxes",
+				"statetax": "State Taxes",
 				"status": "Status"
 			},
 			"labels": {
@@ -1018,6 +1025,7 @@
 				"cancel": "Cancel",
 				"clear": "Clear",
 				"close": "Close",
+				"copied": "Copied!",
 				"copylink": "Copy Link",
 				"create": "Create",
 				"delete": "Delete",
@@ -1034,6 +1042,7 @@
 				"saveandnew": "Save and New",
 				"selectall": "Select All",
 				"send": "Send",
+				"sendbysms": "Send by SMS",
 				"senderrortosupport": "Send Error to Support",
 				"submit": "Submit",
 				"tryagain": "Try Again",
@@ -1095,6 +1104,7 @@
 				"passwordsdonotmatch": "The passwords you have entered do not match.",
 				"print": "Print",
 				"refresh": "Refresh",
+				"reports": "Reports",
 				"required": "Required",
 				"saturday": "Saturday",
 				"search": "Search...",
@@ -1194,24 +1204,26 @@
 		},
 		"job_payments": {
 			"buttons": {
-				"goback": "Cancel",
+				"goback": "Go Back",
 				"proceedtopayment": "Proceed to Payment",
 				"refundpayment": "Refund Payment"
 			},
 			"notifications": {
 				"error": {
 					"description": "Please try again. Make sure the refund amount does not exceeds the payment amount.",
-					"title": "Error Refunding Payment"
+					"openingip": "Error connecting to IntelliPay service.",
+					"title": "Error placing refund"
 				}
 			},
 			"titles": {
 				"amount": "Amount",
-				"dateOfPayment": "Date",
-				"descriptions": "Description",
+				"dateOfPayment": "Date of Payment",
+				"descriptions": "Payment Details",
 				"payer": "Payer",
 				"payername": "Payer Name",
-				"paymentid": "Payment ID",
-				"paymenttype": "Type",
+				"paymentid": "Payment Reference ID",
+				"paymentnum": "Payment Number",
+				"paymenttype": "Payment Type",
 				"refundamount": "Refund Amount",
 				"transactionid": "Transaction ID"
 			}
@@ -1361,6 +1373,8 @@
 				"sendpartspricechange": "Send Parts Price Change",
 				"sendtodms": "Send to DMS",
 				"sync": "Sync",
+				"taxprofileoverride": "Override Tax Profile with Shop Configuration",
+				"taxprofileoverride_confirm": "Are you sure you want to override the tax profile information? This cannot be undone without re-importing the job. ",
 				"uninvoice": "Uninvoice",
 				"unvoid": "Unvoid Job",
 				"viewchecklist": "View Checklists",
@@ -1432,6 +1446,26 @@
 				"ccf": "CC Refuel",
 				"ccm": "CC Mileage",
 				"cieca_id": "CIECA ID",
+				"cieca_pfl": {
+					"lbr_tax_in": "Tax Labor Indicator",
+					"lbr_tx_in1": "Tax 1 Indicator",
+					"lbr_tx_in2": "Tax 2 Indicator",
+					"lbr_tx_in3": "Tax 3 Indicator",
+					"lbr_tx_in4": "Tax 4 Indicator",
+					"lbr_tx_in5": "Tax 5 Indicator"
+				},
+				"cieca_pfo": {
+					"stor_t_in1": "Storage Tax 1 Indicator",
+					"stor_t_in2": "Storage Tax 2 Indicator",
+					"stor_t_in3": "Storage Tax 3 Indicator",
+					"stor_t_in4": "Storage Tax 4 Indicator",
+					"stor_t_in5": "Storage Tax 5 Indicator",
+					"tow_t_in1": "Tow Tax 1 Indicator",
+					"tow_t_in2": "Tow Tax 2 Indicator",
+					"tow_t_in3": "Tow Tax 3 Indicator",
+					"tow_t_in4": "Tow Tax 4 Indicator",
+					"tow_t_in5": "Tow Tax 5 Indicator"
+				},
 				"claim_total": "Claim Total",
 				"class": "Class",
 				"clm_no": "Claim #",
@@ -1545,6 +1579,19 @@
 				"mapa": "Paint Materials",
 				"mash": "Shop Materials",
 				"matd": "Tire Disposal",
+				"materials": {
+					"MAPA": "Paint Materials",
+					"MASH": "Shop Materials",
+					"cal_maxdlr": "Threshhold",
+					"cal_opcode": "OP Codes",
+					"mat_tx_in1": "Tax 1 Indicator",
+					"mat_tx_in2": "Tax 2 Indicator",
+					"mat_tx_in3": "Tax 3 Indicator",
+					"mat_tx_in4": "Tax 4 Indicator",
+					"mat_tx_in5": "Tax 5 Indicator",
+					"materials": "Profile - Materials",
+					"tax_ind": "Tax Indicator"
+				},
 				"other_amount_payable": "Other Amount Payable",
 				"owner": "Owner",
 				"owner_owing": "Cust. Owes",
@@ -1567,6 +1614,11 @@
 					"prt_mkupp": "Markup %",
 					"prt_tax_in": "Tax Indicator",
 					"prt_tax_rt": "Part Tax Rate",
+					"prt_tx_in1": "Tax 1 Indicator",
+					"prt_tx_in2": "Tax 2 Indicator",
+					"prt_tx_in3": "Tax 3 Indicator",
+					"prt_tx_in4": "Tax 4  Indicator",
+					"prt_tx_in5": "Tax 5 Indicator",
 					"prt_type": "Part Type"
 				},
 				"partsstatus": "Parts Status",
@@ -1623,7 +1675,7 @@
 				"servicing_dealer_contact": "Servicing Dealer Contact",
 				"special_coverage_policy": "Special Coverage Policy",
 				"specialcoveragepolicy": "Special Coverage Policy",
-				"state_tax_rate": "Provincial/State Tax Rate",
+				"state_tax_rate": "State Tax Rate",
 				"status": "Job Status",
 				"storage_payable": "Storage",
 				"tax_lbr_rt": "Labor Tax Rate",
@@ -1694,8 +1746,12 @@
 				"checklistcompletedby": "Checklist completed by {{by}} at {{at}}",
 				"checklistdocuments": "Checklist Documents",
 				"checklists": "Checklists",
+				"cieca_pfl": "Profile - Labor",
+				"cieca_pfo": "Profile - Other",
+				"cieca_pft": "Profile - Taxes",
 				"closeconfirm": "Are you sure you want to close this job? This cannot be easily undone.",
 				"closejob": "Close Job {{ro_number}}",
+				"closingperiod": "This Invoice Date is outside of the Closing Period.",
 				"contracts": "CC Contracts",
 				"convertedtolabor": "Lines Converted to Labor",
 				"cost": "Cost",
@@ -1765,6 +1821,10 @@
 				"mapa": "Paint Materials",
 				"markforreexport": "Mark for Re-export",
 				"mash": "Shop Materials",
+				"materials": {
+					"mapa": ""
+				},
+				"missingprofileinfo": "This job has missing tax profile info. To ensure correct totals calculations, re-import the job.",
 				"multipayers": "Additional Payers",
 				"net_repairs": "Net Repairs",
 				"notes": "Notes",
@@ -1791,7 +1851,7 @@
 					"totalreturns": "The total <b>retail</b> amount of returns created for this job."
 				},
 				"ppc": "This line contains a part price change.",
-				"profileadjustments": "Profile Disc./Mkup (Already included above)",
+				"profileadjustments": "Profile Disc./Mkup",
 				"prt_dsmk_total": "Line Item Adjustment",
 				"rates": "Rates",
 				"rates_subtotal": "All Rates Subtotal",
@@ -1819,7 +1879,7 @@
 				"savebeforeconversion": "You have unsaved changes on the job.  Please save them before converting it. ",
 				"scheduledinchange": "The scheduled in is based off the latest appointment. To change this date,  please schedule or reschedule the job. ",
 				"specialcoveragepolicy": "Special Coverage Policy Applies",
-				"state_tax_amt": "Provincial/State Taxes",
+				"state_tax_amt": "State Taxes",
 				"subletstotal": "Sublets Total",
 				"subtotal": "Subtotal",
 				"supplementnote": "The job had a supplement imported.",
@@ -1931,7 +1991,7 @@
 				"customers": "Customers",
 				"dashboard": "Dashboard",
 				"enterbills": "Enter Bills",
-				"entercardpayment": "Enter Card Payments",
+				"entercardpayment": "New Card Charge",
 				"enterpayment": "Enter Payments",
 				"entertimeticket": "Enter Time Tickets",
 				"export": "Export",
@@ -1943,7 +2003,6 @@
 				"newjob": "Create New Job",
 				"owners": "Owners",
 				"parts-queue": "Parts Queue",
-				"paymentremindersms": "Send Payment Reminder via SMS",
 				"phonebook": "Phonebook",
 				"productionboard": "Production Board - Visual",
 				"productionlist": "Production Board - List",
@@ -2001,6 +2060,7 @@
 			"tech": {
 				"assignedjobs": "Assigned Jobs",
 				"claimtask": "Flag Hours",
+				"dispatchedparts": "Dispatched Parts",
 				"home": "Home",
 				"jobclockin": "Job Clock In",
 				"jobclockout": "Job Clock Out",
@@ -2142,7 +2202,11 @@
 			}
 		},
 		"parts_dispatch": {
+			"actions": {
+				"accept": "Accept"
+			},
 			"errors": {
+				"accepting": "Error accepting parts dispatch. {{error}}",
 				"creating": "Error dispatching parts. {{error}}"
 			},
 			"fields": {
@@ -2224,9 +2288,13 @@
 			}
 		},
 		"payments": {
+			"actions": {
+				"generatepaymentlink": "Generate Payment Link"
+			},
 			"errors": {
 				"exporting": "Error exporting payment(s). {{error}}",
-				"exporting-partner": "Error exporting to partner. Please check the partner interaction log for more errors."
+				"exporting-partner": "Error exporting to partner. Please check the partner interaction log for more errors.",
+				"inserting": "Error inserting payment. {{error}}"
 			},
 			"fields": {
 				"amount": "Amount",
@@ -2253,6 +2321,7 @@
 				"markforreexport": "Mark for Re-export",
 				"new": "New Payment",
 				"signup": "Please contact support to sign up for electronic payments.",
+				"smspaymentreminder": "This is {{shopname}} reminding you about your balance of {{amount}}. To pay, click the following link {{payment_link}}.",
 				"title": "Payments",
 				"totalpayments": "Total Payments"
 			},
@@ -2768,6 +2837,7 @@
 				"committed": "Committed",
 				"committed_at": "Committed At",
 				"cost_center": "Cost Center",
+				"created_by": "Created By",
 				"date": "Ticket Date",
 				"efficiency": "Efficiency",
 				"employee": "Employee",

client/src/translations/es/common.json

@@ -224,6 +224,7 @@
 				"reexport": ""
 			},
 			"validation": {
+				"closingperiod": "",
 				"inventoryquantity": "",
 				"manualinhouse": "",
 				"unique_invoice_number": ""
@@ -263,6 +264,7 @@
 				"bill_local_tax_rate": "",
 				"bill_state_tax_rate": "",
 				"city": "",
+				"closingperiod": "",
 				"country": "",
 				"dailybodytarget": "",
 				"dailypainttarget": "",
@@ -471,6 +473,11 @@
 				"responsibilitycenter_accountname": "",
 				"responsibilitycenter_accountnumber": "",
 				"responsibilitycenter_rate": "",
+				"responsibilitycenter_tax_rate": "",
+				"responsibilitycenter_tax_sur": "",
+				"responsibilitycenter_tax_thres": "",
+				"responsibilitycenter_tax_tier": "",
+				"responsibilitycenter_tax_type": "",
 				"responsibilitycenters": {
 					"ap": "",
 					"ar": "",
@@ -1018,6 +1025,7 @@
 				"cancel": "",
 				"clear": "",
 				"close": "",
+				"copied": "",
 				"copylink": "",
 				"create": "",
 				"delete": "Borrar",
@@ -1034,6 +1042,7 @@
 				"saveandnew": "",
 				"selectall": "",
 				"send": "",
+				"sendbysms": "",
 				"senderrortosupport": "",
 				"submit": "",
 				"tryagain": "",
@@ -1095,6 +1104,7 @@
 				"passwordsdonotmatch": "",
 				"print": "",
 				"refresh": "",
+				"reports": "",
 				"required": "",
 				"saturday": "",
 				"search": "Buscar...",
@@ -1201,6 +1211,7 @@
 			"notifications": {
 				"error": {
 					"description": "",
+					"openingip": "",
 					"title": ""
 				}
 			},
@@ -1211,6 +1222,7 @@
 				"payer": "",
 				"payername": "",
 				"paymentid": "",
+				"paymentnum": "",
 				"paymenttype": "",
 				"refundamount": "",
 				"transactionid": ""
@@ -1361,6 +1373,8 @@
 				"sendpartspricechange": "",
 				"sendtodms": "",
 				"sync": "",
+				"taxprofileoverride": "",
+				"taxprofileoverride_confirm": "",
 				"uninvoice": "",
 				"unvoid": "",
 				"viewchecklist": "",
@@ -1432,6 +1446,26 @@
 				"ccf": "",
 				"ccm": "",
 				"cieca_id": "CIECA ID",
+				"cieca_pfl": {
+					"lbr_tax_in": "",
+					"lbr_tx_in1": "",
+					"lbr_tx_in2": "",
+					"lbr_tx_in3": "",
+					"lbr_tx_in4": "",
+					"lbr_tx_in5": ""
+				},
+				"cieca_pfo": {
+					"stor_t_in1": "",
+					"stor_t_in2": "",
+					"stor_t_in3": "",
+					"stor_t_in4": "",
+					"stor_t_in5": "",
+					"tow_t_in1": "",
+					"tow_t_in2": "",
+					"tow_t_in3": "",
+					"tow_t_in4": "",
+					"tow_t_in5": ""
+				},
 				"claim_total": "Reclamar total",
 				"class": "",
 				"clm_no": "Reclamación #",
@@ -1545,6 +1579,19 @@
 				"mapa": "",
 				"mash": "",
 				"matd": "",
+				"materials": {
+					"MAPA": "",
+					"MASH": "",
+					"cal_maxdlr": "",
+					"cal_opcode": "",
+					"mat_tx_in1": "",
+					"mat_tx_in2": "",
+					"mat_tx_in3": "",
+					"mat_tx_in4": "",
+					"mat_tx_in5": "",
+					"materials": "",
+					"tax_ind": ""
+				},
 				"other_amount_payable": "Otra cantidad a pagar",
 				"owner": "Propietario",
 				"owner_owing": "Cust. Debe",
@@ -1567,6 +1614,11 @@
 					"prt_mkupp": "",
 					"prt_tax_in": "",
 					"prt_tax_rt": "",
+					"prt_tx_in1": "",
+					"prt_tx_in2": "",
+					"prt_tx_in3": "",
+					"prt_tx_in4": "",
+					"prt_tx_in5": "",
 					"prt_type": ""
 				},
 				"partsstatus": "",
@@ -1694,8 +1746,12 @@
 				"checklistcompletedby": "",
 				"checklistdocuments": "",
 				"checklists": "",
+				"cieca_pfl": "",
+				"cieca_pfo": "",
+				"cieca_pft": "",
 				"closeconfirm": "",
 				"closejob": "",
+				"closingperiod": "",
 				"contracts": "",
 				"convertedtolabor": "",
 				"cost": "",
@@ -1765,6 +1821,10 @@
 				"mapa": "",
 				"markforreexport": "",
 				"mash": "",
+				"materials": {
+					"mapa": ""
+				},
+				"missingprofileinfo": "",
 				"multipayers": "",
 				"net_repairs": "",
 				"notes": "Notas",
@@ -1943,7 +2003,6 @@
 				"newjob": "",
 				"owners": "propietarios",
 				"parts-queue": "",
-				"paymentremindersms": "",
 				"phonebook": "",
 				"productionboard": "",
 				"productionlist": "",
@@ -2001,6 +2060,7 @@
 			"tech": {
 				"assignedjobs": "",
 				"claimtask": "",
+				"dispatchedparts": "",
 				"home": "",
 				"jobclockin": "",
 				"jobclockout": "",
@@ -2142,7 +2202,11 @@
 			}
 		},
 		"parts_dispatch": {
+			"actions": {
+				"accept": ""
+			},
 			"errors": {
+				"accepting": "",
 				"creating": ""
 			},
 			"fields": {
@@ -2224,9 +2288,13 @@
 			}
 		},
 		"payments": {
+			"actions": {
+				"generatepaymentlink": ""
+			},
 			"errors": {
 				"exporting": "",
-				"exporting-partner": ""
+				"exporting-partner": "",
+				"inserting": ""
 			},
 			"fields": {
 				"amount": "",
@@ -2253,6 +2321,7 @@
 				"markforreexport": "",
 				"new": "",
 				"signup": "",
+				"smspaymentreminder": "",
 				"title": "",
 				"totalpayments": ""
 			},
@@ -2768,6 +2837,7 @@
 				"committed": "",
 				"committed_at": "",
 				"cost_center": "",
+				"created_by": "",
 				"date": "",
 				"efficiency": "",
 				"employee": "",

client/src/translations/fr/common.json

@@ -224,6 +224,7 @@
 				"reexport": ""
 			},
 			"validation": {
+				"closingperiod": "",
 				"inventoryquantity": "",
 				"manualinhouse": "",
 				"unique_invoice_number": ""
@@ -263,6 +264,7 @@
 				"bill_local_tax_rate": "",
 				"bill_state_tax_rate": "",
 				"city": "",
+				"closingperiod": "",
 				"country": "",
 				"dailybodytarget": "",
 				"dailypainttarget": "",
@@ -471,6 +473,11 @@
 				"responsibilitycenter_accountname": "",
 				"responsibilitycenter_accountnumber": "",
 				"responsibilitycenter_rate": "",
+				"responsibilitycenter_tax_rate": "",
+				"responsibilitycenter_tax_sur": "",
+				"responsibilitycenter_tax_thres": "",
+				"responsibilitycenter_tax_tier": "",
+				"responsibilitycenter_tax_type": "",
 				"responsibilitycenters": {
 					"ap": "",
 					"ar": "",
@@ -1018,6 +1025,7 @@
 				"cancel": "",
 				"clear": "",
 				"close": "",
+				"copied": "",
 				"copylink": "",
 				"create": "",
 				"delete": "Effacer",
@@ -1034,6 +1042,7 @@
 				"saveandnew": "",
 				"selectall": "",
 				"send": "",
+				"sendbysms": "",
 				"senderrortosupport": "",
 				"submit": "",
 				"tryagain": "",
@@ -1095,6 +1104,7 @@
 				"passwordsdonotmatch": "",
 				"print": "",
 				"refresh": "",
+				"reports": "",
 				"required": "",
 				"saturday": "",
 				"search": "Chercher...",
@@ -1201,6 +1211,7 @@
 			"notifications": {
 				"error": {
 					"description": "",
+					"openingip": "",
 					"title": ""
 				}
 			},
@@ -1211,6 +1222,7 @@
 				"payer": "",
 				"payername": "",
 				"paymentid": "",
+				"paymentnum": "",
 				"paymenttype": "",
 				"refundamount": "",
 				"transactionid": ""
@@ -1361,6 +1373,8 @@
 				"sendpartspricechange": "",
 				"sendtodms": "",
 				"sync": "",
+				"taxprofileoverride": "",
+				"taxprofileoverride_confirm": "",
 				"uninvoice": "",
 				"unvoid": "",
 				"viewchecklist": "",
@@ -1432,6 +1446,26 @@
 				"ccf": "",
 				"ccm": "",
 				"cieca_id": "CIECA ID",
+				"cieca_pfl": {
+					"lbr_tax_in": "",
+					"lbr_tx_in1": "",
+					"lbr_tx_in2": "",
+					"lbr_tx_in3": "",
+					"lbr_tx_in4": "",
+					"lbr_tx_in5": ""
+				},
+				"cieca_pfo": {
+					"stor_t_in1": "",
+					"stor_t_in2": "",
+					"stor_t_in3": "",
+					"stor_t_in4": "",
+					"stor_t_in5": "",
+					"tow_t_in1": "",
+					"tow_t_in2": "",
+					"tow_t_in3": "",
+					"tow_t_in4": "",
+					"tow_t_in5": ""
+				},
 				"claim_total": "Total réclamation",
 				"class": "",
 				"clm_no": "Prétendre #",
@@ -1545,6 +1579,19 @@
 				"mapa": "",
 				"mash": "",
 				"matd": "",
+				"materials": {
+					"MAPA": "",
+					"MASH": "",
+					"cal_maxdlr": "",
+					"cal_opcode": "",
+					"mat_tx_in1": "",
+					"mat_tx_in2": "",
+					"mat_tx_in3": "",
+					"mat_tx_in4": "",
+					"mat_tx_in5": "",
+					"materials": "",
+					"tax_ind": ""
+				},
 				"other_amount_payable": "Autre montant à payer",
 				"owner": "Propriétaire",
 				"owner_owing": "Cust. Owes",
@@ -1567,6 +1614,11 @@
 					"prt_mkupp": "",
 					"prt_tax_in": "",
 					"prt_tax_rt": "",
+					"prt_tx_in1": "",
+					"prt_tx_in2": "",
+					"prt_tx_in3": "",
+					"prt_tx_in4": "",
+					"prt_tx_in5": "",
 					"prt_type": ""
 				},
 				"partsstatus": "",
@@ -1694,8 +1746,12 @@
 				"checklistcompletedby": "",
 				"checklistdocuments": "",
 				"checklists": "",
+				"cieca_pfl": "",
+				"cieca_pfo": "",
+				"cieca_pft": "",
 				"closeconfirm": "",
 				"closejob": "",
+				"closingperiod": "",
 				"contracts": "",
 				"convertedtolabor": "",
 				"cost": "",
@@ -1765,6 +1821,10 @@
 				"mapa": "",
 				"markforreexport": "",
 				"mash": "",
+				"materials": {
+					"mapa": ""
+				},
+				"missingprofileinfo": "",
 				"multipayers": "",
 				"net_repairs": "",
 				"notes": "Remarques",
@@ -1943,7 +2003,6 @@
 				"newjob": "",
 				"owners": "Propriétaires",
 				"parts-queue": "",
-				"paymentremindersms": "",
 				"phonebook": "",
 				"productionboard": "",
 				"productionlist": "",
@@ -2001,6 +2060,7 @@
 			"tech": {
 				"assignedjobs": "",
 				"claimtask": "",
+				"dispatchedparts": "",
 				"home": "",
 				"jobclockin": "",
 				"jobclockout": "",
@@ -2142,7 +2202,11 @@
 			}
 		},
 		"parts_dispatch": {
+			"actions": {
+				"accept": ""
+			},
 			"errors": {
+				"accepting": "",
 				"creating": ""
 			},
 			"fields": {
@@ -2224,9 +2288,13 @@
 			}
 		},
 		"payments": {
+			"actions": {
+				"generatepaymentlink": ""
+			},
 			"errors": {
 				"exporting": "",
-				"exporting-partner": ""
+				"exporting-partner": "",
+				"inserting": ""
 			},
 			"fields": {
 				"amount": "",
@@ -2253,6 +2321,7 @@
 				"markforreexport": "",
 				"new": "",
 				"signup": "",
+				"smspaymentreminder": "",
 				"title": "",
 				"totalpayments": ""
 			},
@@ -2768,6 +2837,7 @@
 				"committed": "",
 				"committed_at": "",
 				"cost_center": "",
+				"created_by": "",
 				"date": "",
 				"efficiency": "",
 				"employee": "",

client/src/utils/TemplateConstants.js

@@ -1129,7 +1129,7 @@ export const TemplateList = (type, context) => {
             disabled: false,
             rangeFilter: {
               object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_open"),
+              field: i18n.t("jobs.fields.date_invoiced"),
             },
             group: "jobs",
           },
@@ -1640,6 +1640,19 @@ export const TemplateList = (type, context) => {
             },
             group: "payroll",
           },
+          work_in_progress_jobs_excel: {
+            title: i18n.t("reportcenter.templates.work_in_progress_jobs"),
+            subject: i18n.t("reportcenter.templates.work_in_progress_jobs"),
+            key: "work_in_progress_jobs_excel",
+            //idtype: "vendor",
+            reporttype: "excel",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+            group: "jobs",
+          },
           work_in_progress_labour: {
             title: i18n.t("reportcenter.templates.work_in_progress_labour"),
             description: "",

hasura/metadata/tables.yaml

@@ -3273,6 +3273,9 @@
           - ca_gst_registrant
           - cat_no
           - category
+          - cieca_pfl
+          - cieca_pfo
+          - cieca_pft
           - cieca_stl
           - cieca_ttl
           - ciecaid
@@ -3314,6 +3317,7 @@
           - date_repairstarted
           - date_scheduled
           - date_towin
+          - date_void
           - ded_amt
           - ded_note
           - ded_status
@@ -3495,7 +3499,6 @@
           - v_model_yr
           - v_vin
           - vehicleid
-          - date_void
           - voided
   select_permissions:
     - role: user
@@ -3539,6 +3542,9 @@
           - ca_gst_registrant
           - cat_no
           - category
+          - cieca_pfl
+          - cieca_pfo
+          - cieca_pft
           - cieca_stl
           - cieca_ttl
           - ciecaid
@@ -3580,6 +3586,7 @@
           - date_repairstarted
           - date_scheduled
           - date_towin
+          - date_void
           - ded_amt
           - ded_note
           - ded_status
@@ -3762,7 +3769,6 @@
           - v_model_yr
           - v_vin
           - vehicleid
-          - date_void
           - voided
         filter:
           bodyshop:
@@ -3816,6 +3822,9 @@
           - ca_gst_registrant
           - cat_no
           - category
+          - cieca_pfl
+          - cieca_pfo
+          - cieca_pft
           - cieca_stl
           - cieca_ttl
           - ciecaid
@@ -3857,6 +3866,7 @@
           - date_repairstarted
           - date_scheduled
           - date_towin
+          - date_void
           - ded_amt
           - ded_note
           - ded_status
@@ -4039,7 +4049,6 @@
           - v_model_yr
           - v_vin
           - vehicleid
-          - date_void
           - voided
         filter:
           bodyshop:
@@ -4649,6 +4658,7 @@
                         _eq: X-Hasura-User-Id
                   - active:
                       _eq: true
+        allow_aggregations: true
   update_permissions:
     - role: user
       permission:
@@ -4726,6 +4736,7 @@
                           _eq: X-Hasura-User-Id
                     - active:
                         _eq: true
+        allow_aggregations: true
   update_permissions:
     - role: user
       permission:
@@ -5554,6 +5565,7 @@
           - committed_at
           - cost_center
           - created_at
+          - created_by
           - date
           - employeeid
           - flat_rate
@@ -5578,6 +5590,7 @@
           - committed_at
           - cost_center
           - created_at
+          - created_by
           - date
           - employeeid
           - flat_rate
@@ -5611,6 +5624,7 @@
           - committed_at
           - cost_center
           - created_at
+          - created_by
           - date
           - employeeid
           - flat_rate

hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_employeeid";

hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_employeeid" on
+  "public"."parts_dispatch" using btree ("employeeid");

hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_dispatchid";

hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_dispatchid" on
+  "public"."parts_dispatch_lines" using btree ("partsdispatchid");

hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_line_accepted_at";

hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_line_accepted_at" on
+  "public"."parts_dispatch_lines" using btree ("accepted_at");

hasura/migrations/1691614820968_alter_table_public_timetickets_add_column_created_by/down.sql

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

hasura/migrations/1691614820968_alter_table_public_timetickets_add_column_created_by/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."timetickets" add column "created_by" text
+ null;

hasura/migrations/1693249238670_alter_table_public_jobs_add_column_cieca_pfl/down.sql

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

hasura/migrations/1693249238670_alter_table_public_jobs_add_column_cieca_pfl/up.sql

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

hasura/migrations/1693351091138_alter_table_public_bodyshops_add_column_claimscorpid/down.sql

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

hasura/migrations/1693351091138_alter_table_public_bodyshops_add_column_claimscorpid/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "claimscorpid" text
+ null;