Remove unused destructuring.

Rome/test

.circleci/config.yml

@@ -68,6 +68,120 @@ jobs:
           from: build
           to: "s3://imex-online-production/"
       - jira/notify
+      
+  rome-api-deploy:
+    docker:
+      - image: "cimg/base:stable"
+    steps:
+      - checkout
+      - eb/setup
+      - run:
+          command: |
+            eb init romeonline-productionapi -r us-east-2 -p "Node.js 16 running on 64bit Amazon Linux 2"
+            eb status --verbose
+            eb deploy
+            eb status
+      - jira/notify
+
+  rome-hasura-migrate:
+    docker:
+      - image: cimg/node:16.15.0
+    parameters:
+      secret:
+        type: string
+        default: $HASURA_PROD_SECRET
+    working_directory: ~/repo/hasura
+    steps:
+      - checkout:
+          path: ~/repo
+      - run:
+          name: Execute migration
+          command: |
+            npm install hasura-cli -g
+            hasura migrate apply --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >>
+            hasura metadata apply --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >>
+            hasura metadata reload --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >>
+
+  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
+
+      - aws-s3/sync:
+          from: build
+          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:
@@ -165,6 +279,19 @@ workflows:
           filters:
             branches:
               only: master
+      - rome-api-deploy:
+          filters:
+            branches:
+              only: rome/master
+      - rome-app-build:
+          filters:
+            branches:
+              only: rome/master
+      - rome-hasura-migrate:
+          secret: ${HASURA_PROD_SECRET}
+          filters:
+            branches:
+              only: rome/master
       - test-app-build:
           filters:
             branches:
@@ -174,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.development

@@ -1,13 +1,14 @@
 REACT_APP_GRAPHQL_ENDPOINT=https://db.dev.bodyshop.app/v1/graphql
 REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.bodyshop.app/v1/graphql
 REACT_APP_GA_CODE=231099835
-REACT_APP_FIREBASE_CONFIG={"apiKey":"AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc","authDomain":"imex-dev.firebaseapp.com","databaseURL":"https://imex-dev.firebaseio.com","projectId":"imex-dev","storageBucket":"imex-dev.appspot.com","messagingSenderId":"759548147434","appId":"1:759548147434:web:e8239868a48ceb36700993","measurementId":"G-K5XRBVVB4S"}
+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/io-test
 REACT_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/io-test
 REACT_APP_CLOUDINARY_API_KEY=957865933348715
 REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
-REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
 REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
 REACT_APP_AXIOS_BASE_API_URL=http://localhost:4000
 REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
-REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
+REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
+REACT_APP_COUNTRY=USA

client/.env.production

@@ -1,14 +1,13 @@
-GENERATE_SOURCEMAP=false
-REACT_APP_GRAPHQL_ENDPOINT=https://db.imex.online/v1/graphql
-REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.imex.online/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT=https://db.romeonline.io/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.romeonline.io/v1/graphql
 REACT_APP_GA_CODE=231103507
-REACT_APP_FIREBASE_CONFIG={"apiKey":"AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU","authDomain":"imex-prod.firebaseapp.com","databaseURL":"https://imex-prod.firebaseio.com","projectId":"imex-prod","storageBucket":"imex-prod.appspot.com","messagingSenderId":"253497221485","appId":"1:253497221485:web:3c81c483b94db84b227a64","measurementId":"G-NTWBKG2L0M"}
+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='BMgZT1NZztW2DsJl8Mg2L04hgY9FzAg6b8fbzgNAfww2VDzH3VE63Ot9EaP_U7KWS2JT-7HPHaw0T_Tw_5vkZc8'
+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.imex.online/
-REACT_APP_REPORTS_SERVER_URL=https://reports.imex.online
+REACT_APP_AXIOS_BASE_API_URL=https://api.romeonline.io/
+REACT_APP_REPORTS_SERVER_URL=https://reports.romeonline.io
 REACT_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk

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.test.imex.online/
-REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
+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/craco.config.js

@@ -12,7 +12,7 @@ module.exports = {
         authToken:
           "6b45b028a02342db97a9a2f92c0959058665443d379d4a3a876430009e744260",
         org: "snapt-software",
-        project: "imexonline",
+        project: "rome-online",
         release: process.env.REACT_APP_GIT_SHA,
 
         // webpack-specific configuration
@@ -27,7 +27,7 @@ module.exports = {
           lessOptions: {
             modifyVars: {
               ...(process.env.NODE_ENV === "development"
-                ? { "@primary-color": "#a51d1d" }
+                ? { "@primary-color": "#B22234" }
                 : {
                     //"@primary-color": "#1DA57A"
                   }),

client/public/firebase-messaging-sw.js

@@ -28,6 +28,17 @@ switch (this.location.hostname) {
       // measurementId: "${config.measurementId}",
     };
     break;
+  case "romeonline.io":
+    firebaseConfig = {
+      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",
+    };
+    break;
   case "imex.online":
   default:
     firebaseConfig = {

client/public/index.html

@@ -2,23 +2,12 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.png" />
+    <link rel="icon" href="%PUBLIC_URL%/ro-favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#002366" />
-    <meta name="description" content="ImEX Online" />
+    <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">
-      window.$crisp = [];
-      window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
-      (function () {
-        d = document;
-        s = d.createElement("script");
-        s.src = "https://client.crisp.chat/l.js";
-        s.async = 1;
-        d.getElementsByTagName("head")[0].appendChild(s);
-      })();
-    </script>
     <script>
       !(function () {
         "use strict";
@@ -77,7 +66,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>ImEX Online</title>
+    <title>Rome Online</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

client/public/manifest.json

@@ -1,6 +1,6 @@
 {
-  "short_name": "ImEX Online",
-  "name": "ImEX Online",
+  "short_name": "Rome Online",
+  "name": "Rome Online",
   "description": "The ultimate bodyshop management system.",
   "icons": [
     {

client/src/App/App.container.jsx

@@ -27,6 +27,12 @@ export default function AppContainer() {
         //componentSize="small"
         input={{ autoComplete: "new-password" }}
         locale={enLocale}
+        theme={{
+          token: {
+            colorPrimary: "#326ade",
+            colorInfo: "#326ade"
+          },
+        }}
         form={{
           validateMessages: {
             // eslint-disable-next-line no-template-curly-in-string

client/src/App/App.jsx

@@ -77,9 +77,9 @@ export function App({
     if (currentUser.authorized && bodyshop) {
       client.setAttribute("imexshopid", bodyshop.imexshopid);
 
+      LogRocket.init("rome-online/rome-online");
       if (client.getTreatment("LogRocket_Tracking") === "on") {
-        console.log("LR Start");
-        LogRocket.init("gvfvfw/bodyshopapp");
+        LogRocket.init("rome-online/rome-online");
       }
     }
   }, [bodyshop, client, currentUser.authorized]);
@@ -109,7 +109,7 @@ export function App({
 
   return (
     <Switch>
-      <Suspense fallback={<LoadingSpinner message="ImEX Online" />}>
+      <Suspense fallback={<LoadingSpinner />}>
         <ErrorBoundary>
           <Route exact path="/" component={LandingPage} />
         </ErrorBoundary>

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

@@ -29,6 +29,7 @@ import BillFormContainer from "../bill-form/bill-form.container";
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -63,6 +64,11 @@ function BillEnterModalContainer({
     "enter_bill_generate_label",
     false
   );
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
   const formValues = useMemo(() => {
     return {
       ...billEnterModal.context.bill,
@@ -98,6 +104,7 @@ function BillEnterModalContainer({
     } = values;
 
     let adjustmentsToInsert = {};
+    let payrollAdjustmentsToInsert = [];
 
     const r1 = await insertBill({
       variables: {
@@ -116,11 +123,28 @@ function BillEnterModalContainer({
                     ...restI
                   } = i;
 
-                  if (deductedfromlbr) {
-                    adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] =
-                      (adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] || 0) -
-                      restI.actual_price / lbr_adjustment.rate;
+                  if (Enhanced_Payroll.treatment === "on") {
+                    if (
+                      deductedfromlbr &&
+                      true //payroll is on
+                    ) {
+                      payrollAdjustmentsToInsert.push({
+                        id: i.joblineid,
+                        convertedtolbr: true,
+                        convertedtolbr_data: {
+                          mod_lb_hrs: lbr_adjustment.mod_lb_hrs * -1,
+                          mod_lbr_ty: lbr_adjustment.mod_lbr_ty,
+                        },
+                      });
+                    }
+                  } else {
+                    if (deductedfromlbr) {
+                      adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] =
+                        (adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] || 0) -
+                        restI.actual_price / lbr_adjustment.rate;
+                    }
                   }
+
                   return {
                     ...restI,
                     deductedfromlbr: deductedfromlbr,
@@ -146,6 +170,20 @@ function BillEnterModalContainer({
       refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
     });
 
+    await Promise.all(
+      payrollAdjustmentsToInsert.map((li) => {
+        return updateJobLines({
+          variables: {
+            lineId: li.id,
+            line: {
+              convertedtolbr: li.convertedtolbr,
+              convertedtolbr_data: li.convertedtolbr_data,
+            },
+          },
+        });
+      })
+    );
+
     const adjKeys = Object.keys(adjustmentsToInsert);
     if (adjKeys.length > 0) {
       //Query the adjustments, merge, and update them.
@@ -320,12 +358,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

@@ -364,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")}
@@ -378,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([
@@ -410,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

@@ -1,14 +1,15 @@
 import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import {
-  Button, Form,
+  Button,
+  Form,
   Input,
   InputNumber,
   Select,
   Space,
   Switch,
   Table,
-  Tooltip
+  Tooltip,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -45,6 +46,13 @@ export function BillEnterModalLinesComponent({
     {},
     bodyshop && bodyshop.imexshopid
   );
+
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
+
   const columns = (remove) => {
     return [
       {
@@ -375,12 +383,31 @@ export function BillEnterModalLinesComponent({
                 "rate",
               ]);
 
+              const billline = getFieldValue(["billlines", record.name]);
+
+              const jobline = lineData.find(
+                (line) => line.id === billline?.joblineid
+              );
+
+              const employeeTeamName = bodyshop.employee_teams.find(
+                (team) => team.id === jobline?.assigned_team
+              );
+
               if (getFieldValue(["billlines", record.name, "deductedfromlbr"]))
                 return (
                   <div>
+                    <Space>
+                      {t("joblines.fields.assigned_team", {
+                        name: employeeTeamName?.name,
+                      })}
+                      {`${jobline.mod_lb_hrs} units/${t(
+                        `joblines.fields.lbr_types.${jobline.mod_lbr_ty}`
+                      )}`}
+                    </Space>
                     <Form.Item
                       label={t("joblines.fields.mod_lbr_ty")}
                       key={`${index}modlbrty`}
+                      initialValue={jobline ? jobline.mod_lbr_ty : null}
                       rules={[
                         {
                           required: true,
@@ -434,22 +461,44 @@ export function BillEnterModalLinesComponent({
                         </Select.Option>
                       </Select>
                     </Form.Item>
-                    <Form.Item
-                      label={t("jobs.labels.adjustmentrate")}
-                      name={[record.name, "lbr_adjustment", "rate"]}
-                      initialValue={bodyshop.default_adjustment_rate}
-                      rules={[
-                        {
-                          required: true,
-                          //message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <InputNumber precision={2} min={0.01} />
-                    </Form.Item>
-                    {price &&
-                      adjustmentRate &&
-                      `${(price / adjustmentRate).toFixed(1)} hrs`}
+                    {Enhanced_Payroll.treatment === "on" ? (
+                      <Form.Item
+                        label={t("billlines.labels.mod_lbr_adjustment")}
+                        name={[record.name, "lbr_adjustment", "mod_lb_hrs"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <InputNumber
+                          precision={5}
+                          min={0.01}
+                          max={jobline ? jobline.mod_lb_hrs : 0}
+                        />
+                      </Form.Item>
+                    ) : (
+                      <Form.Item
+                        label={t("jobs.labels.adjustmentrate")}
+                        name={[record.name, "lbr_adjustment", "rate"]}
+                        initialValue={bodyshop.default_adjustment_rate}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <InputNumber precision={2} min={0.01} />
+                      </Form.Item>
+                    )}
+
+                    <Space>
+                      {price &&
+                        adjustmentRate &&
+                        `${(price / adjustmentRate).toFixed(1)} hrs`}
+                    </Space>
                   </div>
                 );
               return <></>;
@@ -457,21 +506,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",
@@ -486,20 +535,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/bill-form/bill-form.totals.utility.js

@@ -19,14 +19,14 @@ export const CalculateBillTotal = (invoice) => {
       }).multiply(i.quantity || 1);
 
       subtotal = subtotal.add(itemTotal);
-      if (i.applicable_taxes.federal) {
+      if (i.applicable_taxes?.federal) {
         federalTax = federalTax.add(
           itemTotal.percentage(federal_tax_rate || 0)
         );
       }
-      if (i.applicable_taxes.state)
+      if (i.applicable_taxes?.state)
         stateTax = stateTax.add(itemTotal.percentage(state_tax_rate || 0));
-      if (i.applicable_taxes.local)
+      if (i.applicable_taxes?.local)
         localTax = localTax.add(itemTotal.percentage(local_tax_rate || 0));
     }
   });

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

@@ -63,6 +63,12 @@ const BillLineSearchSelect = (
                   item.oem_partno ? ` - ${item.oem_partno}` : ""
                 }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
               </span>
+              {item.act_price === 0 && item.mod_lb_hrs > 0 && (
+                <span style={{ float: "right", paddingleft: "1rem" }}>
+                  {`${item.mod_lb_hrs} units`}
+                </span>
+              )}
+
               <span style={{ float: "right", paddingleft: "1rem" }}>
                 {item.act_price
                   ? `$${item.act_price && item.act_price.toFixed(2)}`

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

@@ -1,10 +1,10 @@
 import { Select, Space, Tag } from "antd";
-import React, { forwardRef } from "react";
+import React from "react";
 import { useTranslation } from "react-i18next";
 const { Option } = Select;
 //To be used as a form element only.
 
-const EmployeeSearchSelect = ({ options, ...props }, ref) => {
+const EmployeeSearchSelect = ({ options, ...props }) => {
   const { t } = useTranslation();
 
   return (
@@ -39,4 +39,4 @@ const EmployeeSearchSelect = ({ options, ...props }, ref) => {
     </Select>
   );
 };
-export default forwardRef(EmployeeSearchSelect);
+export default EmployeeSearchSelect;

client/src/components/employee-team-search-select/employee-team-search-select.component.jsx

@@ -0,0 +1,33 @@
+import { useQuery } from "@apollo/client";
+import { Select } from "antd";
+import React, { forwardRef } from "react";
+import { QUERY_TEAMS } from "../../graphql/employee_teams.queries";
+import AlertComponent from "../alert/alert.component";
+
+//To be used as a form element only.
+
+const EmployeeTeamSearchSelect = ({ ...props }, ref) => {
+  const { loading, error, data } = useQuery(QUERY_TEAMS);
+
+  if (error) return <AlertComponent message={JSON.stringify(error)} />;
+  return (
+    <Select
+      showSearch
+      allowClear
+      loading={loading}
+      style={{
+        width: 400,
+      }}
+      options={
+        data
+          ? data.employee_teams.map((e) => ({
+              value: JSON.stringify(e),
+              label: e.name,
+            }))
+          : []
+      }
+      {...props}
+    />
+  );
+};
+export default forwardRef(EmployeeTeamSearchSelect);

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/form-items-formatted/read-only-form-item.component.jsx

@@ -1,9 +1,26 @@
 import Dinero from "dinero.js";
 import React, { forwardRef } from "react";
 
-const ReadOnlyFormItem = ({ value, type = "text", onChange }, ref) => {
+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))
+});
+
+const ReadOnlyFormItem = (
+  { bodyshop, value, type = "text", onChange },
+  ref
+) => {
   if (!value) return null;
   switch (type) {
+    case "employee":
+      const emp = bodyshop.employees.find((e) => e.id === value);
+      return `${emp?.first_name} ${emp?.last_name}`;
+
     case "text":
       return <div>{value}</div>;
     case "currency":
@@ -14,4 +31,8 @@ const ReadOnlyFormItem = ({ value, type = "text", onChange }, ref) => {
       return <div>{value}</div>;
   }
 };
-export default forwardRef(ReadOnlyFormItem);
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(forwardRef(ReadOnlyFormItem));

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

@@ -268,6 +268,13 @@ function Header({
               {t("menus.header.timetickets")}
             </Link>
           </Menu.Item>
+          {bodyshop?.md_tasks_presets?.use_approvals && (
+            <Menu.Item key="ttapprovals" icon={<FieldTimeOutlined />}>
+              <Link to="/manage/ttapprovals">
+                {t("menus.header.ttapprovals")}
+              </Link>
+            </Menu.Item>
+          )}
           <Menu.Item
             key="entertimetickets"
             icon={<Icon component={GiPlayerTime} />}
@@ -382,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-calculate-totals/job-calculate-totals.component.jsx

@@ -1,47 +1,52 @@
 import { Button, notification } from "antd";
 import Axios from "axios";
 import React, { useState } from "react";
-import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
-import Dinero from "dinero.js";
-export default function JobCalculateTotals({ job, disabled }) {
+export default function JobCalculateTotals({ job, disabled, refetch }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-  const [updateJob] = useMutation(UPDATE_JOB);
 
   const handleCalculate = async () => {
-    setLoading(true);
-    const newTotals = (
-      await Axios.post("/job/totals", {
-        job: job,
-      })
-    ).data;
+    try {
+      setLoading(true);
 
-    const result = await updateJob({
-      refetchQueries: ["GET_JOB_BY_PK"],
-      awaitRefetchQueries: true,
-      variables: {
-        jobId: job.id,
-        job: {
-          job_totals: newTotals,
-          clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
-          owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat(
-            "0.00"
-          ),
-        },
-      },
-    });
-    if (!!!result.errors) {
-      notification["success"]({ message: t("jobs.successes.updated") });
-    } else {
+      await Axios.post("/job/totalsssu", {
+        id: job.id,
+      });
+
+      if (refetch) refetch();
+      // const result = await updateJob({
+      //   refetchQueries: ["GET_JOB_BY_PK"],
+      //   awaitRefetchQueries: true,
+      //   variables: {
+      //     jobId: job.id,
+      //     job: {
+      //       job_totals: newTotals,
+      //       clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
+      //       owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat(
+      //         "0.00"
+      //       ),
+      //     },
+      //   },
+      // });
+      // if (!!!result.errors) {
+      //   notification["success"]({ message: t("jobs.successes.updated") });
+      // } else {
+      //   notification["error"]({
+      //     message: t("jobs.errors.updating", {
+      //       error: JSON.stringify(result.errors),
+      //     }),
+      //   });
+      // }
+    } catch (error) {
       notification["error"]({
         message: t("jobs.errors.updating", {
-          error: JSON.stringify(result.errors),
+          error: JSON.stringify(error),
         }),
       });
+    } finally {
+      setLoading(false);
     }
-    setLoading(false);
   };
 
   return (

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

@@ -32,9 +32,9 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 const span = {
-  sm: { span: 24 },
-  md: { span: 12 },
-  lg: { span: 8 },
+  lg: { span: 24 },
+  xl: { span: 12 },
+  xxl: { span: 8 },
 };
 
 export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
@@ -137,12 +137,6 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
                 data={data ? data.jobs_by_pk : null}
               />
             </Col>
-            <Col {...span}>
-              <JobDetailCardsPartsComponent
-                loading={loading}
-                data={data ? data.jobs_by_pk : null}
-              />
-            </Col>
             <Col {...span}>
               <JobDetailCardsNotesComponent
                 loading={loading}
@@ -163,6 +157,12 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
                 data={data ? data.jobs_by_pk : null}
               />
             </Col>
+            <Col span={24}>
+              <JobDetailCardsPartsComponent
+                loading={loading}
+                data={data ? data.jobs_by_pk : null}
+              />
+            </Col>
           </Row>
         </Card>
       ) : null}

client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx

@@ -1,16 +1,119 @@
+import { Table } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import JobLineNotePopup from "../job-line-note-popup/job-line-note-popup.component";
 import PartsStatusPie from "../parts-status-pie/parts-status-pie.component";
 import CardTemplate from "./job-detail-cards.template.component";
 
-export default function JobDetailCardsPartsComponent({ loading, data }) {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { onlyUnique } from "../../utils/arrayHelper";
+import { alphaSort } from "../../utils/sorters";
+import JobLineLocationPopup from "../job-line-location-popup/job-line-location-popup.component";
+import JobLineStatusPopup from "../job-line-status-popup/job-line-status-popup.component";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  jobRO: selectJobReadOnly,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobDetailCardsPartsComponent);
+
+export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
   const { t } = useTranslation();
   const { joblines_status } = data;
 
+  const columns = [
+    {
+      title: t("joblines.fields.line_desc"),
+      dataIndex: "line_desc",
+      fixed: "left",
+      key: "line_desc",
+      sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
+      onCell: (record) => ({
+        className: record.manual_line && "job-line-manual",
+        style: {
+          ...(record.critical ? { boxShadow: " -.5em 0 0 #FFC107" } : {}),
+        },
+      }),
+      width: "30%",
+      ellipsis: true,
+    },
+    {
+      title: t("joblines.fields.part_type"),
+      dataIndex: "part_type",
+      key: "part_type",
+      width: "15%",
+      sorter: (a, b) =>
+        alphaSort(
+          t(`joblines.fields.part_types.${a.part_type}`),
+          t(`joblines.fields.part_types.${b.part_type}`)
+        ),
+      render: (text, record) =>
+        record.part_type
+          ? t(`joblines.fields.part_types.${record.part_type}`)
+          : null,
+    },
+    {
+      title: t("joblines.fields.part_qty"),
+      dataIndex: "part_qty",
+      key: "part_qty",
+      width: "10%",
+    },
+    {
+      title: t("joblines.fields.notes"),
+      dataIndex: "notes",
+      key: "notes",
+      render: (text, record) => (
+        <JobLineNotePopup disabled={jobRO} jobline={record} />
+      ),
+    },
+    {
+      title: t("joblines.fields.location"),
+      dataIndex: "location",
+      key: "location",
+      sorter: (a, b) => alphaSort(a.location, b.location),
+      render: (text, record) => (
+        <JobLineLocationPopup jobline={record} disabled={jobRO} />
+      ),
+    },
+    {
+      title: t("joblines.fields.status"),
+      dataIndex: "status",
+      key: "status",
+      sorter: (a, b) => alphaSort(a.status, b.status),
+      filters:
+        (data &&
+          data.joblines
+            ?.map((l) => l.status)
+            .filter(onlyUnique)
+            .map((s) => {
+              return {
+                text: s || "No Status*",
+                value: [s],
+              };
+            })) ||
+        [],
+      onFilter: (value, record) => value.includes(record.status),
+      render: (text, record) => (
+        <JobLineStatusPopup jobline={record} disabled={jobRO} />
+      ),
+    },
+  ];
   return (
     <div>
       <CardTemplate loading={loading} title={t("jobs.labels.cards.parts")}>
         <PartsStatusPie joblines_status={joblines_status} />
+        <Table
+          key="id"
+          columns={columns}
+          dataSource={data ? data.joblines : []}
+        />
       </CardTemplate>
     </div>
   );

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-part-price-change.component.jsx

@@ -0,0 +1,97 @@
+import { useMutation } from "@apollo/client";
+import { Button, Form, notification, Popover, Tooltip } from "antd";
+import { t } from "i18next";
+import React, { useState } from "react";
+import { UPDATE_LINE_PPC } from "../../graphql/jobs-lines.queries";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
+import JobLineConvertToLabor from "../job-line-convert-to-labor/job-line-convert-to-labor.component";
+import axios from "axios";
+export default function JobLinesPartPriceChange({ job, line, refetch }) {
+  const [loading, setLoading] = useState(false);
+  const [updatePartPrice] = useMutation(UPDATE_LINE_PPC);
+
+  const handleFinish = async (values) => {
+    try {
+      setLoading(true);
+      const result = await updatePartPrice({
+        variables: {
+          id: line.id,
+          jobline: {
+            act_price_before_ppc: line.act_price_before_ppc
+              ? line.act_price_before_ppc
+              : line.act_price,
+            act_price: values.act_price,
+          },
+        },
+      });
+      await axios.post("/job/totalsssu", {
+        id: job.id,
+      });
+      if (result.errors) {
+        notification.open({
+          type: "error",
+          message: t("joblines.errors.saving", {
+            error: JSON.stringify(result.errors),
+          }),
+        });
+        if (refetch) refetch();
+      } else {
+        notification.open({
+          type: "success",
+          message: t("joblines.successes.saved"),
+        });
+      }
+    } catch (error) {
+      notification.open({
+        type: "error",
+        message: t("joblines.errors.saving", { error: JSON.stringify(error) }),
+      });
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const popcontent = (
+    <Form layout="vertical" onFinish={handleFinish} initialValues={{ act_price: line.act_price }}>
+      <Form.Item
+        name="act_price"
+        label={t("jobs.labels.act_price_ppc")}
+        rules={[{ required: true }]}
+      >
+        <CurrencyFormItemComponent />
+      </Form.Item>
+      <Button loading={loading} htmlType="primary">
+        {t("general.actions.save")}
+      </Button>
+    </Form>
+  );
+
+  return (
+    <JobLineConvertToLabor jobline={line} job={job}>
+      <Popover trigger="click" disabled={line.manual_line} content={popcontent}>
+        <CurrencyFormatter>
+          {line.db_ref === "900510" || line.db_ref === "900511"
+            ? line.prt_dsmk_m
+            : line.act_price}
+        </CurrencyFormatter>
+        {line.prt_dsmk_p && line.prt_dsmk_p !== 0 ? (
+          <span style={{ marginLeft: ".2rem" }}>{`(${line.prt_dsmk_p}%)`}</span>
+        ) : (
+          <></>
+        )}
+        {line.act_price_before_ppc && line.act_price_before_ppc !== 0 ? (
+          <Tooltip title={t("jobs.labels.ppc")}>
+            <span style={{ marginLeft: ".2rem", color: "tomato" }}>
+              (
+              <CurrencyFormatter>{line.act_price_before_ppc}</CurrencyFormatter>
+              )
+            </span>
+          </Tooltip>
+        ) : (
+          <></>
+        )}
+      </Popover>
+    </JobLineConvertToLabor>
+  );
+}

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

@@ -1,12 +1,12 @@
 import {
   DeleteFilled,
+  EditFilled,
   FilterFilled,
+  HomeOutlined,
+  MinusCircleTwoTone,
+  PlusCircleTwoTone,
   SyncOutlined,
   WarningFilled,
-  EditFilled,
-  PlusCircleTwoTone,
-  MinusCircleTwoTone,
-  HomeOutlined,
 } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
 import {
@@ -29,7 +29,6 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { onlyUnique } from "../../utils/arrayHelper";
-import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort } from "../../utils/sorters";
 import JobLineLocationPopup from "../job-line-location-popup/job-line-location-popup.component";
 import JobLineNotePopup from "../job-line-note-popup/job-line-note-popup.component";
@@ -38,13 +37,18 @@ import JobLinesBillRefernece from "../job-lines-bill-reference/job-lines-bill-re
 // import AllocationsAssignmentContainer from "../allocations-assignment/allocations-assignment.container";
 // import AllocationsBulkAssignmentContainer from "../allocations-bulk-assignment/allocations-bulk-assignment.container";
 // import AllocationsEmployeeLabelContainer from "../allocations-employee-label/allocations-employee-label.container";
-import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
 import _ from "lodash";
-import JobCreateIOU from "../job-create-iou/job-create-iou.component";
-import JobLinesExpander from "./job-lines-expander.component";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import moment from "moment";
-import JobLineConvertToLabor from "../job-line-convert-to-labor/job-line-convert-to-labor.component";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import JobCreateIOU from "../job-create-iou/job-create-iou.component";
+import JobSendPartPriceChangeComponent from "../job-send-parts-price-change/job-send-parts-price-change.component";
+import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
+import JobLinesExpander from "./job-lines-expander.component";
+import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
+import JoblineTeamAssignment from "../job-line-team-assignment/job-line-team-assignmnent.component";
+import JobLineDispatchButton from "../job-line-dispatch-button/job-line-dispatch-button.component";
+import JobLineBulkAssignComponent from "../job-line-bulk-assign/job-line-bulk-assign.component";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -76,8 +80,16 @@ export function JobLinesComponent({
   setBillEnterContext,
 }) {
   const [deleteJobLine] = useMutation(DELETE_JOB_LINE_BY_PK);
-
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
   const [selectedLines, setSelectedLines] = useState([]);
+  console.log(
+    "🚀 ~ file: job-lines.component.jsx:89 ~ selectedLines:",
+    selectedLines
+  );
   const [state, setState] = useState({
     sortedInfo: {},
     filteredInfo: {},
@@ -121,10 +133,21 @@ export function JobLinesComponent({
       sortOrder:
         state.sortedInfo.columnKey === "oem_partno" && state.sortedInfo.order,
       ellipsis: true,
-      render: (text, record) =>
-        `${record.oem_partno || ""} ${
-          record.alt_partno ? `(${record.alt_partno})` : ""
-        }`.trim(),
+      onCell: (record) => ({
+        className: record.manual_line && "job-line-manual",
+        style: {
+          ...(record.parts_dispatch_lines[0]?.accepted_at
+            ? { boxShadow: " -.5em 0 0 #FFC107" }
+            : {}),
+        },
+      }),
+      render: (text, record) => (
+        <span class="ant-table-cell-content">
+          {`${record.oem_partno || ""} ${
+            record.alt_partno ? `(${record.alt_partno})` : ""
+          }`.trim()}
+        </span>
+      ),
     },
     {
       title: t("joblines.fields.op_code_desc"),
@@ -220,20 +243,7 @@ export function JobLinesComponent({
         state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
       ellipsis: true,
       render: (text, record) => (
-        <JobLineConvertToLabor jobline={record} job={job}>
-          <CurrencyFormatter>
-            {record.db_ref === "900510" || record.db_ref === "900511"
-              ? record.prt_dsmk_m
-              : record.act_price}
-          </CurrencyFormatter>
-          {record.prt_dsmk_p && record.prt_dsmk_p !== 0 ? (
-            <span
-              style={{ marginLeft: ".2rem" }}
-            >{`(${record.prt_dsmk_p}%)`}</span>
-          ) : (
-            <></>
-          )}
-        </JobLineConvertToLabor>
+        <JobLinesPartPriceChange line={record} job={job} refetch={refetch} />
       ),
     },
     {
@@ -286,6 +296,23 @@ export function JobLinesComponent({
         state.sortedInfo.columnKey === "line_ind" && state.sortedInfo.order,
       responsive: ["md"],
     },
+    ...(Enhanced_Payroll.treatment === "on"
+      ? [
+          {
+            title: t("joblines.fields.assigned_team"),
+            dataIndex: "assigned_team",
+            key: "assigned_team",
+            render: (text, record) => (
+              <JoblineTeamAssignment
+                disabled={jobRO}
+                jobline={record}
+                jobId={job.id}
+              />
+            ),
+          },
+        ]
+      : []),
+
     {
       title: t("joblines.fields.notes"),
       dataIndex: "notes",
@@ -404,7 +431,11 @@ export function JobLinesComponent({
       setSelectedLines((selectedLines) =>
         _.uniq([
           ...selectedLines,
-          ...jobLines.filter((item) => markedTypes.includes(item.part_type)),
+          ...jobLines.filter(
+            (item) =>
+              markedTypes.includes(item.part_type) ||
+              markedTypes.includes(item.mod_lbr_ty)
+          ),
         ])
       );
     }
@@ -417,6 +448,21 @@ export function JobLinesComponent({
       <Menu.Item key="PAL">{t("joblines.fields.part_types.PAL")}</Menu.Item>
       <Menu.Item key="PAS">{t("joblines.fields.part_types.PAS")}</Menu.Item>
       <Menu.Divider />
+      <Menu.Item key="LAA">{t("joblines.fields.lbr_types.LAA")}</Menu.Item>
+      <Menu.Item key="LAB">{t("joblines.fields.lbr_types.LAB")}</Menu.Item>
+      <Menu.Item key="LAD">{t("joblines.fields.lbr_types.LAD")}</Menu.Item>
+      <Menu.Item key="LAE">{t("joblines.fields.lbr_types.LAE")}</Menu.Item>
+      <Menu.Item key="LAF">{t("joblines.fields.lbr_types.LAF")}</Menu.Item>
+      <Menu.Item key="LAG">{t("joblines.fields.lbr_types.LAG")}</Menu.Item>
+      <Menu.Item key="LAM">{t("joblines.fields.lbr_types.LAM")}</Menu.Item>
+      <Menu.Item key="LAR">{t("joblines.fields.lbr_types.LAR")}</Menu.Item>
+      <Menu.Item key="LAS">{t("joblines.fields.lbr_types.LAS")}</Menu.Item>
+      <Menu.Item key="LAU">{t("joblines.fields.lbr_types.LAU")}</Menu.Item>
+      <Menu.Item key="LA1">{t("joblines.fields.lbr_types.LA1")}</Menu.Item>
+      <Menu.Item key="LA2">{t("joblines.fields.lbr_types.LA2")}</Menu.Item>
+      <Menu.Item key="LA3">{t("joblines.fields.lbr_types.LA3")}</Menu.Item>
+      <Menu.Item key="LA4">{t("joblines.fields.lbr_types.LA2")}</Menu.Item>
+      <Menu.Divider />
       <Menu.Item key="clear">{t("general.labels.clear")}</Menu.Item>
     </Menu>
   );
@@ -440,6 +486,18 @@ export function JobLinesComponent({
                 </Space>
               </Tag>
             )}
+            <JobLineDispatchButton
+              selectedLines={selectedLines}
+              setSelectedLines={setSelectedLines}
+              job={job}
+            />
+            {Enhanced_Payroll.treatment === "on" && (
+              <JobLineBulkAssignComponent
+                selectedLines={selectedLines}
+                setSelectedLines={setSelectedLines}
+                job={job}
+              />
+            )}
             <Button
               disabled={
                 (job && !job.converted) ||
@@ -448,15 +506,6 @@ export function JobLinesComponent({
                 technician
               }
               onClick={() => {
-                // setPartsOrderContext({
-                //   actions: { refetch: refetch },
-                //   context: {
-                //     jobId: job.id,
-                //     job: job,
-                //     linesToOrder: selectedLines,
-                //   },
-                // });
-
                 setBillEnterContext({
                   actions: { refetch: refetch },
                   context: {
@@ -563,6 +612,9 @@ export function JobLinesComponent({
             >
               {t("joblines.actions.new")}
             </Button>
+            {bodyshop.region_config.toLowerCase().startsWith("us") && (
+              <JobSendPartPriceChangeComponent job={job} />
+            )}
             <JobCreateIOU job={job} selectedJobLines={selectedLines} />
             <Input.Search
               placeholder={t("general.labels.search")}

client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx

@@ -0,0 +1,149 @@
+import React, { useState } from "react";
+
+import { useMutation } from "@apollo/client";
+import { Button, Form, Popover, Select, Space, notification } from "antd";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { UPDATE_LINE_BULK_ASSIGN } from "../../graphql/jobs-lines.queries";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly,
+  currentUser: selectCurrentUser,
+});
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JoblineBulkAssign);
+
+export function JoblineBulkAssign({
+  setSelectedLines,
+  selectedLines,
+  insertAuditTrail,
+  bodyshop,
+  jobRO,
+  job,
+  currentUser,
+}) {
+  const [visible, setVisible] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
+
+  const { t } = useTranslation();
+  const [assignLines] = useMutation(UPDATE_LINE_BULK_ASSIGN);
+
+  const handleConvert = async (values) => {
+    try {
+      setLoading(true);
+      const result = await assignLines({
+        variables: {
+          jobline: {
+            assigned_team: values.assigned_team,
+          },
+          ids: selectedLines.map((l) => l.id),
+        },
+      });
+      if (result.errors) {
+        notification.open({
+          type: "error",
+          message: t("parts_dispatch.errors.creating", {
+            error: JSON.stringify(result.errors),
+          }),
+        });
+      } else {
+        //Insert the audit trail here.
+
+        const teamName = bodyshop.employee_teams.find(
+          (et) => et.id === values.assigned_team
+        )?.name;
+
+        const hours = selectedLines.reduce(
+          (acc, val) => (acc += val.mod_lb_hrs),
+          0
+        );
+
+        insertAuditTrail({
+          jobid: job.id,
+          operation: AuditTrailMapping.assignedlinehours(
+            teamName,
+            hours.toFixed(1)
+          ),
+        });
+        setSelectedLines([]);
+        setVisible(false);
+      }
+    } catch (error) {
+      notification.open({
+        type: "error",
+        message: t("parts_dispatch.errors.creating", {
+          error: error,
+        }),
+      });
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const popMenu = (
+    <div>
+      <Form layout="vertical" form={form} onFinish={handleConvert}>
+        <Form.Item
+          name={"assigned_team"}
+          label={t("joblines.fields.assigned_team")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Select
+            showSearch
+            style={{ width: 200 }}
+            optionFilterProp="children"
+            filterOption={(input, option) =>
+              option.props.children
+                .toLowerCase()
+                .indexOf(input.toLowerCase()) >= 0
+            }
+          >
+            {bodyshop.employee_teams.map((team) => (
+              <Select.Option value={team.id} key={team.id} name={team.name}>
+                {team.name}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+
+        <Space wrap>
+          <Button type="danger" onClick={() => form.submit()} loading={loading}>
+            {t("general.actions.save")}
+          </Button>
+          <Button onClick={() => setVisible(false)}>
+            {t("general.actions.cancel")}
+          </Button>
+        </Space>
+      </Form>
+    </div>
+  );
+
+  return (
+    <Popover open={visible} content={popMenu}>
+      <Button
+        disabled={selectedLines.length === 0 || jobRO}
+        loading={loading}
+        onClick={() => setVisible(true)}
+      >
+        {t("joblines.actions.assign_team", { count: selectedLines.length })}
+      </Button>
+    </Popover>
+  );
+}

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

@@ -0,0 +1,167 @@
+import React, { useState } from "react";
+
+import { useMutation } from "@apollo/client";
+import { Button, Form, Popover, Select, Space, notification } from "antd";
+import moment from "moment";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { INSERT_PARTS_DISPATCH } from "../../graphql/parts-dispatch.queries";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly,
+  currentUser: selectCurrentUser,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobLineDispatchButton);
+
+export function JobLineDispatchButton({
+  setSelectedLines,
+  selectedLines,
+
+  bodyshop,
+  jobRO,
+  job,
+  currentUser,
+}) {
+  const [visible, setVisible] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
+  const Templates = TemplateList("job_special", {
+    ro_number: job.ro_number,
+  });
+  const { t } = useTranslation();
+  const [dispatchLines] = useMutation(INSERT_PARTS_DISPATCH);
+
+  const handleConvert = async (values) => {
+    try {
+      setLoading(true);
+      //THIS HAS NOT YET BEEN TESTED. START BY FINISHING THIS FUNCTION.
+      const result = await dispatchLines({
+        variables: {
+          partsDispatch: {
+            dispatched_at: moment(),
+            employeeid: values.employeeid,
+            jobid: job.id,
+            dispatched_by: currentUser.email,
+            parts_dispatch_lines: {
+              data: selectedLines.map((l) => ({
+                joblineid: l.id,
+                quantity: l.part_qty,
+              })),
+            },
+          },
+          //joblineids: selectedLines.map((l) => l.id),
+        },
+      });
+      if (result.errors) {
+        notification.open({
+          type: "error",
+          message: t("parts_dispatch.errors.creating", {
+            error: result.errors,
+          }),
+        });
+      } else {
+        setSelectedLines([]);
+        await GenerateDocument(
+          {
+            name: Templates.parts_dispatch.key,
+            variables: {
+              id: result.data.insert_parts_dispatch_one.id,
+            },
+          },
+          {},
+          "p"
+        );
+      }
+      setVisible(false);
+    } catch (error) {
+      notification.open({
+        type: "error",
+        message: t("parts_dispatch.errors.creating", {
+          error: error,
+        }),
+      });
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const popMenu = (
+    <div>
+      <Form layout="vertical" form={form} onFinish={handleConvert}>
+        <Form.Item
+          name={"employeeid"}
+          label={t("timetickets.fields.employee")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Select
+            showSearch
+            style={{ width: 200 }}
+            optionFilterProp="children"
+            filterOption={(input, option) =>
+              option.props.children
+                .toLowerCase()
+                .indexOf(input.toLowerCase()) >= 0
+            }
+          >
+            {bodyshop.employees
+              .filter((emp) => emp.active)
+              .map((emp) => (
+                <Select.Option
+                  value={emp.id}
+                  key={emp.id}
+                  name={`${emp.first_name} ${emp.last_name}`}
+                >
+                  {`${emp.first_name} ${emp.last_name}`}
+                </Select.Option>
+              ))}
+          </Select>
+        </Form.Item>
+
+        <Space wrap>
+          <Button
+            type="danger"
+            onClick={() => form.submit()}
+            loading={loading}
+            disabled={selectedLines.length === 0}
+          >
+            {t("general.actions.save")}
+          </Button>
+          <Button onClick={() => setVisible(false)}>
+            {t("general.actions.cancel")}
+          </Button>
+        </Space>
+      </Form>
+    </div>
+  );
+
+  return (
+    <Popover open={visible} content={popMenu}>
+      <Button
+        disabled={selectedLines.length === 0 || jobRO}
+        loading={loading}
+        onClick={() => setVisible(true)}
+      >
+        {t("joblines.actions.dispatchparts", { count: selectedLines.length })}
+      </Button>
+    </Popover>
+  );
+}

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-line-team-assignment/job-line-team-assignmnent.component.jsx

@@ -0,0 +1,115 @@
+import { notification, Select } from "antd";
+import React, { useEffect, useState } from "react";
+import { useMutation } from "@apollo/client";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+
+export function JoblineTeamAssignment({
+  bodyshop,
+  jobline,
+  disabled,
+  jobId,
+  insertAuditTrail,
+}) {
+  const [editing, setEditing] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [assignedTeam, setAssignedTeam] = useState(jobline.assigned_team);
+  const [updateJob] = useMutation(UPDATE_JOB_LINE);
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    if (editing) setAssignedTeam(jobline.assigned_team);
+  }, [editing, jobline.assigned_team]);
+
+  const handleChange = (e) => {
+    setAssignedTeam(e);
+  };
+
+  const handleSave = async (e) => {
+    setLoading(true);
+    const result = await updateJob({
+      variables: {
+        lineId: jobline.id,
+        line: { assigned_team: assignedTeam },
+      },
+    });
+
+    if (!!!result.errors) {
+      notification["success"]({ message: t("joblines.successes.saved") });
+      //insert the audit trail here.
+      const teamName = bodyshop.employee_teams.find(
+        (et) => et.id === assignedTeam
+      )?.name;
+      insertAuditTrail({
+        jobid: jobId,
+        operation: AuditTrailMapping.assignedlinehours(
+          teamName,
+          jobline.mod_lb_hrs
+        ),
+      });
+    } else {
+      notification["error"]({
+        message: t("joblines.errors.saving", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setLoading(false);
+    setEditing(false);
+  };
+
+  if (editing)
+    return (
+      <div>
+        <LoadingSpinner loading={loading}>
+          <Select
+            autoFocus
+            allowClear
+            dropdownMatchSelectWidth={100}
+            value={assignedTeam}
+            onSelect={handleChange}
+            onBlur={handleSave}
+            onClear={() => handleChange(null)}
+          >
+            {Object.values(bodyshop.employee_teams).map((s, idx) => (
+              <Select.Option key={idx} value={s.id}>
+                {s.name}
+              </Select.Option>
+            ))}
+          </Select>
+        </LoadingSpinner>
+      </div>
+    );
+
+  const team = bodyshop.employee_teams.find(
+    (tm) => tm.id === jobline.assigned_team
+  );
+
+  return (
+    <div
+      style={{ width: "100%", minHeight: "1rem", cursor: "pointer" }}
+      onClick={() => !disabled && setEditing(true)}
+    >
+      {team?.name}
+    </div>
+  );
+}
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JoblineTeamAssignment);

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-send-parts-price-change/job-send-parts-price-change.component.jsx

@@ -0,0 +1,31 @@
+import { Button, notification } from "antd";
+import axios from "axios";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+
+export default function JobSendPartPriceChangeComponent({ job }) {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+  const handleClick = async () => {
+    setLoading(true);
+    try {
+      const ppcData = await axios.post("/job/ppc", { jobid: job.id });
+      await axios.post("http://localhost:1337/ppc/", ppcData.data);
+    } catch (error) {
+      notification.open({
+        type: "error",
+        message: t("jobs.errors.partspricechange", {
+          error: JSON.stringify(error),
+        }),
+      });
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <Button onClick={handleClick} loading={loading}>
+      {t("jobs.actions.sendpartspricechange")}
+    </Button>
+  );
+}

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

@@ -67,7 +67,8 @@ export function JobsTotalsTableComponent({ jobRO, currentUser, job }) {
                 <JobTotalsTableTotals job={job} />
               </Card>
             </Col>
-            {currentUser.email.includes("@imex.") && (
+            {(currentUser.email.includes("@imex.") ||
+              currentUser.email.includes("@rome.")) && (
               <Col span={24}>
                 <Card title="DEVELOPMENT USE ONLY">
                   <JobCalculateTotals job={job} disabled={jobRO} />

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

@@ -123,11 +123,10 @@ export default function JobTotalsTableLabor({ job }) {
               <Space>
                 {t("jobs.labels.mapa")}
                 {job.materials &&
-                  job.materials.mapa &&
-                  job.materials.mapa.cal_maxdlr &&
-                  job.materials.mapa.cal_maxdlr > 0 &&
+                  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>
@@ -148,11 +147,10 @@ export default function JobTotalsTableLabor({ job }) {
               <Space wrap>
                 {t("jobs.labels.mash")}
                 {job.materials &&
-                  job.materials.mash &&
-                  job.materials.mash.cal_maxdlr &&
-                  job.materials.mash.cal_maxdlr > 0 &&
+                  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.parts.component.jsx

@@ -11,6 +11,22 @@ export default function JobTotalsTableParts({ job }) {
     filteredInfo: {},
   });
 
+  const insuranceAdjustments = useMemo(() => {
+    if (!job.job_totals) return [];
+    if (!job.job_totals?.parts?.adjustments) return [];
+    const adjs = [];
+    Object.keys(job.job_totals?.parts?.adjustments).forEach((key) => {
+      if (Dinero(job.job_totals?.parts?.adjustments[key]).getAmount() !== 0) {
+        adjs.push({
+          id: key,
+          amount: Dinero(job.job_totals.parts.adjustments[key]),
+        });
+      }
+    });
+
+    return adjs;
+  }, [job.job_totals]);
+
   const data = useMemo(() => {
     return Object.keys(job.job_totals.parts.parts.list)
       .filter(
@@ -74,11 +90,11 @@ export default function JobTotalsTableParts({ job }) {
             <Table.Summary.Cell>
               {t("jobs.labels.prt_dsmk_total")}
             </Table.Summary.Cell>
-
             <Table.Summary.Cell align="right">
               {Dinero(job.job_totals.parts.parts.prt_dsmk_total).toFormat()}
             </Table.Summary.Cell>
           </Table.Summary.Row>
+
           <Table.Summary.Row>
             <Table.Summary.Cell>
               <strong>{t("jobs.labels.partstotal")}</strong>
@@ -90,6 +106,24 @@ export default function JobTotalsTableParts({ job }) {
               </strong>
             </Table.Summary.Cell>
           </Table.Summary.Row>
+          {insuranceAdjustments.length > 0 && (
+            <Table.Summary.Row>
+              <Table.Summary.Cell colSpan={24}>
+                {t("jobs.labels.profileadjustments")}
+              </Table.Summary.Cell>
+            </Table.Summary.Row>
+          )}
+          {insuranceAdjustments.map((adj, idx) => (
+            <Table.Summary.Row key={idx}>
+              <Table.Summary.Cell>
+                {t(`jobs.fields.${adj.id.toLowerCase()}`)}
+              </Table.Summary.Cell>
+
+              <Table.Summary.Cell align="right">
+                {adj.amount.toFormat()}
+              </Table.Summary.Cell>
+            </Table.Summary.Row>
+          ))}
         </>
       )}
     />

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-supplement.estlines.util.js

@@ -25,7 +25,7 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
       //Found a relevant matching line. Add it to lines to update.
       linesToUpdate.push({
         id: existingLines[matchingIndex].id,
-        newData: { ...newLine, removed: false },
+        newData: { ...newLine, removed: false, act_price_before_ppc: null },
       });
 
       //Splice out item we found for performance.
@@ -50,7 +50,6 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
     .reduce((acc, value, idx) => {
       return acc + generateRemoveQuery(value, idx);
     }, "");
-  console.log(insertQueries, updateQueries, removeQueries);
 
   if ((insertQueries + updateQueries + removeQueries).trim() === "") {
     return new Promise((resolve, reject) => {

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

@@ -6,9 +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 Dinero from "dinero.js";
+import _ from "lodash";
 import moment from "moment";
 import queryString from "query-string";
 import React, { useCallback, useEffect, useState } from "react";
@@ -30,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";
@@ -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!
@@ -106,17 +106,21 @@ export function JobsAvailableContainer({
       });
       return;
     }
+    // if (process.env.REACT_APP_COUNTRY === "USA") {
+    //Massage the CCC file set to remove duplicate UNQ_SEQ.
+    await ResolveCCCLineIssues(estData.est_data, bodyshop);
+    //   } else {
     //IO-539 Check for Parts Rate on PAL for SGI use case.
     await CheckTaxRates(estData.est_data, bodyshop);
-
-    const newTotals = (
-      await Axios.post("/job/totals", {
-        job: {
-          ...estData.est_data,
-          joblines: estData.est_data.joblines.data,
-        },
-      })
-    ).data;
+    //  }
+    // const newTotals = (
+    //   await Axios.post("/job/totals", {
+    //     job: {
+    //       ...estData.est_data,
+    //       joblines: estData.est_data.joblines.data,
+    //     },
+    //   })
+    // ).data;
 
     let existingVehicles;
     if (estData.est_data.v_vin) {
@@ -131,9 +135,9 @@ export function JobsAvailableContainer({
 
     const newJob = {
       ...estData.est_data,
-      clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
-      owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
-      job_totals: newTotals,
+      // clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
+      // owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
+      // job_totals: newTotals,
       date_open: moment(),
       status: bodyshop.md_ro_statuses.default_imported,
       notes: {
@@ -157,43 +161,50 @@ export function JobsAvailableContainer({
       delete newJob.vehicle;
     }
 
-    insertNewJob({
-      variables: {
-        job: newJob,
-      },
-    })
-      .then((r) => {
-        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.
+    if (typeof newJob.kmin === "string") {
+      newJob.kmin = null;
+    }
 
-        insertAuditTrail({
-          jobid: r.data.insert_jobs.returning[0].id,
-          operation: AuditTrailMapping.jobimported(),
-        });
+    try {
+      const r = await insertNewJob({
+        variables: {
+          job: newJob,
+        },
+      });
+      await Axios.post("/job/totalsssu", {
+        id: r.data.insert_jobs.returning[0].id,
+      });
 
-        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 }),
-        });
+      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.
+
+      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
@@ -216,6 +227,7 @@ export function JobsAvailableContainer({
       let supp = replaceEmpty({ ...estData.est_data });
       //IO-539 Check for Parts Rate on PAL for SGI use case.
       await CheckTaxRates(supp, bodyshop);
+      await ResolveCCCLineIssues(supp, bodyshop);
 
       delete supp.owner;
       delete supp.vehicle;
@@ -379,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
@@ -410,115 +441,158 @@ 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(
-      `ImEX 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(
-      `ImEX 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(
-      `ImEX 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(
-      `ImEX 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.
-  //if (bodyshop.region_config === "CA_SK") {
-  estData.joblines.data.forEach((jl, index) => {
-    if (
-      (jl.part_type === "PASL" || jl.part_type === "PAS") &&
-      jl.lbr_op !== "OP11"
-    ) {
-      estData.joblines.data[index].tax_part = jl.lbr_tax;
-    }
+  if (bodyshop.region_config === "CA_SK") {
+    estData.joblines.data.forEach((jl, index) => {
+      if (
+        (jl.part_type === "PASL" || jl.part_type === "PAS") &&
+        jl.lbr_op !== "OP11"
+      ) {
+        estData.joblines.data[index].tax_part = jl.lbr_tax;
+      }
 
-    //Set markup lines and tax lines as taxable.
-    //900510 is a mark up. 900510 is a discount.
-    if (jl.db_ref === "900510") {
-      estData.joblines.data[index].tax_part = true;
+      //Set markup lines and tax lines as taxable.
+      //900510 is a mark up. 900510 is a discount.
+      if (jl.db_ref === "900510") {
+        estData.joblines.data[index].tax_part = true;
+      }
+    });
+  }
+}
+
+async function ResolveCCCLineIssues(estData, bodyshop) {
+  //Find all misc amounts, populate them to the act price.
+  //TODO Ensure that this doesnt get violated
+  //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.act_price + line.misc_amt;
+      line.tax_part = !!line.misc_tax;
     }
   });
-  //}
+
+  //Generate the list of duplicated UNQ_SEQ that will feed into the next section to scrub the lines.
+  const unqSeqHash = _.groupBy(estData.joblines.data, "unq_seq");
+  const duplicatedUnqSeq = Object.keys(unqSeqHash).filter(
+    (key) => unqSeqHash[key].length > 1
+  );
+
+  duplicatedUnqSeq.forEach((unq_seq) => {
+    //Keys are strings, convert to int.
+    const int_unq_seq = parseInt(unq_seq);
+
+    //When line splitting, the first line is always the non-refinish line. We will keep it as is.
+    //We will cleanse the second line, which is always the next line.
+    const nonRefLineIndex = estData.joblines.data.findIndex(
+      (line) => line.unq_seq === int_unq_seq
+    );
+    estData.joblines.data[nonRefLineIndex + 1] = {
+      ...estData.joblines.data[nonRefLineIndex + 1],
+      part_type: null,
+      act_price: 0,
+      db_price: 0,
+      prt_dsmk_p: 0,
+      prt_dsmk_m: 0,
+    };
+  });
 }

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-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

@@ -48,6 +48,8 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setModalContext({ context: context, modal: "jobCosting" })),
   setTimeTicketContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "timeTicket" })),
+  setTimeTicketTaskContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "timeTicketTask" })),
   setCardPaymentContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "cardPayment" })),
 });
@@ -63,6 +65,7 @@ export function JobsDetailHeaderActions({
   setJobCostingContext,
   jobRO,
   setTimeTicketContext,
+  setTimeTicketTaskContext,
   setCardPaymentContext,
 }) {
   const { t } = useTranslation();
@@ -257,6 +260,24 @@ export function JobsDetailHeaderActions({
       >
         {t("timetickets.actions.enter")}
       </Menu.Item>
+      {bodyshop.md_tasks_presets.enable_tasks && (
+        <Menu.Item
+          key="claimtimetickettasks"
+          disabled={
+            !job.converted ||
+            (!bodyshop.tt_allow_post_to_invoiced && job.date_invoiced)
+          }
+          onClick={() => {
+            setTimeTicketTaskContext({
+              actions: {},
+              context: { jobid: job.id },
+            });
+          }}
+        >
+          {t("timetickets.actions.claimtasks")}
+        </Menu.Item>
+      )}
+
       <Menu.Item
         key="enterpayments"
         disabled={!job.converted}

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

@@ -5,9 +5,13 @@ import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import LaborAllocationsTableComponent from "../labor-allocations-table/labor-allocations-table.component";
 import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
+import PayrollLaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.payroll.component";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
+  bodyshop: selectBodyshop,
 });
 
 export default connect(mapStateToProps, null)(JobsDetailLaborContainer);
@@ -48,6 +52,7 @@ const adjSpan = {
 };
 
 export function JobsDetailLaborContainer({
+  bodyshop,
   jobRO,
   job,
   jobId,
@@ -58,6 +63,12 @@ export function JobsDetailLaborContainer({
   techConsole,
   adjustments,
 }) {
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
+
   return (
     <Row gutter={[16, 16]}>
       <Col {...ticketSpan}>
@@ -70,14 +81,28 @@ export function JobsDetailLaborContainer({
           jobId={jobId}
         />
       </Col>
-      <Col {...adjSpan}>
-        <LaborAllocationsTableComponent
-          jobId={jobId}
-          joblines={joblines}
-          timetickets={timetickets}
-          adjustments={adjustments}
-        />
-      </Col>
+
+      {Enhanced_Payroll.treatment === "on" ? (
+        <Col {...adjSpan}>
+          <PayrollLaborAllocationsTable
+            jobId={jobId}
+            joblines={joblines}
+            timetickets={timetickets}
+            refetch={refetch}
+            adjustments={adjustments}
+          />
+        </Col>
+      ) : (
+        <Col {...adjSpan}>
+          <LaborAllocationsTableComponent
+            jobId={jobId}
+            joblines={joblines}
+            timetickets={timetickets}
+            refetch={refetch}
+            adjustments={adjustments}
+          />
+        </Col>
+      )}
     </Row>
   );
 }

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

@@ -6,12 +6,14 @@ import BillsListTable from "../bills-list-table/bills-list-table.component";
 import JobBillsTotal from "../job-bills-total/job-bills-total.component";
 import PartsOrderListTableComponent from "../parts-order-list-table/parts-order-list-table.component";
 import PartsOrderModal from "../parts-order-modal/parts-order-modal.container";
+import PartsDispatchTable from "../parts-dispatch-table/parts-dispatch-table.component";
 
 export default function JobsDetailPliComponent({
   job,
   billsQuery,
   handleBillOnRowClick,
   handlePartsOrderOnRowClick,
+  handlePartsDispatchOnRowClick,
 }) {
   return (
     <div>
@@ -43,6 +45,13 @@ export default function JobsDetailPliComponent({
             billsQuery={billsQuery}
           />
         </Col>
+        <Col span={24}>
+          <PartsDispatchTable
+            job={job}
+            handleOnRowClick={handlePartsDispatchOnRowClick}
+            billsQuery={billsQuery}
+          />
+        </Col>
       </Row>
     </div>
   );

client/src/components/jobs-detail-pli/jobs-detail-pli.container.jsx

@@ -39,12 +39,24 @@ export default function JobsDetailPliContainer({ job }) {
     }
   };
 
+  const handlePartsDispatchOnRowClick = (record) => {
+    if (record) {
+      if (record.id) {
+        search.partsdispatchid = record.id;
+        history.push({ search: queryString.stringify(search) });
+      }
+    } else {
+      delete search.partsdispatchid;
+      history.push({ search: queryString.stringify(search) });
+    }
+  };
   return (
     <JobsDetailPliComponent
       job={job}
       billsQuery={billsQuery}
       handleBillOnRowClick={handleBillOnRowClick}
       handlePartsOrderOnRowClick={handlePartsOrderOnRowClick}
+      handlePartsDispatchOnRowClick={handlePartsDispatchOnRowClick}
     />
   );
 }

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

@@ -29,7 +29,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAA", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -42,7 +42,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "PAA", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -68,18 +68,58 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} 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
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAC", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -92,7 +132,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "PAC", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -118,18 +158,58 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} 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
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAL", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -142,7 +222,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "PAL", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -168,18 +248,58 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} 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
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAG", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -192,7 +312,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "PAG", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -218,18 +338,58 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} 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
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAM", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -242,7 +402,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "PAM", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -268,18 +428,58 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} 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
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAN", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -292,7 +492,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "PAN", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -318,18 +518,58 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} 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
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAO", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -342,7 +582,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "PAO", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -368,18 +608,58 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} 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
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAP", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -392,7 +672,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "PAP", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -418,18 +698,58 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} 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
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAR", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -442,7 +762,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "PAR", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -468,18 +788,58 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} 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
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAS", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -492,7 +852,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "PAS", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -518,18 +878,58 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} 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
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PASL", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -542,7 +942,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "PASL", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -568,18 +968,58 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} 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
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "CCDR", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -592,7 +1032,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "CCDR", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -605,7 +1045,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
             name={["parts_tax_rates", "CCDR", "prt_tax_rt"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.CCF")}>
@@ -613,7 +1053,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "CCF", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -626,7 +1066,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "CCF", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -639,7 +1079,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
             name={["parts_tax_rates", "CCF", "prt_tax_rt"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.CCM")}>
@@ -647,7 +1087,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "CCM", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -660,7 +1100,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "CCM", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -673,7 +1113,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
             name={["parts_tax_rates", "CCM", "prt_tax_rt"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.CCC")}>
@@ -681,7 +1121,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "CCC", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -694,7 +1134,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "CCC", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -707,7 +1147,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
             name={["parts_tax_rates", "CCC", "prt_tax_rt"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.CCD")}>
@@ -715,7 +1155,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "CCD", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -728,7 +1168,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "CCD", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -741,39 +1181,39 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
             name={["parts_tax_rates", "CCD", "prt_tax_rt"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow>
           <Form.Item label={t("jobs.fields.tax_tow_rt")} name="tax_tow_rt">
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item label={t("jobs.fields.tax_str_rt")} name="tax_str_rt">
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.tax_paint_mat_rt")}
             name="tax_paint_mat_rt"
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.tax_shop_mat_rt")}
             name="tax_shop_mat_rt"
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item label={t("jobs.fields.tax_sub_rt")} name="tax_sub_rt">
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item label={t("jobs.fields.tax_lbr_rt")} name="tax_lbr_rt">
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.tax_levies_rt")}
             name="tax_levies_rt"
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
         </LayoutFormRow>
       </Collapse.Panel>

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

@@ -0,0 +1,333 @@
+import {
+  Button,
+  Card,
+  Col,
+  Row,
+  Space,
+  Table,
+  Typography,
+  notification,
+} from "antd";
+import { SyncOutlined } from "@ant-design/icons";
+import axios from "axios";
+import _ from "lodash";
+import React, { useEffect, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import "./labor-allocations-table.styles.scss";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  technician: selectTechnician,
+});
+
+export function PayrollLaborAllocationsTable({
+  jobId,
+  joblines,
+  timetickets,
+  bodyshop,
+  adjustments,
+  technician,
+  refetch,
+}) {
+  const { t } = useTranslation();
+  const [totals, setTotals] = useState([]);
+  const [state, setState] = useState({
+    sortedInfo: {
+      columnKey: "cost_center",
+      field: "cost_center",
+      order: "ascend",
+    },
+    filteredInfo: {},
+  });
+
+  useEffect(() => {
+    async function CalculateTotals() {
+      const { data } = await axios.post("/payroll/calculatelabor", {
+        jobid: jobId,
+      });
+      setTotals(data);
+    }
+
+    if (!!joblines && !!timetickets && !!bodyshop) {
+      CalculateTotals();
+    }
+    if (!jobId) setTotals([]);
+  }, [joblines, timetickets, bodyshop, adjustments, jobId]);
+
+  const convertedLines = useMemo(
+    () => joblines && joblines.filter((j) => j.convertedtolbr),
+    [joblines]
+  );
+
+  const columns = [
+    {
+      title: t("timetickets.fields.employee"),
+      dataIndex: "employeeid",
+      key: "employeeid",
+      render: (text, record) => {
+        if (record.employeeid === undefined) {
+          return (
+            <span style={{ color: "tomato", fontWeight: "bolder" }}>
+              {t("timetickets.labels.unassigned")}
+            </span>
+          );
+        }
+        const emp = bodyshop.employees.find((e) => e.id === record.employeeid);
+        return `${emp?.first_name} ${emp?.last_name}`;
+      },
+    },
+    {
+      title: t("joblines.fields.mod_lbr_ty"),
+      dataIndex: "mod_lbr_ty",
+      key: "mod_lbr_ty",
+      render: (text, record) =>
+        record.employeeid === undefined ? (
+          <span style={{ color: "tomato", fontWeight: "bolder" }}>
+            {t("timetickets.labels.unassigned")}
+          </span>
+        ) : (
+          t(`joblines.fields.lbr_types.${record.mod_lbr_ty?.toUpperCase()}`)
+        ),
+    },
+    // {
+    //   title: t("timetickets.fields.rate"),
+    //   dataIndex: "rate",
+    //   key: "rate",
+    // },
+    {
+      title: t("jobs.labels.hrs_total"),
+      dataIndex: "expectedHours",
+      key: "expectedHours",
+      sorter: (a, b) => a.expectedHours - b.expectedHours,
+      sortOrder:
+        state.sortedInfo.columnKey === "expectedHours" &&
+        state.sortedInfo.order,
+      render: (text, record) => record.expectedHours.toFixed(5),
+    },
+    {
+      title: t("jobs.labels.hrs_claimed"),
+      dataIndex: "claimedHours",
+      key: "claimedHours",
+      sorter: (a, b) => a.claimedHours - b.claimedHours,
+      sortOrder:
+        state.sortedInfo.columnKey === "claimedHours" && state.sortedInfo.order,
+      render: (text, record) =>
+        record.claimedHours && record.claimedHours.toFixed(5),
+    },
+    {
+      title: t("jobs.labels.difference"),
+      dataIndex: "difference",
+
+      key: "difference",
+      sorter: (a, b) => a.difference - b.difference,
+      sortOrder:
+        state.sortedInfo.columnKey === "difference" && state.sortedInfo.order,
+      render: (text, record) => {
+        const difference = _.round(
+          record.expectedHours - record.claimedHours,
+          5
+        );
+
+        return (
+          <strong
+            style={{
+              color: difference >= 0 ? "green" : "red",
+            }}
+          >
+            {difference}
+          </strong>
+        );
+      },
+    },
+  ];
+  const convertedTableCols = [
+    {
+      title: t("joblines.fields.line_desc"),
+      dataIndex: "line_desc",
+      key: "line_desc",
+      ellipsis: true,
+    },
+    {
+      title: t("joblines.fields.op_code_desc"),
+      dataIndex: "op_code_desc",
+      key: "op_code_desc",
+      ellipsis: true,
+      render: (text, record) =>
+        `${record.op_code_desc || ""}${
+          record.alt_partm ? ` ${record.alt_partm}` : ""
+        }`,
+    },
+
+    {
+      title: t("joblines.fields.act_price"),
+      dataIndex: "act_price",
+      key: "act_price",
+      ellipsis: true,
+      render: (text, record) => (
+        <>
+          <CurrencyFormatter>
+            {record.db_ref === "900510" || record.db_ref === "900511"
+              ? record.prt_dsmk_m
+              : record.act_price}
+          </CurrencyFormatter>
+          {record.prt_dsmk_p && record.prt_dsmk_p !== 0 ? (
+            <span
+              style={{ marginLeft: ".2rem" }}
+            >{`(${record.prt_dsmk_p}%)`}</span>
+          ) : (
+            <></>
+          )}
+        </>
+      ),
+    },
+    {
+      title: t("joblines.fields.part_qty"),
+      dataIndex: "part_qty",
+      key: "part_qty",
+    },
+    {
+      title: t("joblines.fields.mod_lbr_ty"),
+      dataIndex: "conv_mod_lbr_ty",
+      key: "conv_mod_lbr_ty",
+      render: (text, record) =>
+        record.convertedtolbr_data && record.convertedtolbr_data.mod_lbr_ty,
+    },
+    {
+      title: t("joblines.fields.mod_lb_hrs"),
+      dataIndex: "conv_mod_lb_hrs",
+      key: "conv_mod_lb_hrs",
+      render: (text, record) =>
+        record.convertedtolbr_data &&
+        record.convertedtolbr_data.mod_lb_hrs &&
+        record.convertedtolbr_data.mod_lb_hrs.toFixed(5),
+    },
+  ];
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  };
+
+  const summary =
+    totals &&
+    totals.reduce(
+      (acc, val) => {
+        acc.hrs_total += val.expectedHours;
+        acc.hrs_claimed += val.claimedHours;
+        // acc.adjustments += val.adjustments;
+        acc.difference += val.expectedHours - val.claimedHours;
+        return acc;
+      },
+      { hrs_total: 0, hrs_claimed: 0, adjustments: 0, difference: 0 }
+    );
+
+  return (
+    <Row gutter={[16, 16]}>
+      <Col span={24}>
+        <Card
+          title={t("jobs.labels.laborallocations")}
+          extra={
+            <Space>
+              <Button
+                onClick={async () => {
+                  const response = await axios.post("/payroll/payall", {
+                    jobid: jobId,
+                  });
+
+                  if (response.status === 200) {
+                    if (response.data.success !== false) {
+                      notification.open({
+                        type: "success",
+                        message: t("timetickets.successes.payall"),
+                      });
+                    } else {
+                      notification.open({
+                        type: "error",
+                        message: t("timetickets.errors.payall", {
+                          error: response.data.error,
+                        }),
+                      });
+                    }
+
+                    if (refetch) refetch();
+                  } else {
+                    notification.open({
+                      type: "error",
+                      message: t("timetickets.errors.payall", {
+                        error: JSON.stringify(""),
+                      }),
+                    });
+                  }
+                }}
+              >
+                {t("timetickets.actions.payall")}
+              </Button>
+              <Button
+                onClick={async () => {
+                  const { data } = await axios.post("/payroll/calculatelabor", {
+                    jobid: jobId,
+                  });
+                  setTotals(data);
+                  refetch();
+                }}
+              >
+                <SyncOutlined />
+              </Button>
+            </Space>
+          }
+        >
+          <Table
+            columns={columns}
+            rowKey={(record) => `${record.employeeid} ${record.mod_lbr_ty}`}
+            pagination={false}
+            onChange={handleTableChange}
+            dataSource={totals}
+            scroll={{
+              x: true,
+            }}
+            summary={() => (
+              <Table.Summary.Row>
+                <Table.Summary.Cell>
+                  <Typography.Title level={4}>
+                    {t("general.labels.totals")}
+                  </Typography.Title>
+                </Table.Summary.Cell>
+                <Table.Summary.Cell></Table.Summary.Cell>
+                <Table.Summary.Cell>
+                  {summary.hrs_total.toFixed(5)}
+                </Table.Summary.Cell>
+                <Table.Summary.Cell>
+                  {summary.hrs_claimed.toFixed(5)}
+                </Table.Summary.Cell>
+
+                <Table.Summary.Cell>
+                  {summary.difference.toFixed(5)}
+                </Table.Summary.Cell>
+              </Table.Summary.Row>
+            )}
+          />
+        </Card>
+      </Col>
+      {convertedLines && convertedLines.length > 0 && (
+        <Col span={24}>
+          <Card title={t("jobs.labels.convertedtolabor")}>
+            <Table
+              columns={convertedTableCols}
+              rowKey="id"
+              pagination={false}
+              dataSource={convertedLines}
+              scroll={{
+                x: true,
+              }}
+            />
+          </Card>
+        </Col>
+      )}
+    </Row>
+  );
+}
+export default connect(mapStateToProps, null)(PayrollLaborAllocationsTable);

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

@@ -0,0 +1,81 @@
+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 = [
+    {
+      title: t("joblines.fields.part_qty"),
+      dataIndex: "quantity",
+      key: "quantity",
+      width: "10%",
+      //sorter: (a, b) => alphaSort(a.number, b.number),
+    },
+    {
+      title: t("joblines.fields.line_desc"),
+      dataIndex: "joblineid",
+      key: "joblineid",
+      //sorter: (a, b) => alphaSort(a.number, b.number),
+      render: (text, record) => record.jobline.line_desc,
+    },
+    {
+      title: t("parts_dispatch_lines.fields.accepted_at"),
+      dataIndex: "accepted_at",
+      key: "accepted_at",
+      width: "20%",
+
+      //sorter: (a, b) => alphaSort(a.number, b.number),
+      render: (text, record) =>
+        record.accepted_at ? (
+          <DateTimeFormatter>{record.accepted_at}</DateTimeFormatter>
+        ) : (
+          <Button
+            onClick={() => handleAccept({ partsDispatchLineId: record.id })}
+          >
+            {t("parts_dispatch.actions.accept")}
+          </Button>
+        ),
+    },
+  ];
+  return (
+    <Card>
+      <Row gutter={[16, 16]}>
+        <Col span={24}>
+          <Table
+            rowKey={"id"}
+            dataSource={dispatch.parts_dispatch_lines}
+            columns={columns}
+          />
+        </Col>
+      </Row>
+    </Card>
+  );
+}

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

@@ -0,0 +1,155 @@
+import {
+  MinusCircleTwoTone,
+  PlusCircleTwoTone,
+  SyncOutlined,
+} from "@ant-design/icons";
+import { Button, Card, Input, Space, Table } from "antd";
+import React, { 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 { selectBodyshop } from "../../redux/user/user.selectors";
+import { TemplateList } from "../../utils/TemplateConstants";
+import { alphaSort } from "../../utils/sorters";
+import PartsDispatchExpander from "../parts-dispatch-expander/parts-dispatch-expander.component";
+import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
+
+const mapStateToProps = createStructuredSelector({
+  jobRO: selectJobReadOnly,
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({});
+
+export function PartDispatchTableComponent({
+  bodyshop,
+  jobRO,
+  job,
+  billsQuery,
+  handleOnRowClick,
+}) {
+  const { t } = useTranslation();
+
+  const [state, setState] = useState({
+    sortedInfo: {},
+  });
+  // const search = queryString.parse(useLocation().search);
+  // const selectedBill = search.billid;
+  const [searchText, setSearchText] = useState("");
+
+  const Templates = TemplateList("job_special");
+
+  const { refetch } = billsQuery;
+
+  const recordActions = (record) => (
+    <Space wrap>
+      <PrintWrapperComponent
+        templateObject={{
+          name: Templates.parts_dispatch.key,
+          variables: { id: record.id },
+        }}
+      />
+    </Space>
+  );
+  const columns = [
+    {
+      title: t("parts_dispatch.fields.number"),
+      dataIndex: "number",
+      key: "number",
+      sorter: (a, b) => alphaSort(a.number, b.number),
+      width: "10%",
+      sortOrder:
+        state.sortedInfo.columnKey === "number" && state.sortedInfo.order,
+    },
+    {
+      title: t("timetickets.fields.employee"),
+      dataIndex: "employeeid",
+      key: "employeeid",
+      sorter: (a, b) => alphaSort(a.employeeid, b.employeeid),
+      sortOrder:
+        state.sortedInfo.columnKey === "employeeid" && state.sortedInfo.order,
+      render: (text, record) => {
+        const e = bodyshop.employees.find((e) => e.id === record.employeeid);
+        return `${e?.first_name || ""} ${e?.last_name || ""}`.trim();
+      },
+    },
+    {
+      title: t("parts_dispatch.fields.percent_accepted"),
+      dataIndex: "percent_accepted",
+      key: "percent_accepted",
+
+      render: (text, record) =>
+        record.parts_dispatch_lines.length > 0
+          ? `
+              ${(
+                (record.parts_dispatch_lines.filter((l) => l.accepted_at)
+                  .length /
+                  record.parts_dispatch_lines.length) *
+                100
+              ).toFixed(0)}%`
+          : "0%",
+    },
+    {
+      title: t("general.labels.actions"),
+      dataIndex: "actions",
+      key: "actions",
+      width: "10%",
+      render: (text, record) => recordActions(record, true),
+    },
+  ];
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  };
+
+  return (
+    <Card
+      title={t("parts_dispatch.labels.parts_dispatch")}
+      extra={
+        <Space wrap>
+          <Button onClick={() => refetch()}>
+            <SyncOutlined />
+          </Button>
+
+          <Input.Search
+            placeholder={t("general.labels.search")}
+            value={searchText}
+            onChange={(e) => {
+              e.preventDefault();
+              setSearchText(e.target.value);
+            }}
+          />
+        </Space>
+      }
+    >
+      <Table
+        loading={billsQuery.loading}
+        scroll={{
+          x: true, // y: "50rem"
+        }}
+        expandable={{
+          expandedRowRender: (record) => (
+            <PartsDispatchExpander dispatch={record} job={job} />
+          ),
+          rowExpandable: (record) => true,
+
+          expandIcon: ({ expanded, onExpand, record }) =>
+            expanded ? (
+              <MinusCircleTwoTone onClick={(e) => onExpand(record, e)} />
+            ) : (
+              <PlusCircleTwoTone onClick={(e) => onExpand(record, e)} />
+            ),
+        }}
+        columns={columns}
+        rowKey="id"
+        dataSource={billsQuery.data ? billsQuery.data.parts_dispatch : []}
+        onChange={handleTableChange}
+      />
+    </Card>
+  );
+}
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(PartDispatchTableComponent);

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

@@ -1,3 +1,4 @@
+import { useTreatments } from "@splitsoftware/splitio-react";
 import { Card, Col, Input, Row, Space, Typography } from "antd";
 import _ from "lodash";
 import React, { useState } from "react";
@@ -23,8 +24,13 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
   const { id: jobId, job } = printCenterModal.context;
   const tempList = TemplateList("job", {});
   const { t } = useTranslation();
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
 
-  const JobsReportsList =
+  const Templates =
     bodyshop.cdk_dealerid === null && bodyshop.pbs_serialnumber === null
       ? Object.keys(tempList)
           .map((key) => {
@@ -51,7 +57,26 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
                 bodyshop.region_config.includes(Object.keys(temp.regions)) ===
                   true)
           );
-
+  const JobsReportsList =
+    Enhanced_Payroll.treatment === "on"
+      ? Object.keys(Templates)
+          .map((key) => {
+            return Templates[key];
+          })
+          .filter(
+            (temp) =>
+              temp.enhanced_payroll === undefined ||
+              temp.enhanced_payroll === true
+          )
+      : Object.keys(Templates)
+          .map((key) => {
+            return Templates[key];
+          })
+          .filter(
+            (temp) =>
+              temp.enhanced_payroll === undefined ||
+              temp.enhanced_payroll === false
+          );
   const filteredJobsReportsList =
     search !== ""
       ? JobsReportsList.filter((r) =>

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

@@ -9,9 +9,11 @@ export default function PrintWrapperComponent({
   children,
   id,
   emailOnly = false,
+  disabled,
 }) {
   const [loading, setLoading] = useState(false);
   const handlePrint = async (type) => {
+    if (disabled) return;
     setLoading(true);
     await GenerateDocument(templateObject, messageObject, type, id);
     setLoading(false);
@@ -20,8 +22,18 @@ export default function PrintWrapperComponent({
   return (
     <Space>
       {children || null}
-      {!emailOnly && <PrinterFilled onClick={() => handlePrint("p")} />}
-      <MailFilled onClick={() => handlePrint("e")} />
+      {!emailOnly && (
+        <PrinterFilled
+          disabled={disabled}
+          onClick={() => handlePrint("p")}
+          style={{ cursor: disabled ? "not-allowed" : null }}
+        />
+      )}
+      <MailFilled
+        disabled={disabled}
+        onClick={() => handlePrint("e")}
+        style={{ cursor: disabled ? "not-allowed" : null }}
+      />
       {loading && <Spin />}
     </Space>
   );

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

@@ -24,6 +24,8 @@ import ProductionListColumnNote from "./production-list-columns.productionnote.c
 import ProductionListColumnCategory from "./production-list-columns.status.category";
 import ProductionListColumnStatus from "./production-list-columns.status.component";
 import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
+import { store } from "../../redux/store";
+import { setModalContext } from "../../redux/modals/modals.actions";
 
 const r = ({ technician, state, activeStatuses, bodyshop }) => {
   return [
@@ -38,6 +40,29 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         </Link>
       ),
     },
+    {
+      title: i18n.t("timetickets.actions.claimtasks"),
+      dataIndex: "claimtasks",
+      key: "claimtasks",
+      ellipsis: true,
+      render: (text, record) => (
+        <div
+          onClick={() => {
+            store.dispatch(
+              setModalContext({
+                context: {
+                  actions: {},
+                  context: { jobid: record.id },
+                },
+                modal: "timeTicketTask",
+              })
+            );
+          }}
+        >
+          {i18n.t("timetickets.actions.claimtasks")}
+        </div>
+      ),
+    },
     {
       title: i18n.t("jobs.fields.ro_number"),
       dataIndex: "ro_number",

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

@@ -95,7 +95,7 @@ export function ProductionListDetail({
         />
       }
       placement="right"
-      width={"33%"}
+      width={"50%"}
       onClose={handleClose}
       visible={selected}
     >

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

@@ -1,4 +1,5 @@
 import { useLazyQuery } from "@apollo/client";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import {
   Button,
   Card,
@@ -19,6 +20,7 @@ import { createStructuredSelector } from "reselect";
 import { QUERY_ACTIVE_EMPLOYEES } from "../../graphql/employees.queries";
 import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
 import { selectReportCenter } from "../../redux/modals/modals.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import DatePIckerRanges from "../../utils/DatePickerRanges";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
@@ -27,6 +29,7 @@ import VendorSearchSelect from "../vendor-search-select/vendor-search-select.com
 import "./report-center-modal.styles.scss";
 const mapStateToProps = createStructuredSelector({
   reportCenterModal: selectReportCenter,
+  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -36,16 +39,38 @@ export default connect(
   mapDispatchToProps
 )(ReportCenterModalComponent);
 
-export function ReportCenterModalComponent({ reportCenterModal }) {
+export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
   const [form] = Form.useForm();
   const [search, setSearch] = useState("");
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
 
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const Templates = TemplateList("report_center");
-  const ReportsList = Object.keys(Templates).map((key) => {
-    return Templates[key];
-  });
+  const ReportsList =
+    Enhanced_Payroll.treatment === "on"
+      ? Object.keys(Templates)
+          .map((key) => {
+            return Templates[key];
+          })
+          .filter(
+            (temp) =>
+              temp.enhanced_payroll === undefined ||
+              temp.enhanced_payroll === true
+          )
+      : Object.keys(Templates)
+          .map((key) => {
+            return Templates[key];
+          })
+          .filter(
+            (temp) =>
+              temp.enhanced_payroll === undefined ||
+              temp.enhanced_payroll === false
+          );
   const { visible } = reportCenterModal;
 
   const [callVendorQuery, { data: vendorData, called: vendorCalled }] =

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

@@ -11,7 +11,7 @@ import {
   Switch,
   Table,
 } from "antd";
-import { useForm } from "antd/es/form/Form";
+
 import moment from "moment";
 import querystring from "query-string";
 import React, { useEffect } from "react";
@@ -36,6 +36,7 @@ import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import ShopEmployeeAddVacation from "./shop-employees-add-vacation.component";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -46,7 +47,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ShopEmployeesFormComponent({ bodyshop }) {
   const { t } = useTranslation();
-  const [form] = useForm();
+  const [form] = Form.useForm();
   const history = useHistory();
   const search = querystring.parse(useLocation().search);
   const [deleteVacation] = useMutation(DELETE_VACATION);
@@ -56,7 +57,11 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
   });
-
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
   const client = useApolloClient();
   useEffect(() => {
     if (data && data.employees_by_pk) form.setFieldsValue(data.employees_by_pk);
@@ -362,7 +367,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
                             {t("timetickets.labels.shift")}
                           </Select.Option>
 
-                          {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                          {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
                             ? CiecaSelect(false, true)
                             : bodyshop.md_responsibility_centers.costs.map(
                                 (c) => (

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

@@ -15,6 +15,7 @@ import ShopInfoResponsibilityCenterComponent from "./shop-info.responsibilitycen
 import ShopInfoROStatusComponent from "./shop-info.rostatus.component";
 import ShopInfoSchedulingComponent from "./shop-info.scheduling.component";
 import ShopInfoSpeedPrint from "./shop-info.speedprint.component";
+import ShopInfoTaskPresets from "./shop-info.task-presets.component";
 import { useHistory, useLocation } from "react-router-dom";
 import queryString from "query-string";
 
@@ -96,6 +97,12 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
             <ShopInfoPartsScan form={form} />
           </Tabs.TabPane>
         )}
+        <Tabs.TabPane
+          key="task-presets"
+          tab={t("bodyshop.labels.task-presets")}
+        >
+          <ShopInfoTaskPresets form={form} />
+        </Tabs.TabPane>
       </Tabs>
     </Card>
   );

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

@@ -188,20 +188,22 @@ export function ShopInfoGeneral({ form, bodyshop }) {
           <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"]}
@@ -290,36 +292,34 @@ export function ShopInfoGeneral({ form, bodyshop }) {
         >
           <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"]}

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

@@ -400,6 +400,18 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.employee_teams.page")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "employee_teams:page"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.owners.list")}
           rules={[
@@ -532,6 +544,42 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.timetickets.editcommitted")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "timetickets:editcommitted"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.ttapprovals.view")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "ttapprovals:view"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.ttapprovals.approve")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "ttapprovals:approve"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.shop.vendors")}
           rules={[

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,202 +4350,242 @@ 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="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="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={[
+          {
+            required: true,
+            //message: t("general.validation.required"),
+          },
+        ]}
+        name={["md_responsibility_centers", "taxes", "itemexemptcode"]}
+      >
+        <Input />
+      </Form.Item>
+      <Form.Item
+        label={t("bodyshop.fields.responsibilitycenters.invoiceexemptcode")}
+        rules={[
+          {
+            required: true,
+            //message: t("general.validation.required"),
+          },
+        ]}
+        name={["md_responsibility_centers", "taxes", "invoiceexemptcode"]}
+      >
+        <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 header={<div>AR</div>} id="AR">
         {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.ar")}

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

@@ -0,0 +1,269 @@
+import { DeleteFilled } from "@ant-design/icons";
+import {
+  Button,
+  Checkbox,
+  Col,
+  Form,
+  Input,
+  InputNumber,
+  Row,
+  Select,
+  Space,
+  Switch,
+} from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+
+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
+)(ShopInfoTaskPresets);
+
+export function ShopInfoTaskPresets({ bodyshop, form }) {
+  const { t } = useTranslation();
+
+  return (
+    <>
+      <LayoutFormRow noDivider>
+        <Form.Item
+          label={t("bodyshop.fields.md_tasks_presets.enable_tasks")}
+          valuePropName="checked"
+          name={["md_tasks_presets", "enable_tasks"]}
+        >
+          <Switch />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.md_tasks_presets.use_approvals")}
+          valuePropName="checked"
+          name={["md_tasks_presets", "use_approvals"]}
+        >
+          <Switch />
+        </Form.Item>
+      </LayoutFormRow>
+
+      <LayoutFormRow header={t("bodyshop.labels.md_tasks_presets")}>
+        <Form.List name={["md_tasks_presets", "presets"]}>
+          {(fields, { add, remove, move }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <LayoutFormRow noDivider>
+                      <Form.Item
+                        label={t("bodyshop.fields.md_tasks_presets.name")}
+                        key={`${index}name`}
+                        name={[field.name, "name"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        span={12}
+                        label={t("bodyshop.fields.md_tasks_presets.hourstype")}
+                        key={`${index}hourstype`}
+                        name={[field.name, "hourstype"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Checkbox.Group>
+                          <Row>
+                            <Col span={4}>
+                              <Checkbox
+                                value="LAA"
+                                style={{ lineHeight: "32px" }}
+                              >
+                                {t("joblines.fields.lbr_types.LAA")}
+                              </Checkbox>
+                            </Col>
+                            <Col span={4}>
+                              <Checkbox
+                                value="LAB"
+                                style={{ lineHeight: "32px" }}
+                              >
+                                {t("joblines.fields.lbr_types.LAB")}
+                              </Checkbox>
+                            </Col>
+                            <Col span={4}>
+                              <Checkbox
+                                value="LAD"
+                                style={{ lineHeight: "32px" }}
+                              >
+                                {t("joblines.fields.lbr_types.LAD")}
+                              </Checkbox>
+                            </Col>
+                            <Col span={4}>
+                              <Checkbox
+                                value="LAE"
+                                style={{ lineHeight: "32px" }}
+                              >
+                                {t("joblines.fields.lbr_types.LAE")}
+                              </Checkbox>
+                            </Col>
+                            <Col span={4}>
+                              <Checkbox
+                                value="LAF"
+                                style={{ lineHeight: "32px" }}
+                              >
+                                {t("joblines.fields.lbr_types.LAF")}
+                              </Checkbox>
+                            </Col>
+                            <Col span={4}>
+                              <Checkbox
+                                value="LAG"
+                                style={{ lineHeight: "32px" }}
+                              >
+                                {t("joblines.fields.lbr_types.LAG")}
+                              </Checkbox>
+                            </Col>
+                            <Col span={4}>
+                              <Checkbox
+                                value="LAM"
+                                style={{ lineHeight: "32px" }}
+                              >
+                                {t("joblines.fields.lbr_types.LAM")}
+                              </Checkbox>
+                            </Col>
+                            <Col span={4}>
+                              <Checkbox
+                                value="LAR"
+                                style={{ lineHeight: "32px" }}
+                              >
+                                {t("joblines.fields.lbr_types.LAR")}
+                              </Checkbox>
+                            </Col>
+                            <Col span={4}>
+                              <Checkbox
+                                value="LAS"
+                                style={{ lineHeight: "32px" }}
+                              >
+                                {t("joblines.fields.lbr_types.LAS")}
+                              </Checkbox>
+                            </Col>
+                            <Col span={4}>
+                              <Checkbox
+                                value="LAU"
+                                style={{ lineHeight: "32px" }}
+                              >
+                                {t("joblines.fields.lbr_types.LAU")}
+                              </Checkbox>
+                            </Col>
+                            <Col span={4}>
+                              <Checkbox
+                                value="LA1"
+                                style={{ lineHeight: "32px" }}
+                              >
+                                {t("joblines.fields.lbr_types.LA1")}
+                              </Checkbox>
+                            </Col>
+                            <Col span={4}>
+                              <Checkbox
+                                value="LA2"
+                                style={{ lineHeight: "32px" }}
+                              >
+                                {t("joblines.fields.lbr_types.LA2")}
+                              </Checkbox>
+                            </Col>
+                            <Col span={4}>
+                              <Checkbox
+                                value="LA3"
+                                style={{ lineHeight: "32px" }}
+                              >
+                                {t("joblines.fields.lbr_types.LA3")}
+                              </Checkbox>
+                            </Col>
+                            <Col span={4}>
+                              <Checkbox
+                                value="LA4"
+                                style={{ lineHeight: "32px" }}
+                              >
+                                {t("joblines.fields.lbr_types.LA4")}
+                              </Checkbox>
+                            </Col>
+                          </Row>
+                        </Checkbox.Group>
+                      </Form.Item>
+                      <Form.Item
+                        label={t("bodyshop.fields.md_tasks_presets.percent")}
+                        key={`${index}percent`}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                        name={[field.name, "percent"]}
+                      >
+                        <InputNumber min={0} max={100} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("bodyshop.fields.md_tasks_presets.memo")}
+                        key={`${index}memo`}
+                        name={[field.name, "memo"]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("bodyshop.fields.md_tasks_presets.nextstatus")}
+                        key={`${index}nextstatus`}
+                        name={[field.name, "nextstatus"]}
+                      >
+                        <Select
+                          options={bodyshop.md_ro_statuses.production_statuses.map(
+                            (o) => ({ value: o, label: o })
+                          )}
+                        />
+                      </Form.Item>
+                      <Space wrap>
+                        <DeleteFilled
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows
+                          move={move}
+                          index={index}
+                          total={fields.length}
+                        />
+                      </Space>
+                    </LayoutFormRow>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    onClick={() => {
+                      add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("bodyshop.actions.add_task_preset")}
+                  </Button>
+                </Form.Item>
+              </div>
+            );
+          }}
+        </Form.List>
+      </LayoutFormRow>
+    </>
+  );
+}

client/src/components/shop-teams/shop-employee-teams-member.component.jsx

@@ -0,0 +1,7 @@
+import React from 'react'
+
+export default function ShopEmployeeTeamMember({teamMember}) {
+  return (
+    <div>ShopEmployeeTeamMember</div>
+  )
+}

client/src/components/shop-teams/shop-employee-teams.form.component.jsx

@@ -0,0 +1,424 @@
+import { DeleteFilled } from "@ant-design/icons";
+import { useMutation, useQuery } from "@apollo/client";
+import {
+  Button,
+  Space,
+  Card,
+  Form,
+  Input,
+  InputNumber,
+  Switch,
+  notification,
+} from "antd";
+
+import querystring from "query-string";
+import React, { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import AlertComponent from "../alert/alert.component";
+import CurrencyInput from "../form-items-formatted/currency-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 {
+  INSERT_EMPLOYEE_TEAM,
+  QUERY_EMPLOYEE_TEAM_BY_ID,
+  UPDATE_EMPLOYEE_TEAM,
+} from "../../graphql/employee_teams.queries";
+import EmployeeSearchSelectComponent from "../employee-search-select/employee-search-select.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
+  const { t } = useTranslation();
+  const [form] = Form.useForm();
+  const history = useHistory();
+  const search = querystring.parse(useLocation().search);
+
+  const { error, data } = useQuery(QUERY_EMPLOYEE_TEAM_BY_ID, {
+    variables: { id: search.employeeTeamId },
+    skip: !search.employeeTeamId || search.employeeTeamId === "new",
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+  });
+
+  useEffect(() => {
+    if (data && data.employee_teams_by_pk)
+      form.setFieldsValue(data.employee_teams_by_pk);
+    else {
+      form.resetFields();
+    }
+  }, [form, data, search.employeeTeamId]);
+
+  const [updateEmployeeTeam] = useMutation(UPDATE_EMPLOYEE_TEAM);
+  const [insertEmployeeTeam] = useMutation(INSERT_EMPLOYEE_TEAM);
+
+  const handleFinish = async ({ employee_team_members, ...values }) => {
+    if (search.employeeTeamId && search.employeeTeamId !== "new") {
+      //Update a record.
+      logImEXEvent("shop_employee_update");
+
+      const result = await updateEmployeeTeam({
+        variables: {
+          employeeTeamId: search.employeeTeamId,
+          employeeTeam: values,
+          teamMemberUpdates: employee_team_members
+            .filter((e) => e.id)
+            .map((e) => {
+              delete e.__typename;
+              return { where: { id: { _eq: e.id } }, _set: e };
+            }),
+          teamMemberInserts: employee_team_members
+            .filter((e) => e.id === null || e.id === undefined)
+            .map((e) => ({ ...e, teamid: search.employeeTeamId })),
+          teamMemberDeletes:
+            data.employee_teams_by_pk.employee_team_members.filter(
+              (e) => !employee_team_members.find((etm) => etm.id === e.id)
+            ),
+        },
+      });
+      if (!result.errors) {
+        notification["success"]({
+          message: t("employees.successes.save"),
+        });
+      } else {
+        notification["error"]({
+          message: t("employees.errors.save", {
+            message: JSON.stringify(error),
+          }),
+        });
+      }
+    } else {
+      //New record, insert it.
+      logImEXEvent("shop_employee_insert");
+
+      insertEmployeeTeam({
+        variables: {
+          employeeTeam: {
+            ...values,
+            employee_team_members: { data: employee_team_members },
+            bodyshopid: bodyshop.id,
+          },
+        },
+        refetchQueries: ["QUERY_TEAMS"],
+      }).then((r) => {
+        search.employeeTeamId = r.data.insert_employee_teams_one.id;
+        history.push({ search: querystring.stringify(search) });
+        notification["success"]({
+          message: t("employees.successes.save"),
+        });
+      });
+    }
+  };
+
+  if (!search.employeeTeamId) return null;
+  if (error) return <AlertComponent message={error.message} type="error" />;
+
+  return (
+    <Card
+      extra={
+        <Button type="primary" onClick={() => form.submit()}>
+          {t("general.actions.save")}
+        </Button>
+      }
+    >
+      <Form
+        onFinish={handleFinish}
+        autoComplete={"off"}
+        layout="vertical"
+        form={form}
+      >
+        <LayoutFormRow>
+          <Form.Item
+            name="name"
+            label={t("employee_teams.fields.name")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label={t("employee_teams.fields.active")}
+            name="active"
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+        </LayoutFormRow>
+        <Form.List name={["employee_team_members"]}>
+          {(fields, { add, remove, move }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key} style={{ padding: 0, margin: 2 }}>
+                    <Form.Item
+                      label={t("employees.fields.id")}
+                      key={`${index}`}
+                      name={[field.name, "id"]}
+                      hidden
+                    >
+                      <Input />
+                    </Form.Item>
+                    <LayoutFormRow grow>
+                      <Form.Item
+                        label={t("employee_teams.fields.employeeid")}
+                        key={`${index}`}
+                        name={[field.name, "employeeid"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <EmployeeSearchSelectComponent
+                          options={bodyshop.employees}
+                        />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("employee_teams.fields.percentage")}
+                        key={`${index}`}
+                        name={[field.name, "percentage"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <InputNumber min={0} max={100} precision={2}/>
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAA")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAA"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAB")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAB"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAD")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAD"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAE")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAE"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAF")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAF"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAG")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAG"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAM")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAM"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAR")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAR"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAS")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAS"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAU")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAU"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LA1")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LA1"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LA2")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LA2"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LA3")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LA3"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LA4")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LA4"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Space align="center">
+                        <DeleteFilled
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows
+                          move={move}
+                          index={index}
+                          total={fields.length}
+                        />
+                      </Space>
+                    </LayoutFormRow>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    onClick={() => {
+                      add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("employee_teams.actions.newmember")}
+                  </Button>
+                </Form.Item>
+              </div>
+            );
+          }}
+        </Form.List>
+      </Form>
+    </Card>
+  );
+}
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ShopEmployeeTeamsFormComponent);

client/src/components/shop-teams/shop-employee-teams.list.jsx

@@ -0,0 +1,71 @@
+import { Button, Table } from "antd";
+import queryString from "query-string";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { useHistory, useLocation } from "react-router-dom";
+
+export default function ShopEmployeeTeamsListComponent({
+  loading,
+  employee_teams,
+}) {
+  const { t } = useTranslation();
+  const history = useHistory();
+  const search = queryString.parse(useLocation().search);
+
+  const handleOnRowClick = (record) => {
+    if (record) {
+      search.employeeTeamId = record.id;
+      history.push({ search: queryString.stringify(search) });
+    } else {
+      delete search.employeeTeamId;
+      history.push({ search: queryString.stringify(search) });
+    }
+  };
+  const columns = [
+    {
+      title: t("employee_teams.fields.name"),
+      dataIndex: "name",
+      key: "name",
+    },
+  ];
+
+  return (
+    <div>
+      <Table
+        title={() => {
+          return (
+            <Button
+              type="primary"
+              onClick={() => {
+                search.employeeTeamId = "new";
+                history.push({ search: queryString.stringify(search) });
+              }}
+            >
+              {t("employee_teams.actions.new")}
+            </Button>
+          );
+        }}
+        loading={loading}
+        pagination={{ position: "top" }}
+        columns={columns}
+        rowKey="id"
+        dataSource={employee_teams}
+        rowSelection={{
+          onSelect: (props) => {
+            search.employeeTeamId = props.id;
+            history.push({ search: queryString.stringify(search) });
+          },
+          type: "radio",
+          selectedRowKeys: [search.employeeTeamId],
+        }}
+        onRow={(record, rowIndex) => {
+          return {
+            onClick: (event) => {
+              handleOnRowClick(record);
+            },
+          };
+        }}
+      />
+    </div>
+  );
+}

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

@@ -0,0 +1,43 @@
+import { useQuery } from "@apollo/client";
+import React from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { QUERY_TEAMS } from "../../graphql/employee_teams.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import AlertComponent from "../alert/alert.component";
+import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
+import ShopEmployeeTeamsListComponent from "./shop-employee-teams.list";
+import ShopEmployeeTeamsFormComponent from "./shop-employee-teams.form.component";
+import { Col, Row } from "antd";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+function ShopTeamsContainer({ bodyshop }) {
+  const { loading, error, data } = useQuery(QUERY_TEAMS, {
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+  });
+
+  if (error) return <AlertComponent message={error.message} type="error" />;
+
+  return (
+    <div>
+      <RbacWrapper action="employee_teams:page">
+        <Row gutter={[16, 16]}>
+          <Col span={6}>
+            <ShopEmployeeTeamsListComponent
+              employee_teams={data ? data.employee_teams : []}
+              loading={loading}
+            />
+          </Col>
+          <Col span={18}>
+            <ShopEmployeeTeamsFormComponent />
+          </Col>
+        </Row>
+      </RbacWrapper>
+    </div>
+  );
+}
+export default connect(mapStateToProps, null)(ShopTeamsContainer);

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 ImEXOnlineLogo from "../../assets/logo192.png";
+import RomeLogo from "../../assets/RomeOnlineBlue.png";
 import {
   emailSignInStart,
   sendPasswordReset,
@@ -53,8 +53,7 @@ export function SignInComponent({
   return (
     <div className="login-container">
       <div className="login-logo-container">
-        <img src={ImEXOnlineLogo} height="100" width="100" alt="ImEX Online" />
-        <Typography.Title>{t("titles.app")}</Typography.Title>
+        <img src={RomeLogo} width={200} alt="Rome Online" />
       </div>
       <Form onFinish={handleFinish} form={form} size="large">
         <Form.Item

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

@@ -8,6 +8,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import JobSearchSelect from "../job-search-select/job-search-select.component";
 import JobsDetailLaborContainer from "../jobs-detail-labor/jobs-detail-labor.container";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -16,6 +17,11 @@ const mapStateToProps = createStructuredSelector({
 
 export function TechClockInComponent({ form, bodyshop, technician }) {
   const { t } = useTranslation();
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
   const emps = bodyshop.employees.filter((e) => e.id === technician.id)[0];
   return (
     <div>
@@ -53,7 +59,7 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
                 <Select.Option key={item.cost_center} value={item.cost_center}>
                   {item.cost_center === "timetickets.labels.shift"
                     ? t(item.cost_center)
-                    : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                    : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
                     ? t(
                         `joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`
                       )

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

@@ -16,6 +16,7 @@ import {
 } 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,
@@ -32,9 +33,10 @@ export function TechClockInContainer({
   bodyshop,
   currentUser,
 }) {
-  console.log(
-    "🚀 ~ file: tech-job-clock-in-form.container.jsx:30 ~ technician:",
-    technician
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
   );
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
@@ -68,7 +70,7 @@ export function TechClockInContainer({
             jobid: values.jobid,
             cost_center: values.cost_center,
             ciecacode:
-              bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+              bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === 'on'
                 ? values.cost_center
                 : Object.keys(
                     bodyshop.md_responsibility_centers.defaults.costs

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

@@ -24,6 +24,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
 import TechJobClockoutDelete from "../tech-job-clock-out-delete/tech-job-clock-out-delete.component";
 import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -43,6 +44,12 @@ export function TechClockOffButton({
   const [updateTimeticket] = useMutation(UPDATE_TIME_TICKET);
   const [updateJobStatus] = useMutation(UPDATE_JOB_STATUS);
   const [form] = Form.useForm();
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
+
   const { queryLoading, data: lineTicketData } = useQuery(
     GET_LINE_TICKET_BY_PK,
     {
@@ -76,7 +83,9 @@ export function TechClockOffButton({
               ?.rate,
           flat_rate: emps && emps.flat_rate,
           ciecacode:
-            bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+            bodyshop.cdk_dealerid ||
+            bodyshop.pbs_serialnumber ||
+            Enhanced_Payroll.treatment === "on"
               ? values.cost_center
               : Object.keys(
                   bodyshop.md_responsibility_centers.defaults.costs

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

@@ -1,4 +1,9 @@
-import Icon, { SearchOutlined, ScheduleOutlined } from "@ant-design/icons";
+import Icon, {
+  SearchOutlined,
+  ScheduleOutlined,
+  UserAddOutlined,
+  CarOutlined,
+} from "@ant-design/icons";
 import { Layout, Menu } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -11,22 +16,38 @@ import { createStructuredSelector } from "reselect";
 import { techLogout } from "../../redux/tech/tech.actions";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { BsKanban } from "react-icons/bs";
+import { useTreatments } from "@splitsoftware/splitio-react";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { setModalContext } from "../../redux/modals/modals.actions";
 
 const { Sider } = Layout;
 
 const mapStateToProps = createStructuredSelector({
   technician: selectTechnician,
+  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
   techLogout: () => dispatch(techLogout()),
+  setTimeTicketTaskContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "timeTicketTask" })),
 });
 
-export function TechSider({ technician, techLogout }) {
+export function TechSider({
+  technician,
+  techLogout,
+  bodyshop,
+  setTimeTicketTaskContext,
+}) {
   const [collapsed, setCollapsed] = useState(true);
   const { t } = useTranslation();
   const onCollapse = (collapsed) => {
     setCollapsed(collapsed);
   };
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
 
   return (
     <Sider
@@ -51,13 +72,38 @@ export function TechSider({ technician, techLogout }) {
         <Menu.Item key="2" disabled={!!!technician} icon={<SearchOutlined />}>
           <Link to={`/tech/joblookup`}>{t("menus.tech.joblookup")}</Link>
         </Menu.Item>
-        <Menu.Item
-          key="3"
-          disabled={!!!technician}
-          icon={<Icon component={FaBusinessTime} />}
-        >
-          <Link to={`/tech/jobclock`}>{t("menus.tech.jobclockin")}</Link>
-        </Menu.Item>
+        {Enhanced_Payroll.treatment === "on" ? (
+          <>
+            <Menu.Item
+              key="TechAssignedProdJobs"
+              disabled={!!!technician}
+              icon={<UserAddOutlined />}
+            >
+              <Link to={`/tech/assigned`}> {t("menus.tech.assignedjobs")}</Link>
+            </Menu.Item>
+            <Menu.Item
+              key="3"
+              disabled={!!!technician}
+              icon={<Icon component={FaBusinessTime} />}
+              onClick={() => {
+                setTimeTicketTaskContext({
+                  actions: {},
+                  context: { jobid: null },
+                });
+              }}
+            >
+              {t("menus.tech.claimtask")}
+            </Menu.Item>
+          </>
+        ) : (
+          <Menu.Item
+            key="3"
+            disabled={!!!technician}
+            icon={<Icon component={FaBusinessTime} />}
+          >
+            <Link to={`/tech/jobclock`}>{t("menus.tech.jobclockin")}</Link>
+          </Menu.Item>
+        )}
         <Menu.Item
           key="4"
           disabled={!!!technician}
@@ -68,6 +114,15 @@ export function TechSider({ technician, techLogout }) {
         <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}
@@ -75,6 +130,7 @@ export function TechSider({ technician, techLogout }) {
         >
           <Link to={`/tech/board`}> {t("menus.tech.productionboard")}</Link>
         </Menu.Item>
+
         <Menu.Item
           key="7"
           disabled={!!!technician}

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

@@ -0,0 +1,142 @@
+import { DownOutlined } from "@ant-design/icons";
+import {
+  Button,
+  Checkbox,
+  Col,
+  Form,
+  InputNumber,
+  Popover,
+  Radio,
+  Row,
+  Space,
+  Spin,
+} from "antd";
+import React, { useState } from "react";
+import { GET_JOB_INFO_DRAW_CALCULATIONS } from "../../graphql/jobs-lines.queries";
+import { useQuery } from "@apollo/client";
+
+export default function TimeTicketCalculatorComponent({
+  setProductiveHours,
+
+  jobid,
+}) {
+  const { loading, data: lineTicketData } = useQuery(GET_JOB_INFO_DRAW_CALCULATIONS, {
+    variables: { id: jobid },
+    skip: !jobid,
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+  });
+
+  const [visible, setVisible] = useState(false);
+  const handleOpenChange = (flag) => setVisible(flag);
+  const handleFinish = ({ type, hourstype, percent }) => {
+    //setProductiveHours(values);
+    //setVisible(false);
+    const eligibleHours = Array.isArray(hourstype)
+      ? lineTicketData.joblines.reduce(
+          (acc, val) =>
+            acc + (hourstype.includes(val.mod_lbr_ty) ? val.mod_lb_hrs : 0),
+          0
+        )
+      : lineTicketData.joblines.reduce(
+          (acc, val) =>
+            acc + (hourstype === val.mod_lbr_ty ? val.mod_lb_hrs : 0),
+          0
+        );
+    if (type === "draw") {
+      setProductiveHours(eligibleHours * (percent / 100));
+    } else if (type === "cut") {
+      setProductiveHours(eligibleHours * (percent / 100));
+      console.log(
+        "Cut selected, rate set to: ",
+        lineTicketData.jobs_by_pk[`rate_${hourstype.toLowerCase()}`]
+      );
+    }
+  };
+
+  const popContent = (
+    <Spin spinning={loading}>
+      <Form onFinish={handleFinish}>
+        <Form.Item name="type">
+          <Radio.Group>
+            <Radio.Button value="draw">Draw</Radio.Button>
+            <Radio.Button value="cut">Cut of Sale</Radio.Button>
+          </Radio.Group>
+        </Form.Item>
+
+        <Form.Item noStyle shouldUpdate>
+          {({ getFieldValue }) => (
+            <Form.Item name="hourstype">
+              {getFieldValue("type") === "draw" ? (
+                <Checkbox.Group>
+                  <Row>
+                    <Col span={8}>
+                      <Checkbox value="LAB" style={{ lineHeight: "32px" }}>
+                        Body
+                      </Checkbox>
+                    </Col>
+                    <Col span={8}>
+                      <Checkbox value="LAR" style={{ lineHeight: "32px" }}>
+                        Refinish
+                      </Checkbox>
+                    </Col>
+                    <Col span={8}>
+                      <Checkbox value="LAM" style={{ lineHeight: "32px" }}>
+                        Mechanical
+                      </Checkbox>
+                    </Col>
+                    <Col span={8}>
+                      <Checkbox value="LAF" style={{ lineHeight: "32px" }}>
+                        Frame
+                      </Checkbox>
+                    </Col>
+                    <Col span={8}>
+                      <Checkbox value="LAG" style={{ lineHeight: "32px" }}>
+                        Glass
+                      </Checkbox>
+                    </Col>
+                  </Row>
+                </Checkbox.Group>
+              ) : (
+                <Radio.Group>
+                  <Radio value="LAB">Body</Radio>
+
+                  <Radio value="LAR">Refinish</Radio>
+
+                  <Radio value="LAM">Mechanical</Radio>
+
+                  <Radio value="LAF">Frame</Radio>
+
+                  <Radio value="LAG">Glass</Radio>
+                </Radio.Group>
+              )}
+            </Form.Item>
+          )}
+        </Form.Item>
+
+        <Form.Item name="percent">
+          <InputNumber min={0} max={100} precision={1} addonAfter="%" />
+        </Form.Item>
+        <Button htmlType="submit">Calculate</Button>
+      </Form>
+    </Spin>
+  );
+
+  return (
+    <Popover
+      content={popContent}
+      trigger={["click"]}
+      open={visible}
+      onOpenChange={handleOpenChange}
+      placement="right"
+      destroyTooltipOnHide
+    >
+      <Button onClick={(e) => e.preventDefault()}>
+        <Space>
+          Draw Calculator
+          <DownOutlined />
+        </Space>
+      </Button>
+    </Popover>
+  );
+}

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

@@ -0,0 +1,277 @@
+import { useQuery } from "@apollo/client";
+import {
+  Button,
+  Form,
+  InputNumber,
+  Modal,
+  Radio,
+  Select,
+  Space,
+  Table,
+  Typography,
+} from "antd";
+import Dinero from "dinero.js";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { GET_JOB_INFO_DRAW_CALCULATIONS } from "../../graphql/jobs-lines.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
+import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TimeTicketListTeamPay);
+
+export function TimeTicketListTeamPay({ bodyshop, context, actions }) {
+  //const { refetch } = actions;
+  const { jobId } = context;
+  const [visible, setVisible] = useState(false);
+  const [form] = Form.useForm();
+  const { t } = useTranslation();
+  const {
+    //loading,
+    data: lineTicketData,
+  } = useQuery(GET_JOB_INFO_DRAW_CALCULATIONS, {
+    variables: { id: jobId },
+    skip: !jobId,
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+  });
+
+  const handleOk = () => {
+    setVisible(false);
+  };
+
+  return (
+    <>
+      <Modal
+        width={"80%"}
+        open={visible}
+        destroyOnClose
+        onOk={handleOk}
+        onCancel={() => setVisible(false)}
+      >
+        <Form layout="vertical" form={form} initialValues={{ jobid: jobId }}>
+          <LayoutFormRow grow noDivider>
+            <Form.Item shouldUpdate>
+              {() => (
+                <Form.Item
+                  name="jobid"
+                  label={t("timetickets.fields.ro_number")}
+                  rules={[
+                    {
+                      required: !(
+                        form.getFieldValue("cost_center") ===
+                        "timetickets.labels.shift"
+                      ),
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <JobSearchSelectComponent
+                    convertedOnly={!bodyshop.tt_allow_post_to_invoiced}
+                    notExported={!bodyshop.tt_allow_post_to_invoiced}
+                  />
+                </Form.Item>
+              )}
+            </Form.Item>
+            <Form.Item
+              label={t("timetickets.fields.date")}
+              name="date"
+              rules={[
+                {
+                  required: true,
+                  //message: t("general.validation.required"),
+                },
+              ]}
+            >
+              <FormDatePicker />
+            </Form.Item>
+          </LayoutFormRow>
+
+          <LayoutFormRow grow noDivider>
+            <Form.Item name="team" label="Team">
+              <Select
+                options={Teams.map((team) => ({
+                  value: team.name,
+                  label: team.name,
+                }))}
+              />
+            </Form.Item>
+
+            <Form.Item name="hourstype">
+              <Radio.Group>
+                <Radio value="LAB">Body</Radio>
+                <Radio value="LAR">Refinish</Radio>
+                <Radio value="LAM">Mechanical</Radio>
+                <Radio value="LAF">Frame</Radio>
+                <Radio value="LAG">Glass</Radio>
+              </Radio.Group>
+            </Form.Item>
+
+            <Form.Item name="percent">
+              <InputNumber min={0} max={100} precision={1} addonAfter="%" />
+            </Form.Item>
+          </LayoutFormRow>
+
+          <Form.Item shouldUpdate noStyle>
+            {({ getFieldsValue }) => {
+              const formData = getFieldsValue();
+
+              let data = [];
+              let eligibleHours = 0;
+              const theTeam = Teams.find((team) => team.name === formData.team);
+              if (theTeam) {
+                eligibleHours =
+                  lineTicketData.joblines.reduce(
+                    (acc, val) =>
+                      acc +
+                      (formData.hourstype === val.mod_lbr_ty
+                        ? val.mod_lb_hrs
+                        : 0),
+                    0
+                  ) * (formData.percent / 100 || 0);
+
+                data = theTeam.employees.map((e) => {
+                  return {
+                    employeeid: e.employeeid,
+                    percentage: e.percentage,
+                    rate: e.rates[formData.hourstype],
+                    cost_center:
+                      bodyshop.md_responsibility_centers.defaults.costs[
+                        formData.hourstype
+                      ],
+                    productivehrs:
+                      Math.round(eligibleHours * 100 * (e.percentage / 100)) /
+                      100,
+                    pay: Dinero({
+                      amount: Math.round(
+                        (e.rates[formData.hourstype] || 0) * 100
+                      ),
+                    })
+                      .multiply(
+                        Math.round(eligibleHours * 100 * (e.percentage / 100)) /
+                          100
+                      )
+                      .toFormat("$0.00"),
+                  };
+                });
+              }
+
+              return (
+                <Table
+                  dataSource={data}
+                  rowKey={"employeeid"}
+                  title={() => (
+                    <Space>
+                      <Typography.Title level={4}>
+                        Tickets to be Created
+                      </Typography.Title>
+                      <span>{`(${eligibleHours} hours to split)`}</span>
+                    </Space>
+                  )}
+                  columns={[
+                    {
+                      title: t("timetickets.fields.employee"),
+                      dataIndex: "employee",
+                      key: "employee",
+                      render: (text, record) => {
+                        const emp = bodyshop.employees.find(
+                          (e) => e.id === record.employeeid
+                        );
+                        return `${emp?.first_name} ${emp?.last_name}`;
+                      },
+                    },
+                    {
+                      title: t("timetickets.fields.cost_center"),
+                      dataIndex: "cost_center",
+                      key: "cost_center",
+
+                      render: (text, record) =>
+                        record.cost_center === "timetickets.labels.shift"
+                          ? t(record.cost_center)
+                          : record.cost_center,
+                    },
+                    {
+                      title: t("timetickets.fields.productivehrs"),
+                      dataIndex: "productivehrs",
+                      key: "productivehrs",
+                    },
+                    {
+                      title: "Percentage",
+                      dataIndex: "percentage",
+                      key: "percentage",
+                    },
+                    {
+                      title: "Rate",
+                      dataIndex: "rate",
+                      key: "rate",
+                    },
+                    {
+                      title: "Pay",
+                      dataIndex: "pay",
+                      key: "pay",
+                    },
+                  ]}
+                />
+              );
+            }}
+          </Form.Item>
+        </Form>
+      </Modal>
+      <Button onClick={() => setVisible(true)}>Assign Team Pay </Button>
+    </>
+  );
+}
+
+const Teams = [
+  {
+    name: "Team A",
+    employees: [
+      {
+        employeeid: "9f1bdc23-8dc2-4b6a-8ca1-5f83a6fdcc22",
+        percentage: 50,
+        rates: {
+          LAB: 10,
+          LAR: 15,
+        },
+      },
+      {
+        employeeid: "201db66c-96c7-41ec-bed4-76842ba93087",
+        percentage: 50,
+        rates: {
+          LAB: 20,
+          LAR: 25,
+        },
+      },
+    ],
+  },
+  {
+    name: "Team B",
+    employees: [
+      {
+        employeeid: "9f1bdc23-8dc2-4b6a-8ca1-5f83a6fdcc22",
+        percentage: 75,
+        rates: {
+          LAB: 100,
+          LAR: 150,
+        },
+      },
+      {
+        employeeid: "201db66c-96c7-41ec-bed4-76842ba93087",
+        percentage: 25,
+        rates: {
+          LAB: 200,
+          LAR: 250,
+        },
+      },
+    ],
+  },
+];

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

@@ -1,11 +1,12 @@
-import { EditFilled } from "@ant-design/icons";
-import { Card, Space, Table } from "antd";
+import { EditFilled, SyncOutlined } from "@ant-design/icons";
+import { Button, Card, Checkbox, Space, Table } from "antd";
 import moment from "moment";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { setModalContext } from "../../redux/modals/modals.actions";
 import {
   selectAuthLevel,
   selectBodyshop,
@@ -18,18 +19,22 @@ import RbacWrapper, {
   HasRbacAccess,
 } from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketEnterButton from "../time-ticket-enter-button/time-ticket-enter-button.component";
+import { useTreatments } from "@splitsoftware/splitio-react";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   authLevel: selectAuthLevel,
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  setTimeTicketTaskContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "timeTicketTask" })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(TimeTicketList);
 
 export function TimeTicketList({
   bodyshop,
+  setTimeTicketTaskContext,
   authLevel,
   currentUser,
   disabled,
@@ -46,7 +51,11 @@ export function TimeTicketList({
   });
 
   const { t } = useTranslation();
-
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
   const totals = useMemo(() => {
     if (timetickets)
       return timetickets.reduce(
@@ -61,6 +70,14 @@ export function TimeTicketList({
   }, [timetickets]);
 
   const columns = [
+    {
+      title: t("timetickets.fields.committed"),
+      dataIndex: "committed_at",
+      key: "committed_at",
+      render: (text, record) => (
+        <Checkbox disabled checked={record.committed_at} />
+      ),
+    },
     {
       title: t("timetickets.fields.date"),
       dataIndex: "date",
@@ -118,21 +135,26 @@ export function TimeTicketList({
           }) || [],
       onFilter: (value, record) => value.includes(record.cost_center),
     },
-    {
-      title: t("jobs.fields.ro_number"),
-      dataIndex: "ro_number",
-      key: "ro_number",
-      sorter: (a, b) =>
-        alphaSort(a.job && a.job.ro_number, b.job && b.job.ro_number),
-      sortOrder:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
-      render: (text, record) =>
-        record.job && (
-          <Link to={"/manage/jobs/" + record.job.id}>
-            {record.job.ro_number || "N/A"}
-          </Link>
-        ),
-    },
+    ...(jobId
+      ? []
+      : [
+          {
+            title: t("jobs.fields.ro_number"),
+            dataIndex: "ro_number",
+            key: "ro_number",
+            sorter: (a, b) =>
+              alphaSort(a.job && a.job.ro_number, b.job && b.job.ro_number),
+            sortOrder:
+              state.sortedInfo.columnKey === "ro_number" &&
+              state.sortedInfo.order,
+            render: (text, record) =>
+              record.job && (
+                <Link to={"/manage/jobs/" + record.job.id}>
+                  {record.job.ro_number || "N/A"}
+                </Link>
+              ),
+          },
+        ]),
     {
       title: t("timetickets.fields.productivehrs"),
       dataIndex: "productivehrs",
@@ -142,14 +164,20 @@ export function TimeTicketList({
         state.sortedInfo.columnKey === "productivehrs" &&
         state.sortedInfo.order,
     },
-    {
-      title: t("timetickets.fields.actualhrs"),
-      dataIndex: "actualhrs",
-      key: "actualhrs",
-      sorter: (a, b) => a.actualhrs - b.actualhrs,
-      sortOrder:
-        state.sortedInfo.columnKey === "actualhrs" && state.sortedInfo.order,
-    },
+    ...(Enhanced_Payroll.treatment === "on"
+      ? []
+      : [
+          {
+            title: t("timetickets.fields.actualhrs"),
+            dataIndex: "actualhrs",
+            key: "actualhrs",
+            sorter: (a, b) => a.actualhrs - b.actualhrs,
+            sortOrder:
+              state.sortedInfo.columnKey === "actualhrs" &&
+              state.sortedInfo.order,
+          },
+        ]),
+
     {
       title: t("timetickets.fields.memo"),
       dataIndex: "memo",
@@ -160,42 +188,59 @@ export function TimeTicketList({
       render: (text, record) =>
         record.clockon || record.clockoff ? t(record.memo) : record.memo,
     },
-    {
-      title: t("timetickets.fields.clockon"),
-      dataIndex: "clockon",
-      key: "clockon",
+    ...(Enhanced_Payroll.treatment === "on"
+      ? [
+          {
+            title: t("timetickets.fields.task_name"),
+            dataIndex: "task_name",
+            key: "task_name",
+            sorter: (a, b) => alphaSort(a.task_name, b.task_name),
+            sortOrder:
+              state.sortedInfo.columnKey === "task_name" &&
+              state.sortedInfo.order,
+          },
+        ]
+      : []),
+    ...(Enhanced_Payroll.treatment === "on"
+      ? []
+      : [
+          {
+            title: t("timetickets.fields.clockon"),
+            dataIndex: "clockon",
+            key: "clockon",
 
-      render: (text, record) => (
-        <DateTimeFormatter>{record.clockon}</DateTimeFormatter>
-      ),
-    },
-    {
-      title: t("timetickets.fields.clockoff"),
-      dataIndex: "clockoff",
-      key: "clockoff",
+            render: (text, record) => (
+              <DateTimeFormatter>{record.clockon}</DateTimeFormatter>
+            ),
+          },
+          {
+            title: t("timetickets.fields.clockoff"),
+            dataIndex: "clockoff",
+            key: "clockoff",
 
-      render: (text, record) => (
-        <DateTimeFormatter>{record.clockoff}</DateTimeFormatter>
-      ),
-    },
-    {
-      title: t("timetickets.fields.clockhours"),
-      dataIndex: "clockhours",
-      key: "clockhours",
-      render: (text, record) => {
-        if (record.clockoff && record.clockon)
-          return (
-            <div>
-              {moment(record.clockoff)
-                .diff(moment(record.clockon), "hours", true)
-                .toFixed(2)}
-            </div>
-          );
-        else {
-          return null;
-        }
-      },
-    },
+            render: (text, record) => (
+              <DateTimeFormatter>{record.clockoff}</DateTimeFormatter>
+            ),
+          },
+          {
+            title: t("timetickets.fields.clockhours"),
+            dataIndex: "clockhours",
+            key: "clockhours",
+            render: (text, record) => {
+              if (record.clockoff && record.clockon)
+                return (
+                  <div>
+                    {moment(record.clockoff)
+                      .diff(moment(record.clockon), "hours", true)
+                      .toFixed(2)}
+                  </div>
+                );
+              else {
+                return null;
+              }
+            },
+          },
+        ]),
     {
       title: t("timetickets.fields.created_by"),
       dataIndex: "created_by",
@@ -205,6 +250,15 @@ export function TimeTicketList({
         state.sortedInfo.columnKey === "created_by" && state.sortedInfo.order,
       render: (text, record) => record.created_by,
     },
+    // {
+    //   title: "Pay",
+    //   dataIndex: "pay",
+    //   key: "pay",
+    //   render: (text, record) =>
+    //     Dinero({ amount: Math.round(record.rate * 100) })
+    //       .multiply(record.flat_rate ? record.productivehrs : record.actualhrs)
+    //       .toFormat("$0.00"),
+    // },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",
@@ -234,6 +288,11 @@ export function TimeTicketList({
                   timeticket: record,
                 }}
                 disabled={
+                  HasRbacAccess({
+                    bodyshop,
+                    authLevel: authLevel,
+                    action: "timetickets:editcommitted",
+                  }) &&
                   HasRbacAccess({
                     bodyshop,
                     authLevel: authLevel,
@@ -261,6 +320,19 @@ export function TimeTicketList({
       title={t("timetickets.labels.timetickets")}
       extra={
         <Space wrap>
+          {jobId && bodyshop.md_tasks_presets.enable_tasks && (
+            <Button
+              disabled={disabled}
+              onClick={() => {
+                setTimeTicketTaskContext({
+                  actions: { refetch: refetch },
+                  context: { jobid: jobId },
+                });
+              }}
+            >
+              {t("timetickets.actions.claimtasks")}
+            </Button>
+          )}
           {jobId &&
             (techConsole ? null : (
               <TimeTicketEnterButton
@@ -277,6 +349,13 @@ export function TimeTicketList({
               </TimeTicketEnterButton>
             ))}
           {extra}
+          <Button
+            onClick={async () => {
+              refetch();
+            }}
+          >
+            <SyncOutlined />
+          </Button>
         </Space>
       }
     >

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

@@ -19,6 +19,8 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
+import TimeTicketCalculatorComponent from "../time-ticket-calculator/time-ticket-calculator.component";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -36,9 +38,15 @@ export function TimeTicketModalComponent({
   authLevel,
   employeeAutoCompleteOptions,
   isEdit,
+  disabled,
   employeeSelectDisabled,
 }) {
   const { t } = useTranslation();
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
   const [loadLineTicketData, { called, loading, data: lineTicketData }] =
     useLazyQuery(GET_LINE_TICKET_BY_PK, {
       fetchPolicy: "network-only",
@@ -49,14 +57,14 @@ export function TimeTicketModalComponent({
       <Select
         value={value === "timetickets.labels.shift" ? t(value) : value}
         {...props}
-        disabled={value === "timetickets.labels.shift"}
+        disabled={value === "timetickets.labels.shift" || disabled}
       >
         {emps &&
           emps.rates.map((item) => (
             <Select.Option key={item.cost_center} value={item.cost_center}>
               {item.cost_center === "timetickets.labels.shift"
                 ? t(item.cost_center)
-                : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === 'on'
                 ? t(
                     `joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`
                   )
@@ -72,7 +80,7 @@ export function TimeTicketModalComponent({
       <Input
         value={value?.startsWith("timetickets.") ? t(value) : value}
         {...props}
-        disabled={value?.startsWith("timetickets.")}
+        disabled={value?.startsWith("timetickets.") || disabled}
       />
     );
   };
@@ -126,7 +134,7 @@ export function TimeTicketModalComponent({
           ]}
         >
           <EmployeeSearchSelect
-            disabled={employeeSelectDisabled}
+            disabled={employeeSelectDisabled || disabled}
             options={employeeAutoCompleteOptions}
             onSelect={(value) => {
               const emps =
@@ -178,65 +186,73 @@ export function TimeTicketModalComponent({
       <LayoutFormRow>
         <Form.Item shouldUpdate>
           {() => (
-            <Form.Item
-              label={t("timetickets.fields.productivehrs")}
-              name="productivehrs"
-              rules={[
-                ({ getFieldValue }) => ({
-                  validator(rule, value) {
-                    if (!bodyshop.tt_enforce_hours_for_tech_console) {
-                      return Promise.resolve();
-                    }
-                    if (
-                      !value ||
-                      getFieldValue("cost_center") === null ||
-                      !lineTicketData
-                    )
-                      return Promise.resolve();
+            <>
+              <Form.Item
+                label={t("timetickets.fields.productivehrs")}
+                name="productivehrs"
+                rules={[
+                  ({ getFieldValue }) => ({
+                    validator(rule, value) {
+                      if (!bodyshop.tt_enforce_hours_for_tech_console) {
+                        return Promise.resolve();
+                      }
+                      if (
+                        !value ||
+                        getFieldValue("cost_center") === null ||
+                        !lineTicketData
+                      )
+                        return Promise.resolve();
 
-                    //Check the cost center,
-                    const totals = CalculateAllocationsTotals(
-                      bodyshop,
-                      lineTicketData.joblines,
-                      lineTicketData.timetickets,
-                      lineTicketData.jobs_by_pk.lbr_adjustments
-                    );
-
-                    const fieldTypeToCheck =
-                      bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
-                        ? "mod_lbr_ty"
-                        : "cost_center";
-
-                    const costCenterDiff =
-                      Math.round(
-                        totals.find(
-                          (total) =>
-                            total[fieldTypeToCheck] ===
-                            getFieldValue("cost_center")
-                        )?.difference * 10
-                      ) / 10;
-
-                    if (value > costCenterDiff)
-                      return Promise.reject(
-                        t(
-                          "timetickets.validation.hoursenteredmorethanavailable"
-                        )
+                      //Check the cost center,
+                      const totals = CalculateAllocationsTotals(
+                        bodyshop,
+                        lineTicketData.joblines,
+                        lineTicketData.timetickets,
+                        lineTicketData.jobs_by_pk.lbr_adjustments
                       );
-                    else {
-                      return Promise.resolve();
-                    }
+
+                      const fieldTypeToCheck =
+                        bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                          ? "mod_lbr_ty"
+                          : "cost_center";
+
+                      const costCenterDiff =
+                        Math.round(
+                          totals.find(
+                            (total) =>
+                              total[fieldTypeToCheck] ===
+                              getFieldValue("cost_center")
+                          )?.difference * 10
+                        ) / 10;
+
+                      if (value > costCenterDiff)
+                        return Promise.reject(
+                          t(
+                            "timetickets.validation.hoursenteredmorethanavailable"
+                          )
+                        );
+                      else {
+                        return Promise.resolve();
+                      }
+                    },
+                  }),
+                  {
+                    required:
+                      form.getFieldValue("cost_center") !==
+                      "timetickets.labels.shift",
+                    //message: t("general.validation.required"),
                   },
-                }),
-                {
-                  required:
-                    form.getFieldValue("cost_center") !==
-                    "timetickets.labels.shift",
-                  //message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <InputNumber precision={1} />
-            </Form.Item>
+                ]}
+              >
+                <InputNumber precision={1} />
+              </Form.Item>
+              <TimeTicketCalculatorComponent
+                jobid={form.getFieldValue("jobid")}
+                setProductiveHours={(productivehrs) =>
+                  form.setFieldsValue({ productivehrs })
+                }
+              />
+            </>
           )}
         </Form.Item>
         <Form.Item
@@ -270,6 +286,7 @@ export function TimeTicketModalComponent({
               <FormDateTimePicker
                 minuteStep={5}
                 disabled={
+                  disabled ||
                   !HasRbacAccess({
                     bodyshop,
                     authLevel,
@@ -308,6 +325,7 @@ export function TimeTicketModalComponent({
               <FormDateTimePicker
                 minuteStep={5}
                 disabled={
+                  disabled ||
                   !HasRbacAccess({
                     bodyshop,
                     authLevel,
@@ -363,7 +381,12 @@ export function TimeTicketModalComponent({
   );
 }
 
-export function LaborAllocationContainer({ jobid, loading, lineTicketData }) {
+export function LaborAllocationContainer({
+  jobid,
+  loading,
+  lineTicketData,
+  hideTimeTickets = false,
+}) {
   if (loading) return <LoadingSkeleton />;
   if (!lineTicketData) return null;
   return (
@@ -374,12 +397,13 @@ export function LaborAllocationContainer({ jobid, loading, lineTicketData }) {
         timetickets={lineTicketData.timetickets}
         adjustments={lineTicketData.jobs_by_pk.lbr_adjustments}
       />
-
-      <TimeTicketList
-        loading={loading}
-        timetickets={lineTicketData.timetickets}
-        techConsole
-      />
+      {!hideTimeTickets && (
+        <TimeTicketList
+          loading={loading}
+          timetickets={lineTicketData.timetickets}
+          techConsole
+        />
+      )}
     </div>
   );
 }

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

@@ -14,6 +14,8 @@ import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectTimeTicket } from "../../redux/modals/modals.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import TimeTicketModalComponent from "./time-ticket-modal.component";
+import TimeTicketsCommitToggleComponent from "../time-tickets-commit-toggle/time-tickets-commit-toggle.component";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   timeTicketModal: selectTimeTicket,
@@ -34,7 +36,11 @@ export function TimeTicketModalContainer({
   const [enterAgain, setEnterAgain] = useState(false);
   const [insertTicket] = useMutation(INSERT_NEW_TIME_TICKET);
   const [updateTicket] = useMutation(UPDATE_TIME_TICKET);
-
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
   const { data: EmployeeAutoCompleteData } = useQuery(QUERY_ACTIVE_EMPLOYEES, {
     skip: !timeTicketModal.visible,
     fetchPolicy: "network-only",
@@ -147,7 +153,7 @@ export function TimeTicketModalContainer({
     if (!!changedFields.cost_center && !!EmployeeAutoCompleteData) {
       form.setFieldsValue({
         ciecacode:
-          bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+          bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === 'on'
             ? changedFields.cost_center
             : Object.keys(
                 bodyshop.md_responsibility_centers.defaults.costs
@@ -175,7 +181,11 @@ export function TimeTicketModalContainer({
       footer={
         <span>
           <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
-          <Button loading={loading} onClick={() => form.submit()}>
+          <Button
+            loading={loading}
+            disabled={timeTicketModal.context?.timeticket?.committed_at}
+            onClick={() => form.submit()}
+          >
             {t("general.actions.save")}
           </Button>
           {timeTicketModal.context && timeTicketModal.context.id ? null : (
@@ -199,6 +209,7 @@ export function TimeTicketModalContainer({
         autoComplete={"off"}
         form={form}
         onFinishFailed={() => setEnterAgain(false)}
+        disabled={timeTicketModal.context?.timeticket?.committed_at}
         initialValues={
           timeTicketModal.context.timeticket
             ? {
@@ -219,6 +230,9 @@ export function TimeTicketModalContainer({
         <PageHeader
           extra={
             <Space>
+              <TimeTicketsCommitToggleComponent
+                timeticket={timeTicketModal.context?.timeticket}
+              />
               <Button onClick={handleCancel}>
                 {t("general.actions.cancel")}
               </Button>
@@ -242,14 +256,16 @@ export function TimeTicketModalContainer({
         <TimeTicketModalComponent
           isEdit={timeTicketModal.context.id}
           form={form}
+          disabled={timeTicketModal.context?.timeticket?.committed_at}
           employeeAutoCompleteOptions={
             EmployeeAutoCompleteData && EmployeeAutoCompleteData.employees
           }
           employeeSelectDisabled={
-            timeTicketModal.context?.timeticket?.employeeid &&
+            timeTicketModal.context?.timeticket?.committed_at ||
+            (timeTicketModal.context?.timeticket?.employeeid &&
             !timeTicketModal.context.id
               ? true
-              : false
+              : false)
           }
         />
       </Form>

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

@@ -0,0 +1,197 @@
+import {
+  Alert,
+  Col,
+  Form,
+  Radio,
+  Row,
+  Skeleton,
+  Space,
+  Spin,
+  Typography,
+} from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import ReadOnlyFormItemComponent from "../form-items-formatted/read-only-form-item.component";
+import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TimeTicketTaskModalComponent);
+
+export function TimeTicketTaskModalComponent({
+  bodyshop,
+  form,
+  loading,
+  completedTasks,
+  unassignedHours,
+}) {
+  const { t } = useTranslation();
+
+  return (
+    <div>
+      <Row gutter={[16, 16]}>
+        <Col xl={12} lg={24}>
+          <Form.Item
+            name="jobid"
+            label={t("timetickets.fields.ro_number")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <JobSearchSelectComponent convertedOnly={true} notExported={true} />
+          </Form.Item>
+          <Space wrap>
+            <Form.Item name="task" label={t("timetickets.labels.task")}>
+              {loading ? (
+                <Spin />
+              ) : (
+                <Radio.Group
+                  optionType="button"
+                  options={bodyshop.md_tasks_presets.presets.map((preset) => ({
+                    value: preset.name,
+                    label: preset.name,
+                    disabled: completedTasks
+                      .map((task) => task.name)
+                      .includes(preset.name),
+                  }))}
+                />
+              )}
+            </Form.Item>
+            <Form.Item dependencies={["task"]}>
+              {() => {
+                const { task } = form.getFieldsValue();
+                const theTaskPreset = bodyshop.md_tasks_presets?.presets?.find(
+                  (tp) => tp.name === task
+                );
+
+                if (!task) return null;
+                return (
+                  <table className="task-tickets-table">
+                    <tbody>
+                      <tr>
+                        <td>{t("bodyshop.fields.md_tasks_presets.percent")}</td>
+                        <td>{`${theTaskPreset.percent || 0}%`}</td>
+                      </tr>
+                      <tr>
+                        <td>
+                          {t("bodyshop.fields.md_tasks_presets.hourstype")}
+                        </td>
+                        <td>{theTaskPreset.hourstype.join(", ")}</td>
+                      </tr>
+                      <tr>
+                        <td>
+                          {t("bodyshop.fields.md_tasks_presets.nextstatus")}
+                        </td>
+                        <td>{theTaskPreset.nextstatus}</td>
+                      </tr>
+                    </tbody>
+                  </table>
+                );
+              }}
+            </Form.Item>
+          </Space>
+        </Col>
+        <Col xl={12} lg={24}>
+          {loading ? (
+            <Skeleton />
+          ) : (
+            <Form.List name="timetickets">
+              {(fields, { add, remove, move }) => {
+                return (
+                  <>
+                    <Typography.Title level={4}>
+                      {t("timetickets.labels.claimtaskpreview")}
+                    </Typography.Title>
+                    <table className="task-tickets-table">
+                      <thead>
+                        <tr>
+                          <th>{t("timetickets.fields.employee")}</th>
+                          <th>{t("timetickets.fields.cost_center")}</th>
+                          <th>{t("timetickets.fields.ciecacode")}</th>
+                          <th>{t("timetickets.fields.productivehrs")}</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        {fields.map((field, index) => (
+                          <tr key={field.key}>
+                            <td>
+                              <Form.Item
+                                key={`${index}employeeid`}
+                                name={[field.name, "employeeid"]}
+                              >
+                                <ReadOnlyFormItemComponent type="employee" />
+                              </Form.Item>
+                            </td>
+                            <td>
+                              <Form.Item
+                                key={`${index}cost_center`}
+                                name={[field.name, "cost_center"]}
+                              >
+                                <ReadOnlyFormItemComponent />
+                              </Form.Item>
+                            </td>
+                            <td>
+                              <Form.Item
+                                key={`${index}ciecacode`}
+                                name={[field.name, "ciecacode"]}
+                              >
+                                <ReadOnlyFormItemComponent />
+                              </Form.Item>
+                            </td>
+                            <td>
+                              <Form.Item
+                                key={`${index}productivehrs`}
+                                name={[field.name, "productivehrs"]}
+                              >
+                                <ReadOnlyFormItemComponent />
+                              </Form.Item>
+                            </td>
+                          </tr>
+                        ))}
+                      </tbody>
+                    </table>
+                    <Alert
+                      type="success"
+                      message={t("timetickets.labels.payrollclaimedtasks")}
+                    />
+                  </>
+                );
+              }}
+            </Form.List>
+          )}
+          {unassignedHours > 0 && (
+            <Alert
+              type="error"
+              message={t("timetickets.validation.unassignedlines", {
+                unassignedHours: unassignedHours,
+              })}
+            />
+          )}
+        </Col>
+      </Row>
+
+      {bodyshop?.md_tasks_presets?.use_approvals && (
+        <Col xl={12} lg={24}>
+          <Alert
+            message={t("tt_approvals.labels.approval_queue_in_use")}
+            type="warning"
+          />
+        </Col>
+      )}
+    </div>
+  );
+}

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

@@ -0,0 +1,151 @@
+import React, { useCallback, useEffect, useState } from "react";
+
+import { Form, Modal, notification } from "antd";
+import axios from "axios";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { toggleModalVisible } from "../../redux/modals/modals.actions";
+import { selectTimeTicketTasks } from "../../redux/modals/modals.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import TimeTicketTaskModalComponent from "./time-ticket-task-modal.component";
+import { useApolloClient } from "@apollo/client";
+import { QUERY_COMPLETED_TASKS } from "../../graphql/jobs.queries";
+import "./time-ticket-task-modal.styles.scss";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  timeTicketTasksModal: selectTimeTicketTasks,
+  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
+  technician: selectTechnician,
+});
+const mapDispatchToProps = (dispatch) => ({
+  toggleModalVisible: () => dispatch(toggleModalVisible("timeTicketTask")),
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TimeTickeTaskModalContainer);
+
+export function TimeTickeTaskModalContainer({
+  bodyshop,
+  currentUser,
+  technician,
+  timeTicketTasksModal,
+  toggleModalVisible,
+}) {
+  const [form] = Form.useForm();
+  const { context, visible, actions } = timeTicketTasksModal;
+  const [completedTasks, setCompletedTasks] = useState([]);
+  const [unassignedHours, setUnassignedHours] = useState(0);
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+  const client = useApolloClient();
+
+  async function handleFinish(values) {
+    calculateTickets({ values, handleFinish: true });
+  }
+  const getCompletedTasks = useCallback(
+    async (jobid) => {
+      setLoading(true);
+
+      const { data } = await client.query({
+        query: QUERY_COMPLETED_TASKS,
+        variables: { jobid },
+      });
+
+      setCompletedTasks(data.jobs_by_pk.completed_tasks || []);
+      setLoading(false);
+    },
+    [client]
+  );
+  useEffect(() => {
+    if (visible) {
+      form.setFieldsValue({ ...context, task: null, timetickets: null });
+      if (context.jobid) {
+        getCompletedTasks(context.jobid);
+      }
+    }
+  }, [context.jobid, visible, getCompletedTasks, form, context]);
+
+  async function handleValueChange(changedValues, allValues) {
+    if (changedValues.jobid) {
+      getCompletedTasks(changedValues.jobid);
+    }
+    if (allValues.jobid && allValues.task) {
+      calculateTickets({ values: allValues, handleFinish: false });
+    }
+  }
+
+  const calculateTickets = async ({ values, handleFinish }) => {
+    setLoading(true);
+    try {
+      const { data, ...response } = await axios.post("/payroll/claimtask", {
+        jobid: values.jobid,
+        task: values.task,
+        calculateOnly: !handleFinish,
+        employee: technician
+          ? {
+              name: `${technician.first_name} ${technician.last_name}`.trim(),
+              employeeid: technician.id,
+            }
+          : { name: currentUser.displayName, email: currentUser.email },
+      });
+      if (response.status === 200 && handleFinish) {
+        //Close the modal
+        if (actions?.refetch) actions.refetch();
+        toggleModalVisible();
+      } else if (handleFinish === false) {
+        form.setFieldsValue({ timetickets: data.ticketsToInsert });
+        setUnassignedHours(data.unassignedHours);
+      } else {
+        notification.open({
+          type: "error",
+          message: t("timetickets.errors.creating", {
+            message: JSON.stringify(data),
+          }),
+        });
+      }
+    } catch (error) {
+      notification.open({
+        type: "error",
+        message: t("timetickets.errors.creating", { message: error.message }),
+      });
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <Modal
+      destroyOnClose
+      open={visible}
+      onCancel={() => {
+        toggleModalVisible();
+        form.resetFields();
+      }}
+      width="80%"
+      onOk={() => form.submit()}
+    >
+      <Form
+        autoComplete={"off"}
+        form={form}
+        layout="vertical"
+        onFinish={handleFinish}
+        initialValues={context}
+        onValuesChange={handleValueChange}
+      >
+        <TimeTicketTaskModalComponent
+          form={form}
+          loading={loading}
+          completedTasks={completedTasks}
+          unassignedHours={unassignedHours}
+        />
+      </Form>
+    </Modal>
+  );
+}

client/src/components/time-ticket-task-modal/time-ticket-task-modal.styles.scss

@@ -0,0 +1,19 @@
+.task-tickets-table {
+  table-layout: fixed;
+  width: 100%;
+
+  th,
+  td {
+    padding: 8px;
+    text-align: left;
+    border-bottom: 1px solid #ddd;
+
+    .ant-form-item {
+      margin-bottom: 0px !important;
+    }
+  }
+
+  tr:hover {
+    background-color: #f5f5f5;
+  }
+}

client/src/components/time-tickets-commit-toggle/time-tickets-commit-toggle.component.jsx

@@ -0,0 +1,104 @@
+import { useMutation } from "@apollo/client";
+import { Button, notification } from "antd";
+import moment from "moment";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { UPDATE_TIME_TICKET } from "../../graphql/timetickets.queries";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
+});
+const mapDispatchToProps = (dispatch) => ({
+  setTimeTicketContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "timeTicket" })),
+});
+export function TimeTicketsCommit({
+  bodyshop,
+  currentUser,
+  timeticket,
+  disabled,
+  refetch,
+  setTimeTicketContext,
+}) {
+  const { t } = useTranslation();
+  const [updateTimeTicket] = useMutation(UPDATE_TIME_TICKET);
+
+  const [loading, setLoading] = useState(false);
+  const handleCommit = async () => {
+    setLoading(true);
+    try {
+      const ticketUpdate = timeticket.committed_at
+        ? { commited_by: null, committed_at: null }
+        : {
+            commited_by: currentUser.email,
+            committed_at: moment(),
+          };
+
+      const result = await updateTimeTicket({
+        variables: {
+          timeticketId: timeticket.id,
+          timeticket: ticketUpdate,
+        },
+        update(cache) {
+          cache.modify({
+            fields: {
+              timeTickets(existingtickets, { readField }) {
+                return existingtickets.map((ticket) => {
+                  if (timeticket.id === readField("id", ticket)) {
+                    return {
+                      ...ticket,
+                      ...ticketUpdate,
+                    };
+                  }
+                  return ticket;
+                });
+              },
+            },
+          });
+        },
+      });
+      if (result.errors) {
+        notification.open({
+          type: "error",
+          message: t("timetickets.errors.creating", {
+            message: JSON.stringify(result.errors),
+          }),
+        });
+      } else {
+        setTimeTicketContext({
+          context: {
+            id: timeticket.id,
+            timeticket: result.data.update_timetickets.returning[0],
+          },
+        });
+        notification.open({
+          type: "success",
+          message: t("timetickets.successes.committed"),
+        });
+      }
+    } catch (error) {
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  if (!timeticket?.id) return null;
+
+  return (
+    <Button onClick={handleCommit} loading={loading} disabled={!timeticket?.id}>
+      {timeticket?.committed_at
+        ? t("timetickets.actions.uncommit")
+        : t("timetickets.actions.commitone")}
+    </Button>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(TimeTicketsCommit);

client/src/components/time-tickets-commit/time-tickets-commit.component.jsx

@@ -0,0 +1,95 @@
+import { useMutation } from "@apollo/client";
+import { Button, notification } from "antd";
+import moment from "moment";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { UPDATE_TIME_TICKETS } from "../../graphql/timetickets.queries";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
+});
+
+export function TimeTicketsCommit({
+  bodyshop,
+  currentUser,
+  timetickets,
+  disabled,
+  loadingCallback,
+  completedCallback,
+  refetch,
+}) {
+  const { t } = useTranslation();
+  const [updateTimeTickets] = useMutation(UPDATE_TIME_TICKETS);
+
+  const [loading, setLoading] = useState(false);
+  const handleCommit = async () => {
+    setLoading(true);
+    try {
+      const result = await updateTimeTickets({
+        variables: {
+          timeticketIds: timetickets.map((ticket) => ticket.id),
+          timeticket: {
+            commited_by: currentUser.email,
+            committed_at: moment(),
+          },
+        },
+        update(cache) {
+          cache.modify({
+            fields: {
+              timeTickets(existingtickets, { readField }) {
+                const modifiedIds = timetickets.map((ticket) => ticket.id);
+                return existingtickets.map((ticket) => {
+                  if (modifiedIds.includes(readField("id", ticket))) {
+                    return {
+                      ...ticket,
+                      commited_by: currentUser.email,
+                      committed_at: moment(),
+                    };
+                  }
+                  return ticket;
+                });
+              },
+            },
+          });
+        },
+      });
+      if (result.errors) {
+        notification.open({
+          type: "error",
+          message: t("timetickets.errors.creating", {
+            message: JSON.stringify(result.errors),
+          }),
+        });
+      } else {
+        notification.open({
+          type: "success",
+          message: t("timetickets.successes.committed"),
+        });
+        if (!!completedCallback) completedCallback([]);
+        if (!!loadingCallback) loadingCallback(false);
+      }
+    } catch (error) {
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <Button
+      onClick={handleCommit}
+      loading={loading}
+      disabled={disabled || timetickets?.length === 0}
+    >
+      {t("timetickets.actions.commit", { count: timetickets?.length })}
+    </Button>
+  );
+}
+
+export default connect(mapStateToProps, null)(TimeTicketsCommit);

client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx

@@ -10,7 +10,7 @@ import { onlyUnique } from "../../utils/arrayHelper";
 import { alphaSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
-
+import Dinero from "dinero.js";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -129,6 +129,16 @@ const JobRelatedTicketsTable = ({
               return acc;
             }, 0);
 
+          const pay = item.tickets
+            .filter((ticket) => ticket.cost_center === costCenter)
+            .reduce((acc, val) => {
+              return acc.add(
+                Dinero({ amount: Math.round(val.rate * 100) }).multiply(
+                  val.flat_rate ? val.productivehrs : val.actualhrs
+                )
+              );
+            }, Dinero());
+
           return {
             id: `${item.jobKey}${costCenter}`,
             costCenter,
@@ -136,6 +146,7 @@ const JobRelatedTicketsTable = ({
             actHrs: actHrs.toFixed(1),
             prodHrs: prodHrs.toFixed(1),
             clockHrs,
+            pay,
           };
         });
       })
@@ -195,6 +206,15 @@ const JobRelatedTicketsTable = ({
         state.sortedInfo.columnKey === "clockHrs" && state.sortedInfo.order,
       render: (text, record) => record.clockHrs.toFixed(2),
     },
+    {
+      title: "Pay",
+      dataIndex: "Pay",
+      key: "Pay",
+      sorter: (a, b) => a.clockHrs - b.clockHrs,
+      sortOrder:
+        state.sortedInfo.columnKey === "clockHrs" && state.sortedInfo.order,
+      render: (text, record) => record.pay.toFormat("$0.00"),
+    },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",

client/src/components/tt-approvals-list/tt-approvals-list.component.jsx

@@ -0,0 +1,241 @@
+import { SyncOutlined } from "@ant-design/icons";
+import { Button, Card, Space, Table, Tag } from "antd";
+import Dinero from "dinero.js";
+import queryString from "query-string";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { Link, useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import {
+  selectAuthLevel,
+  selectBodyshop,
+} from "../../redux/user/user.selectors";
+import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
+import { onlyUnique } from "../../utils/arrayHelper";
+import { alphaSort, dateSort } from "../../utils/sorters";
+import TtApproveButtonComponent from "../tt-approve-button/tt-approve-button.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  authLevel: selectAuthLevel,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  setTimeTicketTaskContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "timeTicketTask" })),
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TtApprovalsListComponent);
+
+export function TtApprovalsListComponent({
+  bodyshop,
+  setTimeTicketTaskContext,
+  authLevel,
+  disabled,
+  loading,
+  tt_approval_queue,
+  total,
+  refetch,
+  techConsole,
+  jobId,
+  extra,
+}) {
+  const [state, setState] = useState({
+    sortedInfo: {},
+    filteredInfo: { text: "" },
+  });
+
+  const { t } = useTranslation();
+  const history = useHistory();
+  const search = queryString.parse(useLocation().search);
+  const { page } = search;
+  const [selectedTickets, setSelectedTickets] = useState([]);
+
+  const columns = [
+    {
+      title: t("timetickets.fields.date"),
+      dataIndex: "date",
+      key: "date",
+      sorter: (a, b) => dateSort(a.date, b.date),
+      sortOrder:
+        state.sortedInfo.columnKey === "date" && state.sortedInfo.order,
+      render: (text, record) => <DateFormatter>{record.date}</DateFormatter>,
+    },
+    {
+      title: t("timetickets.fields.employee"),
+      dataIndex: "employeeid",
+      key: "employeeid",
+      sorter: (a, b) => alphaSort(a.employee.last_name, b.employee.last_name),
+      sortOrder:
+        state.sortedInfo.columnKey === "employee" && state.sortedInfo.order,
+      render: (text, record) =>
+        `${record.employee.first_name} ${record.employee.last_name}`,
+      filters:
+        tt_approval_queue
+          .map((l) => l.employeeid)
+          .filter(onlyUnique)
+          .map((s) => {
+            return {
+              text: (() => {
+                const emp = bodyshop.employees.find((e) => e.id === s);
+
+                return `${emp?.first_name} ${emp?.last_name}`;
+              })(), //
+              value: [s],
+            };
+          }) || [],
+      onFilter: (value, record) => value.includes(record.employeeid),
+    },
+    {
+      title: t("timetickets.fields.cost_center"),
+      dataIndex: "cost_center",
+      key: "cost_center",
+      sorter: (a, b) => alphaSort(a.cost_center, b.cost_center),
+      render: (text, record) =>
+        record.cost_center === "timetickets.labels.shift"
+          ? t(record.cost_center)
+          : record.cost_center,
+      sortOrder:
+        state.sortedInfo.columnKey === "cost_center" && state.sortedInfo.order,
+      filters:
+        tt_approval_queue
+          .map((l) => l.cost_center)
+          .filter(onlyUnique)
+          .map((s) => {
+            return {
+              text: s === "timetickets.labels.shift" ? t(s) : s, //|| "No Status*",
+              value: [s],
+            };
+          }) || [],
+      onFilter: (value, record) => value.includes(record.cost_center),
+    },
+    {
+      title: t("jobs.fields.ro_number"),
+      dataIndex: "ro_number",
+      key: "ro_number",
+      sorter: (a, b) =>
+        alphaSort(a.job && a.job.ro_number, b.job && b.job.ro_number),
+      sortOrder:
+        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+      render: (text, record) =>
+        record.job && (
+          <Link to={"/manage/jobs/" + record.job.id}>
+            <Space wrap>
+              {record.job.ro_number || "N/A"}
+              <Tag>{record.job.status}</Tag>
+            </Space>
+          </Link>
+        ),
+    },
+    {
+      title: t("timetickets.fields.productivehrs"),
+      dataIndex: "productivehrs",
+      key: "productivehrs",
+      sorter: (a, b) => a.productivehrs - b.productivehrs,
+      sortOrder:
+        state.sortedInfo.columnKey === "productivehrs" &&
+        state.sortedInfo.order,
+    },
+    {
+      title: t("timetickets.fields.actualhrs"),
+      dataIndex: "actualhrs",
+      key: "actualhrs",
+      sorter: (a, b) => a.actualhrs - b.actualhrs,
+      sortOrder:
+        state.sortedInfo.columnKey === "actualhrs" && state.sortedInfo.order,
+    },
+    {
+      title: t("timetickets.fields.memo"),
+      dataIndex: "memo",
+      key: "memo",
+      sorter: (a, b) => alphaSort(a.memo, b.memo),
+      sortOrder:
+        state.sortedInfo.columnKey === "memo" && state.sortedInfo.order,
+      render: (text, record) =>
+        record.clockon || record.clockoff ? t(record.memo) : record.memo,
+    },
+    {
+      title: t("timetickets.fields.clockon"),
+      dataIndex: "clockon",
+      key: "clockon",
+
+      render: (text, record) => (
+        <DateTimeFormatter>{record.clockon}</DateTimeFormatter>
+      ),
+    },
+    {
+      title: "Pay",
+      dataIndex: "pay",
+      key: "pay",
+      render: (text, record) =>
+        Dinero({ amount: Math.round(record.rate * 100) })
+          .multiply(record.flat_rate ? record.productivehrs : record.actualhrs)
+          .toFormat("$0.00"),
+    },
+  ];
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    search.page = pagination.current;
+    if (sorter && sorter.column && sorter.column.sortObject) {
+      search.searchObj = JSON.stringify(sorter.column.sortObject(sorter.order));
+    } else {
+      delete search.searchObj;
+      search.sortcolumn = sorter.order ? sorter.columnKey : null;
+      search.sortorder = sorter.order;
+    }
+
+    search.sort = JSON.stringify({ [sorter.columnKey]: sorter.order });
+    history.push({ search: queryString.stringify(search) });
+  };
+
+  return (
+    <Card
+      title={t("timetickets.labels.timetickets")}
+      extra={
+        <Space wrap>
+          {extra}
+          <TtApproveButtonComponent
+            selectedTickets={selectedTickets}
+            disabled={selectedTickets.length === 0}
+            completedCallback={setSelectedTickets}
+            refetch={refetch}
+          />
+          <Button onClick={() => refetch()}>
+            <SyncOutlined />
+          </Button>
+        </Space>
+      }
+    >
+      <Table
+        loading={loading}
+        columns={columns}
+        rowKey="id"
+        scroll={{
+          x: true,
+        }}
+        pagination={{
+          position: "top",
+          pageSize: 25,
+          current: parseInt(page || 1),
+          total: total,
+        }}
+        dataSource={tt_approval_queue}
+        onChange={handleTableChange}
+        rowSelection={{
+          onSelectAll: (selected, selectedRows) =>
+            setSelectedTickets(selectedRows.map((i) => i.id)),
+          onSelect: (record, selected, selectedRows, nativeEvent) => {
+            setSelectedTickets(selectedRows.map((i) => i.id));
+          },
+          selectedRowKeys: selectedTickets,
+          type: "checkbox",
+        }}
+      />
+    </Card>
+  );
+}

client/src/components/tt-approvals-list/tt-approvals-list.container.jsx

@@ -0,0 +1,69 @@
+import { useQuery } from "@apollo/client";
+import queryString from "query-string";
+import React from "react";
+import { connect } from "react-redux";
+import { useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import { QUERY_ALL_TT_APPROVALS_PAGINATED } from "../../graphql/tt-approvals.queries";
+import {
+  setBreadcrumbs,
+  setSelectedHeader,
+} from "../../redux/application/application.actions";
+import AlertComponent from "../alert/alert.component";
+import TtApprovalsListComponent from "./tt-approvals-list.component";
+
+const mapStateToProps = createStructuredSelector({});
+
+const mapDispatchToProps = (dispatch) => ({
+  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
+  setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
+});
+
+export function TimeTicketsContainer({
+  bodyshop,
+  setBreadcrumbs,
+  setSelectedHeader,
+}) {
+  const searchParams = queryString.parse(useLocation().search);
+  const { page, sortcolumn, sortorder, search, searchObj } = searchParams;
+
+  const { loading, error, data, refetch } = useQuery(
+    QUERY_ALL_TT_APPROVALS_PAGINATED,
+    {
+      fetchPolicy: "network-only",
+      nextFetchPolicy: "network-only",
+      variables: {
+        search: search || "",
+        offset: page ? (page - 1) * 25 : 0,
+        limit: 25,
+        order: [
+          searchObj
+            ? JSON.parse(searchObj)
+            : {
+                [sortcolumn || "date"]: sortorder
+                  ? sortorder === "descend"
+                    ? "desc"
+                    : "asc"
+                  : "desc",
+              },
+        ],
+      },
+    }
+  );
+
+  if (error) return <AlertComponent message={error.message} type="error" />;
+
+  return (
+    <TtApprovalsListComponent
+      loading={loading}
+      tt_approval_queue={data ? data.tt_approval_queue : []}
+      total={data ? data.tt_approval_queue_aggregate.aggregate.count : 0}
+      refetch={refetch}
+    />
+  );
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TimeTicketsContainer);

client/src/components/tt-approve-button/tt-approve-button.component.jsx

@@ -0,0 +1,103 @@
+import { useApolloClient } from "@apollo/client";
+import { Button, notification } from "antd";
+import _ from "lodash";
+import moment from "moment";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { INSERT_TIME_TICKET_AND_APPROVE } from "../../graphql/timetickets.queries";
+import { QUERY_TT_APPROVALS_BY_IDS } from "../../graphql/tt-approvals.queries";
+import {
+  selectAuthLevel,
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
+  authLevel: selectAuthLevel,
+});
+
+export function TtApproveButton({
+  bodyshop,
+  currentUser,
+  selectedTickets,
+  disabled,
+  authLevel,
+  loadingCallback,
+  completedCallback,
+  refetch,
+}) {
+  const { t } = useTranslation();
+  const client = useApolloClient();
+
+  const [loading, setLoading] = useState(false);
+
+  const handleQbxml = async () => {
+    setLoading(true);
+    try {
+      const { data } = await client.query({
+        query: QUERY_TT_APPROVALS_BY_IDS,
+        variables: { ids: selectedTickets },
+      });
+
+      const insertResponse = await client.mutate({
+        mutation: INSERT_TIME_TICKET_AND_APPROVE,
+        variables: {
+          timeTicketInput: data.tt_approval_queue.map((tta) => ({
+            ..._.omit(tta, ["id", "__typename"]),
+            ttapprovalqueueid: tta.id,
+          })),
+          approvalIds: selectedTickets,
+          approvalUpdate: {
+            approved_at: moment(),
+            approved_by: currentUser.email,
+          },
+        },
+      });
+      if (insertResponse.errors) {
+        notification.open({
+          type: "error",
+          message: t("timetickets.errors.creating", {
+            message: JSON.stringify(insertResponse.errors),
+          }),
+        });
+      } else {
+        notification.open({
+          type: "success",
+          message: t("timetickets.successes.created"),
+        });
+      }
+    } catch (error) {
+      notification.open({
+        type: "error",
+        message: t("timetickets.errors.creating", {
+          message: error.message,
+        }),
+      });
+    } finally {
+      setLoading(false);
+    }
+
+    // if (!!completedCallback) completedCallback([]);
+    // if (!!loadingCallback) loadingCallback(false);
+  };
+
+  return (
+    <Button
+      onClick={handleQbxml}
+      loading={loading}
+      disabled={
+        disabled ||
+        !HasRbacAccess({ bodyshop, authLevel, action: "ttapprovals:approve" })
+      }
+    >
+      {t("tt_approvals.actions.approveselected")}
+    </Button>
+  );
+}
+
+export default connect(mapStateToProps, null)(TtApproveButton);

client/src/components/user-request-pw-reset/user-request-reset-pw.component.jsx

@@ -55,7 +55,7 @@ export function UserRequestResetPw({
   return (
     <div className="login-container">
       <div className="login-logo-container">
-        <img src={ImEXOnlineLogo} height="100" width="100" alt="ImEX Online" />
+        <img src={ImEXOnlineLogo} height="100" width="100" alt="Rome Online" />
         <Typography.Title>{t("titles.app")}</Typography.Title>
       </div>
       <Typography.Title level={3}>{t("titles.resetpassword")}</Typography.Title>

client/src/graphql/bills.queries.js

@@ -24,11 +24,7 @@ export const QUERY_ALL_BILLS_PAGINATED = gql`
     $limit: Int
     $order: [bills_order_by!]!
   ) {
-    bills(
-      offset: $offset
-      limit: $limit
-      order_by: $order
-    ) {
+    bills(offset: $offset, limit: $limit, order_by: $order) {
       id
       vendorid
       vendor {
@@ -97,6 +93,23 @@ export const QUERY_BILLS_BY_JOBID = gql`
       comments
       user_email
     }
+    parts_dispatch(where: { jobid: { _eq: $jobid } }) {
+      id
+      dispatched_at
+      dispatched_by
+      employeeid
+      number
+      parts_dispatch_lines {
+        joblineid
+        id
+        quantity
+        accepted_at
+        jobline {
+          id
+          line_desc
+        }
+      }
+    }
     bills(where: { jobid: { _eq: $jobid } }, order_by: { date: desc }) {
       id
       vendorid

client/src/graphql/bodyshop.queries.js

@@ -117,7 +117,21 @@ export const QUERY_BODYSHOP = gql`
       md_parts_scan
       enforce_conversion_category
       tt_enforce_hours_for_tech_console
+      md_tasks_presets
       use_paint_scale_data
+      employee_teams(
+        order_by: { name: asc }
+        where: { active: { _eq: true } }
+      ) {
+        id
+        name
+        employee_team_members {
+          id
+          employeeid
+          labor_rates
+          percentage
+        }
+      }
       employees {
         user_email
         id
@@ -233,6 +247,20 @@ export const UPDATE_SHOP = gql`
         md_parts_scan
         enforce_conversion_category
         tt_enforce_hours_for_tech_console
+        md_tasks_presets
+        employee_teams(
+          order_by: { name: asc }
+          where: { active: { _eq: true } }
+        ) {
+          id
+          name
+          employee_team_members {
+            id
+            employeeid
+            labor_rates
+            percentage
+          }
+        }
         employees {
           id
           first_name

client/src/graphql/employee_teams.queries.js

@@ -0,0 +1,91 @@
+import { gql } from "@apollo/client";
+
+export const QUERY_TEAMS = gql`
+  query QUERY_TEAMS {
+    employee_teams(order_by: { name: asc }) {
+      id
+      name
+      employee_team_members {
+        id
+        employeeid
+        labor_rates
+        percentage
+      }
+    }
+  }
+`;
+
+export const UPDATE_EMPLOYEE_TEAM = gql`
+  mutation UPDATE_EMPLOYEE_TEAM(
+    $employeeTeamId: uuid!
+    $employeeTeam: employee_teams_set_input
+    $teamMemberDeletes: [uuid!]
+    $teamMemberUpdates: [employee_team_members_updates!]!
+    $teamMemberInserts: [employee_team_members_insert_input!]!
+  ) {
+    update_employee_team_members_many(updates: $teamMemberUpdates) {
+      returning {
+        id
+        labor_rates
+        employeeid
+        percentage
+      }
+    }
+    delete_employee_team_members(where: { id: { _in: $teamMemberDeletes } }) {
+      affected_rows
+    }
+    insert_employee_team_members(objects: $teamMemberInserts) {
+      returning {
+        id
+        labor_rates
+        employeeid
+        percentage
+      }
+    }
+    update_employee_teams_by_pk(
+      pk_columns: { id: $employeeTeamId }
+      _set: $employeeTeam
+    ) {
+      active
+      name
+      id
+      employee_team_members {
+        percentage
+        labor_rates
+        id
+      }
+    }
+  }
+`;
+
+export const INSERT_EMPLOYEE_TEAM = gql`
+  mutation INSERT_EMPLOYEE_TEAM($employeeTeam: employee_teams_insert_input!) {
+    insert_employee_teams_one(object: $employeeTeam) {
+      active
+      name
+      id
+      employee_team_members {
+        employeeid
+        percentage
+        labor_rates
+        id
+      }
+    }
+  }
+`;
+
+export const QUERY_EMPLOYEE_TEAM_BY_ID = gql`
+  query QUERY_EMPLOYEE_TEAM_BY_ID($id: uuid!) {
+    employee_teams_by_pk(id: $id) {
+      id
+      name
+      active
+      employee_team_members {
+        employeeid
+        percentage
+        labor_rates
+        id
+      }
+    }
+  }
+`;

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

@@ -67,6 +67,9 @@ export const GET_LINE_TICKET_BY_PK = gql`
       clockon
       clockoff
       rate
+      committed_at
+      commited_by
+      task_name
       employee {
         id
         first_name
@@ -78,6 +81,65 @@ export const GET_LINE_TICKET_BY_PK = gql`
   }
 `;
 
+export const GET_JOB_INFO_DRAW_CALCULATIONS = gql`
+  query GET_JOB_INFO_DRAW_CALCULATIONS($id: uuid!) {
+    jobs_by_pk(id: $id) {
+      id
+      lbr_adjustments
+      converted
+      rate_lab
+      rate_lad
+      rate_laa
+      rate_la1
+      rate_la2
+      rate_la3
+      rate_la4
+      rate_lau
+      rate_lar
+      rate_lag
+      rate_laf
+      rate_lam
+    }
+    timetickets(where: { jobid: { _eq: $id } }) {
+      actualhrs
+      ciecacode
+      cost_center
+      date
+      id
+      jobid
+      employeeid
+      memo
+      flat_rate
+      clockon
+      clockoff
+      rate
+      employee {
+        id
+        first_name
+        last_name
+        employee_number
+      }
+      productivehrs
+    }
+    joblines(where: { jobid: { _eq: $id }, removed: { _eq: false } }) {
+      id
+      line_desc
+      part_type
+      oem_partno
+      db_price
+      act_price
+      part_qty
+      mod_lbr_ty
+      db_hrs
+      mod_lb_hrs
+      lbr_op
+      lbr_amt
+      op_code_desc
+      convertedtolbr
+      convertedtolbr_data
+    }
+  }
+`;
 export const UPDATE_JOB_LINE_STATUS = gql`
   mutation UPDATE_JOB_LINE_STATUS(
     $ids: [uuid!]!
@@ -184,6 +246,7 @@ export const UPDATE_JOB_LINE = gql`
         removed
         convertedtolbr
         convertedtolbr_data
+        assigned_team
       }
     }
   }
@@ -211,6 +274,7 @@ export const GET_JOB_LINES_TO_ENTER_BILL = gql`
       lbr_amt
       op_code_desc
       alt_partno
+      assigned_team
     }
     jobs_by_pk(id: $id) {
       id
@@ -277,3 +341,30 @@ export const UPDATE_JOB_LINES_IOU = gql`
     }
   }
 `;
+
+export const UPDATE_LINE_PPC = gql`
+  mutation UPDATE_LINE_PPC($id: uuid!, $jobline: joblines_set_input) {
+    update_joblines_by_pk(pk_columns: { id: $id }, _set: $jobline) {
+      jobid
+      id
+      act_price_before_ppc
+      act_price
+    }
+  }
+`;
+
+export const UPDATE_LINE_BULK_ASSIGN = gql`
+  mutation UPDATE_LINE_BULK_ASSIGN(
+    $ids: [uuid!]!
+    $jobline: joblines_set_input
+  ) {
+    update_joblines_many(
+      updates: { _set: $jobline, where: { id: { _in: $ids } } }
+    ) {
+      returning {
+        id
+        assigned_team
+      }
+    }
+  }
+`;

client/src/graphql/jobs.queries.js

@@ -723,7 +723,17 @@ export const GET_JOB_BY_PK = gql`
         ioucreated
         convertedtolbr
         ah_detail_line
+        act_price_before_ppc
         critical
+        parts_dispatch_lines(limit: 1, order_by: { accepted_at: desc }) {
+          id
+          accepted_at
+          parts_dispatch {
+            id
+            employeeid
+          }
+        }
+        assigned_team
         billlines(limit: 1, order_by: { bill: { date: desc } }) {
           id
           quantity
@@ -769,6 +779,10 @@ export const GET_JOB_BY_PK = gql`
         }
       }
       cieca_ttl
+      cieca_pfo
+      cieca_pfl
+      cieca_pft
+      materials
       csiinvites {
         id
         completedon
@@ -868,10 +882,52 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         count
         status
       }
-      joblines(where: { removed: { _eq: false } }) {
+
+      joblines(
+        where: {
+          removed: { _eq: false }
+          part_type: { _is_null: false, _nin: ["PAE", "PAS", "PASL"] }
+        }
+        order_by: { line_no: asc }
+      ) {
         id
+        alt_partm
+        line_no
+        unq_seq
+        line_ind
+        line_desc
+        line_ref
+        part_type
+        part_qty
         mod_lbr_ty
+        db_hrs
         mod_lb_hrs
+        lbr_op
+        lbr_amt
+        op_code_desc
+        status
+        notes
+        location
+        tax_part
+        db_ref
+        manual_line
+        prt_dsmk_p
+        prt_dsmk_m
+        ioucreated
+        convertedtolbr
+        critical
+        parts_dispatch_lines {
+          id
+          accepted_at
+          quantity
+          parts_dispatch {
+            id
+            employeeid
+            dispatched_at
+            dispatched_by
+            number
+          }
+        }
       }
       owner {
         id
@@ -2140,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
@@ -2158,3 +2226,37 @@ export const GET_JOB_LINE_ORDERS = gql`
     }
   }
 `;
+
+export const QUERY_COMPLETED_TASKS = gql`
+  query QUERY_COMPLETED_TASKS($jobid: uuid!) {
+    jobs_by_pk(id: $jobid) {
+      id
+      completed_tasks
+    }
+  }
+`;
+
+export const QUERY_JOBS_TECH_ASIGNED_TO_BY_TEAM = gql`
+  query QUERY_JOBS_TECH_ASIGNED_TO_BY_TEAM($teamIds: [uuid!]!) {
+    jobs(
+      where: {
+        inproduction: { _eq: true }
+        joblines: { assigned_team: { _in: $teamIds } }
+      }
+    ) {
+      id
+      v_make_desc
+      v_model_desc
+      v_color
+      v_vin
+      plate_no
+      plate_st
+      clm_no
+      ownr_fn
+      ownr_ln
+      ownr_co_nm
+      status
+      ro_number
+    }
+  }
+`;