Merged in release/2023-11-24 (pull request #1076)

IO-2438 Remove unneeded imports

.circleci/config.yml

@@ -8,13 +8,13 @@ orbs:
 jobs:
   api-deploy:
     docker:
-      - image: "cimg/base:stable"
+      - image: cimg/node:18.18.2
     steps:
       - checkout
       - eb/setup
       - run:
           command: |
-            eb init imex-online-production-api -r ca-central-1 -p "Node.js 16 running on 64bit Amazon Linux 2"
+            eb init imex-online-production-api -r ca-central-1 -p "Node.js 18 running on 64bit Amazon Linux 2"
             eb status --verbose
             eb deploy
             eb status
@@ -68,120 +68,6 @@ 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:
@@ -279,19 +165,6 @@ 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:
@@ -301,15 +174,6 @@ 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:

.gitignore

@@ -117,4 +117,6 @@ logs/oAuthClient-log.log
 
 .node-persist/**
 
-/*.env.*
+/*.env.*
+.idea/*
+.idea

.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

client/.env.development

@@ -1,14 +1,13 @@
 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": "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_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_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='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
 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_COUNTRY=USA
+REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc

client/.env.production

@@ -1,13 +1,14 @@
-REACT_APP_GRAPHQL_ENDPOINT=https://db.romeonline.io/v1/graphql
-REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.romeonline.io/v1/graphql
+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_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_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_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='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BMgZT1NZztW2DsJl8Mg2L04hgY9FzAg6b8fbzgNAfww2VDzH3VE63Ot9EaP_U7KWS2JT-7HPHaw0T_Tw_5vkZc8'
 REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-REACT_APP_AXIOS_BASE_API_URL=https://api.romeonline.io/
-REACT_APP_REPORTS_SERVER_URL=https://reports.romeonline.io
+REACT_APP_AXIOS_BASE_API_URL=https://api.imex.online/
+REACT_APP_REPORTS_SERVER_URL=https://reports.imex.online
 REACT_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk

client/.env.test

@@ -1,14 +1,14 @@
-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_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_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='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BN2GcDPjipR5MTEosO5dT4CfQ3cmrdBIsI4juoOQrRijn_5aRiHlwj1mlq0W145mOusx6xynEKl_tvYJhpCc9lo'
 REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-REACT_APP_AXIOS_BASE_API_URL=https://api.test.romeonline.io/
-REACT_APP_REPORTS_SERVER_URL=https://reports.test.romeonline.io
+REACT_APP_AXIOS_BASE_API_URL=https://api.test.imex.online/
+REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 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: "rome-online",
+        project: "imexonline",
         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": "#B22234" }
+                ? { "@primary-color": "#a51d1d" }
                 : {
                     //"@primary-color": "#1DA57A"
                   }),

client/package.json

@@ -7,7 +7,7 @@
     "@apollo/client": "^3.7.9",
     "@asseinfo/react-kanban": "^2.2.0",
     "@craco/craco": "^7.0.0",
-    "@fingerprintjs/fingerprintjs": "^3.3.3",
+    "@fingerprintjs/fingerprintjs": "^3.4.2",
     "@jsreport/browser-client": "^3.1.0",
     "@sentry/react": "^7.40.0",
     "@sentry/tracing": "^7.40.0",
@@ -89,8 +89,8 @@
     "analyze": "source-map-explorer 'build/static/js/*.js'",
     "start": "craco start",
     "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
-    "build:test": "env-cmd -f .env.test yarn run build",
-    "build-deploy:test": "yarn run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
+    "build:test": "env-cmd -f .env.test npm run build",
+    "build-deploy:test": "npm run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
     "buildcra": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
     "test": "cypress open",
     "eject": "react-scripts eject",

client/public/firebase-messaging-sw.js

@@ -28,17 +28,6 @@ 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,12 +2,23 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/ro-favicon.png" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#002366" />
-    <meta name="description" content="Rome Online" />
+    <meta name="description" content="ImEX Online" />
     <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
     <link rel="apple-touch-icon" href="logo192.png" />
+    <script type="text/javascript">
+      window.$crisp = [];
+      window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
+      (function () {
+        d = document;
+        s = d.createElement("script");
+        s.src = "https://client.crisp.chat/l.js";
+        s.async = 1;
+        d.getElementsByTagName("head")[0].appendChild(s);
+      })();
+    </script>
     <script>
       !(function () {
         "use strict";
@@ -66,7 +77,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>Rome Online</title>
+    <title>ImEX 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": "Rome Online",
-  "name": "Rome Online",
+  "short_name": "ImEX Online",
+  "name": "ImEX Online",
   "description": "The ultimate bodyshop management system.",
   "icons": [
     {

client/src/App/App.container.jsx

@@ -27,12 +27,6 @@ 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") {
-        LogRocket.init("rome-online/rome-online");
+        console.log("LR Start");
+        LogRocket.init("gvfvfw/bodyshopapp");
       }
     }
   }, [bodyshop, client, currentUser.authorized]);
@@ -109,7 +109,7 @@ export function App({
 
   return (
     <Switch>
-      <Suspense fallback={<LoadingSpinner />}>
+      <Suspense fallback={<LoadingSpinner message="ImEX Online" />}>
         <ErrorBoundary>
           <Route exact path="/" component={LandingPage} />
         </ErrorBoundary>

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

@@ -29,7 +29,6 @@ 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,
@@ -38,8 +37,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, billid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, billid, operation })),
 });
 
 const Templates = TemplateList("job_special");
@@ -64,11 +63,6 @@ function BillEnterModalContainer({
     "enter_bill_generate_label",
     false
   );
-  const { Enhanced_Payroll } = useTreatments(
-    ["Enhanced_Payroll"],
-    {},
-    bodyshop.imexshopid
-  );
   const formValues = useMemo(() => {
     return {
       ...billEnterModal.context.bill,
@@ -104,7 +98,6 @@ function BillEnterModalContainer({
     } = values;
 
     let adjustmentsToInsert = {};
-    let payrollAdjustmentsToInsert = [];
 
     const r1 = await insertBill({
       variables: {
@@ -123,28 +116,11 @@ function BillEnterModalContainer({
                     ...restI
                   } = i;
 
-                  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;
-                    }
+                  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,
@@ -167,23 +143,9 @@ function BillEnterModalContainer({
           },
         ],
       },
-      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
+      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID", "GET_JOB_BY_PK"],
     });
 
-    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.
@@ -354,16 +316,18 @@ function BillEnterModalContainer({
     insertAuditTrail({
       jobid: values.jobid,
       billid: billId,
-      operation: AuditTrailMapping.billposted(remainingValues.invoice_number),
+      operation: AuditTrailMapping.billposted(
+        r1.data.insert_bills.returning[0].invoice_number
+      ),
     });
 
     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

@@ -50,6 +50,7 @@ export function BillFormComponent({
   job,
   loadOutstandingReturns,
   loadInventory,
+  preferredMake,
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
@@ -185,6 +186,7 @@ export function BillFormComponent({
           <VendorSearchSelect
             disabled={disabled}
             options={vendorAutoCompleteOptions}
+            preferredMake={preferredMake}
             onSelect={handleVendorSelect}
           />
         </Form.Item>
@@ -364,15 +366,13 @@ 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")}
@@ -380,15 +380,13 @@ 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([
@@ -414,25 +412,21 @@ 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.container.jsx

@@ -1,16 +1,16 @@
 import { useLazyQuery, useQuery } from "@apollo/client";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { QUERY_OUTSTANDING_INVENTORY } from "../../graphql/inventory.queries";
 import { GET_JOB_LINES_TO_ENTER_BILL } from "../../graphql/jobs-lines.queries";
+import { QUERY_UNRECEIVED_LINES } from "../../graphql/parts-orders.queries";
 import { SEARCH_VENDOR_AUTOCOMPLETE } from "../../graphql/vendors.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import BillFormComponent from "./bill-form.component";
 import BillCmdReturnsTableComponent from "../bill-cm-returns-table/bill-cm-returns-table.component";
-import { QUERY_UNRECEIVED_LINES } from "../../graphql/parts-orders.queries";
 import BillInventoryTable from "../bill-inventory-table/bill-inventory-table.component";
-import { QUERY_OUTSTANDING_INVENTORY } from "../../graphql/inventory.queries";
-import { useTreatments } from "@splitsoftware/splitio-react";
+import BillFormComponent from "./bill-form.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -59,6 +59,7 @@ export function BillFormContainer({
         disableInvNumber={disableInvNumber}
         loadOutstandingReturns={loadOutstandingReturns}
         loadInventory={loadInventory}
+        preferredMake={lineData ? lineData.jobs_by_pk.v_make_desc : null}
       />
       {!billEdit && (
         <BillCmdReturnsTableComponent

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

@@ -1,15 +1,14 @@
 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";
@@ -46,13 +45,6 @@ export function BillEnterModalLinesComponent({
     {},
     bodyshop && bodyshop.imexshopid
   );
-
-  const { Enhanced_Payroll } = useTreatments(
-    ["Enhanced_Payroll"],
-    {},
-    bodyshop.imexshopid
-  );
-
   const columns = (remove) => {
     return [
       {
@@ -383,31 +375,12 @@ 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,
@@ -461,44 +434,22 @@ export function BillEnterModalLinesComponent({
                         </Select.Option>
                       </Select>
                     </Form.Item>
-                    {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>
+                    <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`}
                   </div>
                 );
               return <></>;
@@ -506,21 +457,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",
@@ -535,20 +486,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,12 +63,6 @@ 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/chat-open-button/chat-open-button.component.jsx

@@ -8,15 +8,23 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { searchingForConversation } from "../../redux/messaging/messaging.selectors";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
+  searchingForConversation: searchingForConversation,
 });
 
 const mapDispatchToProps = (dispatch) => ({
   openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
 });
 
-export function ChatOpenButton({ bodyshop, phone, jobid, openChatByPhone }) {
+export function ChatOpenButton({
+  bodyshop,
+  searchingForConversation,
+  phone,
+  jobid,
+  openChatByPhone,
+}) {
   const { t } = useTranslation();
   if (!phone) return <></>;
 
@@ -29,7 +37,7 @@ export function ChatOpenButton({ bodyshop, phone, jobid, openChatByPhone }) {
       onClick={(e) => {
         e.stopPropagation();
         const p = parsePhoneNumber(phone, "CA");
-
+        if (searchingForConversation) return; //This is to prevent finding the same thing twice.
         if (p && p.isValid()) {
           openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid });
         } else {

client/src/components/contract-jobs/contract-jobs.container.jsx

@@ -2,10 +2,10 @@ import { useQuery } from "@apollo/client";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import ContractJobsComponent from "./contract-jobs.component";
-import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -15,6 +15,7 @@ export function ContractJobsContainer({ selectedJobState, bodyshop }) {
   const { loading, error, data } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
     variables: {
       statuses: bodyshop.md_ro_statuses.active_statuses || ["Open"],
+      isConverted: true,
     },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",

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

@@ -4,14 +4,14 @@ import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
+import { setModalContext } from "../../redux/modals/modals.actions";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import ContractsFindModalContainer from "../contracts-find-modal/contracts-find-modal.container";
-import { setModalContext } from "../../redux/modals/modals.actions";
 
+import moment from "moment";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import moment from "moment";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({

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

@@ -34,6 +34,18 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
 
       {/* <FormFieldsChanged form={form} /> */}
       <LayoutFormRow header={t("courtesycars.labels.vehicle")}>
+        <Form.Item
+          label={t("courtesycars.fields.year")}
+          name="year"
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <Input />
+        </Form.Item>
         <Form.Item
           label={t("courtesycars.fields.make")}
           name="make"
@@ -58,18 +70,6 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         >
           <Input />
         </Form.Item>
-        <Form.Item
-          label={t("courtesycars.fields.year")}
-          name="year"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
         <Form.Item
           label={t("courtesycars.fields.plate")}
           name="plate"
@@ -118,7 +118,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
             },
           ]}
         >
-          <InputNumber precision={0} />
+          <InputNumber min={0} precision={0} />
         </Form.Item>
         <Form.Item
           label={t("courtesycars.fields.fleetnumber")}
@@ -213,49 +213,24 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         >
           <CourtesyCarStatus />
         </Form.Item>
-        <Form.Item
-          label={t("courtesycars.fields.nextservicekm")}
-          name="nextservicekm"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <InputNumber />
-        </Form.Item>
         <div>
           <Form.Item
-            label={t("courtesycars.fields.nextservicedate")}
-            name="nextservicedate"
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-              },
-            ]}
+            label={t("courtesycars.fields.nextservicekm")}
+            name="nextservicekm"
           >
-            <FormDatePicker />
+            <InputNumber min={0} precision={0} />
           </Form.Item>
           <Form.Item
             shouldUpdate={(p, c) =>
-              p.mileage !== c.mileage ||
-              p.nextservicedate !== c.nextservicedate ||
-              p.nextservicekm !== c.nextservicekm
+              p.mileage !== c.mileage || p.nextservicekm !== c.nextservicekm
             }
           >
             {() => {
-              const nextservicedate = form.getFieldValue("nextservicedate");
               const nextservicekm = form.getFieldValue("nextservicekm");
-
               const mileageOver =
                 nextservicekm <= form.getFieldValue("mileage");
 
-              const dueForService =
-                nextservicedate && moment(nextservicedate).isBefore(moment());
-
-              if (mileageOver || dueForService)
+              if (mileageOver)
                 return (
                   <Space direction="vertical" style={{ color: "tomato" }}>
                     <span>
@@ -263,6 +238,36 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
                       {t("contracts.labels.cardueforservice")}
                     </span>
                     <span>{`${nextservicekm} km`}</span>
+                  </Space>
+                );
+
+              return <></>;
+            }}
+          </Form.Item>
+        </div>
+        <div>
+          <Form.Item
+            label={t("courtesycars.fields.nextservicedate")}
+            name="nextservicedate"
+          >
+            <FormDatePicker />
+          </Form.Item>
+          <Form.Item
+            shouldUpdate={(p, c) => p.nextservicedate !== c.nextservicedate}
+          >
+            {() => {
+              const nextservicedate = form.getFieldValue("nextservicedate");
+              const dueForService =
+                nextservicedate &&
+                moment(nextservicedate).endOf("day").isSameOrBefore(moment());
+
+              if (dueForService)
+                return (
+                  <Space direction="vertical" style={{ color: "tomato" }}>
+                    <span>
+                      <WarningFilled style={{ marginRight: ".3rem" }} />
+                      {t("contracts.labels.cardueforservice")}
+                    </span>
                     <span>
                       <DateFormatter>{nextservicedate}</DateFormatter>
                     </span>
@@ -283,12 +288,6 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
           <Form.Item
             label={t("courtesycars.fields.registrationexpires")}
             name="registrationexpires"
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-              },
-            ]}
           >
             <FormDatePicker />
           </Form.Item>
@@ -300,7 +299,8 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
             {() => {
               const expires = form.getFieldValue("registrationexpires");
 
-              const dateover = expires && moment(expires).isBefore(moment());
+              const dateover =
+                expires && moment(expires).endOf("day").isBefore(moment());
 
               if (dateover)
                 return (
@@ -330,14 +330,13 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
             <FormDatePicker />
           </Form.Item>
           <Form.Item
-            shouldUpdate={(p, c) =>
-              p.insuranceexpires !== c.insuranceexpires
-            }
+            shouldUpdate={(p, c) => p.insuranceexpires !== c.insuranceexpires}
           >
             {() => {
               const expires = form.getFieldValue("insuranceexpires");
 
-              const dateover = expires && moment(expires).isBefore(moment());
+              const dateover =
+                expires && moment(expires).endOf("day").isBefore(moment());
 
               if (dateover)
                 return (

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

@@ -9,15 +9,15 @@ import {
   Table,
   Tooltip,
 } from "antd";
+import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
-import { alphaSort } from "../../utils/sorters";
-import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
-import moment from "moment";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { alphaSort } from "../../utils/sorters";
+import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
   const [state, setState] = useState({
     sortedInfo: {},
@@ -115,6 +115,14 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       sortOrder:
         state.sortedInfo.columnKey === "model" && state.sortedInfo.order,
     },
+    {
+      title: t("courtesycars.fields.color"),
+      dataIndex: "color",
+      key: "color",
+      sorter: (a, b) => alphaSort(a.color, b.color),
+      sortOrder:
+        state.sortedInfo.columnKey === "color" && state.sortedInfo.order,
+    },
     {
       title: t("courtesycars.fields.plate"),
       dataIndex: "plate",
@@ -166,6 +174,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           (c.year || "").toLowerCase().includes(searchText.toLowerCase()) ||
           (c.make || "").toLowerCase().includes(searchText.toLowerCase()) ||
           (c.model || "").toLowerCase().includes(searchText.toLowerCase()) ||
+          (c.plate || "").toLowerCase().includes(searchText.toLowerCase()) ||
           (t(c.status) || "").toLowerCase().includes(searchText.toLowerCase())
       )
     : courtesycars;

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

@@ -191,6 +191,13 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
               >
                 <Switch />
               </Form.Item>
+              <Form.Item
+                name="dms_model_override"
+                label={t("jobs.fields.dms.dms_model_override")}
+                initialValue={false}
+              >
+                <Switch />
+              </Form.Item>
             </Space>
           </div>
         )}

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

@@ -109,7 +109,7 @@ export function EmailOverlayContainer({
               ]
             : []),
         ],
-        media: selectedMedia.filter((m) => m.isSelected).map((m) => m.src),
+        media: selectedMedia.filter((m) => m.isSelected).map((m) => m.fullsize),
         //attachments,
       });
       notification["success"]({ message: t("emails.successes.sent") });

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

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

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

@@ -1,33 +0,0 @@
-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,26 +1,9 @@
 import Dinero from "dinero.js";
 import React, { forwardRef } from "react";
 
-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
-) => {
+const ReadOnlyFormItem = ({ 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":
@@ -31,8 +14,4 @@ const ReadOnlyFormItem = (
       return <div>{value}</div>;
   }
 };
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(forwardRef(ReadOnlyFormItem));
+export default forwardRef(ReadOnlyFormItem);

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

@@ -54,6 +54,7 @@ export default function GlobalSearchOs() {
                         job.v_make_desc || ""
                       } ${job.v_model_desc || ""}`}</span>
                       <span>{`${job.clm_no || ""}`}</span>
+                      <span>{`${job.plate_no || ""}`}</span>
                     </Space>
                   </Link>
                 ),

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

@@ -268,13 +268,6 @@ 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} />}
@@ -389,12 +382,20 @@ function Header({
           <Menu.Item
             key="help"
             onClick={() => {
-              window.open("https://rometech.com/", "_blank");
+              window.open("https://help.imex.online/", "_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-at-change/schedule-event.component.jsx

@@ -4,6 +4,7 @@ import {
   Divider,
   Dropdown,
   Form,
+  Input,
   Menu,
   notification,
   Popover,
@@ -34,6 +35,8 @@ import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
+import { useMutation } from "@apollo/client";
+import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -58,16 +61,44 @@ export function ScheduleEventComponent({
   const [visible, setVisible] = useState(false);
   const history = useHistory();
   const searchParams = queryString.parse(useLocation().search);
-
+  const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
+  const [title, setTitle] = useState(event.title);
   const blockContent = (
-    <div>
+    <Space direction="vertical" wrap>
+      <Input
+        value={title}
+        onChange={(e) => setTitle(e.currentTarget.value)}
+        onBlur={async () => {
+          await updateAppointment({
+            variables: {
+              appid: event.id,
+              app: {
+                title: title,
+              },
+            },
+            optimisticResponse: {
+              update_appointments: {
+                __typename: "appointments_mutation_response",
+                returning: [
+                  {
+                    ...event,
+                    title: title,
+                    __typename: "appointments",
+                  },
+                ],
+              },
+            },
+          });
+        }}
+      />
+
       <Button
         onClick={() => handleCancel({ id: event.id })}
         disabled={event.arrived}
       >
-        {t("appointments.actions.cancel")}
+        {t("appointments.actions.unblock")}
       </Button>
-    </div>
+    </Space>
   );
 
   const popoverContent = (

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

@@ -2,12 +2,16 @@ import { useMutation } from "@apollo/client";
 import { notification } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { useDispatch } from "react-redux";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENT_BY_ID } from "../../graphql/appointments.queries";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import ScheduleEventComponent from "./schedule-event.component";
 
 export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
+  const dispatch = useDispatch();
   const { t } = useTranslation();
   const [cancelAppointment] = useMutation(CANCEL_APPOINTMENT_BY_ID);
   const [updateJob] = useMutation(UPDATE_JOB);
@@ -34,16 +38,24 @@ export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
       const jobUpdate = await updateJob({
         variables: {
           jobId: event.job.id,
-
           job: {
             date_scheduled: null,
             scheduled_in: null,
             scheduled_completion: null,
             lost_sale_reason,
+            date_lost_sale: new Date(),
             status: bodyshop.md_ro_statuses.default_imported,
           },
         },
       });
+      if (!jobUpdate.errors) {
+        dispatch(
+          insertAuditTrail({
+            jobid: event.job.id,
+            operation: AuditTrailMapping.appointmentcancel(lost_sale_reason),
+          })
+        );
+      }
       if (!!jobUpdate.errors) {
         notification["error"]({
           message: t("jobs.errors.updating", {

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

@@ -1,52 +1,47 @@
 import { Button, notification } from "antd";
 import Axios from "axios";
 import React, { useState } from "react";
+import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
-export default function JobCalculateTotals({ job, disabled, refetch }) {
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import Dinero from "dinero.js";
+export default function JobCalculateTotals({ job, disabled }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
+  const [updateJob] = useMutation(UPDATE_JOB);
 
   const handleCalculate = async () => {
-    try {
-      setLoading(true);
+    setLoading(true);
+    const newTotals = (
+      await Axios.post("/job/totals", {
+        job: job,
+      })
+    ).data;
 
-      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) {
+    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(error),
+          error: JSON.stringify(result.errors),
         }),
       });
-    } finally {
-      setLoading(false);
     }
+    setLoading(false);
   };
 
   return (

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

@@ -1,5 +1,6 @@
 import { useMutation } from "@apollo/client";
 import { Button, Card, Form, Input, notification, Switch } from "antd";
+import moment from "moment-business-days";
 import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -12,16 +13,15 @@ import {
   MARK_LATEST_APPOINTMENT_ARRIVED,
 } from "../../../../graphql/appointments.queries";
 import { UPDATE_JOB } from "../../../../graphql/jobs.queries";
+import { UPDATE_OWNER } from "../../../../graphql/owners.queries";
+import { insertAuditTrail } from "../../../../redux/application/application.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../../../redux/user/user.selectors";
+import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
 import ConfigFormComponents from "../../../config-form-components/config-form-components.component";
 import DateTimePicker from "../../../form-date-time-picker/form-date-time-picker.component";
-import moment from "moment-business-days";
-import { insertAuditTrail } from "../../../../redux/application/application.actions";
-import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
-import { UPDATE_OWNER } from "../../../../graphql/owners.queries";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -230,6 +230,7 @@ export function JobChecklistForm({
                 )),
             scheduled_delivery:
               job.scheduled_delivery && moment(job.scheduled_delivery),
+            production_vars: job.production_vars,
           }),
           ...(type === "deliver" && {
             removeFromProduction: true,

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

@@ -32,9 +32,9 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 const span = {
-  lg: { span: 24 },
-  xl: { span: 12 },
-  xxl: { span: 8 },
+  sm: { span: 24 },
+  md: { span: 12 },
+  lg: { span: 8 },
 };
 
 export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
@@ -137,6 +137,12 @@ 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}
@@ -157,12 +163,6 @@ 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,119 +1,16 @@
-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";
 
-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 }) {
+export default function JobDetailCardsPartsComponent({ loading, data }) {
   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,18 +8,7 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.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)(JobLinesExpander);
-
-export function JobLinesExpander({ jobline, jobid, bodyshop }) {
+export default function JobLinesExpander({ jobline, jobid }) {
   const { t } = useTranslation();
   const { loading, error, data } = useQuery(GET_JOB_LINE_ORDERS, {
     fetchPolicy: "network-only",
@@ -34,7 +23,7 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
 
   return (
     <Row>
-      <Col md={24} lg={8}>
+      <Col md={24} lg={12}>
         <Typography.Title level={4}>
           {t("parts_orders.labels.parts_orders")}
         </Typography.Title>
@@ -60,7 +49,7 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
           )}
         </Timeline>
       </Col>
-      <Col md={24} lg={8}>
+      <Col md={24} lg={12}>
         <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
         <Timeline>
           {data.billlines.length > 0 ? (
@@ -82,7 +71,7 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
                   </Col>
                   <Col span={4}>
                     <span>
-                      {`${t("billlines.fields.actual_cost")}: `}
+                    {`${t("billlines.fields.actual_cost")}: `}
                       <CurrencyFormatter>{line.actual_cost}</CurrencyFormatter>
                     </span>
                   </Col>
@@ -100,37 +89,6 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
           )}
         </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

@@ -1,97 +0,0 @@
-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,6 +29,7 @@ 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";
@@ -37,18 +38,13 @@ 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 _ from "lodash";
-import moment from "moment";
-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 _ from "lodash";
+import JobCreateIOU from "../job-create-iou/job-create-iou.component";
 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";
+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";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -80,16 +76,8 @@ 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: {},
@@ -133,21 +121,10 @@ export function JobLinesComponent({
       sortOrder:
         state.sortedInfo.columnKey === "oem_partno" && state.sortedInfo.order,
       ellipsis: true,
-      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>
-      ),
+      render: (text, record) =>
+        `${record.oem_partno || ""} ${
+          record.alt_partno ? `(${record.alt_partno})` : ""
+        }`.trim(),
     },
     {
       title: t("joblines.fields.op_code_desc"),
@@ -243,7 +220,20 @@ export function JobLinesComponent({
         state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
       ellipsis: true,
       render: (text, record) => (
-        <JobLinesPartPriceChange line={record} job={job} refetch={refetch} />
+        <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>
       ),
     },
     {
@@ -296,23 +286,6 @@ 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",
@@ -431,11 +404,7 @@ export function JobLinesComponent({
       setSelectedLines((selectedLines) =>
         _.uniq([
           ...selectedLines,
-          ...jobLines.filter(
-            (item) =>
-              markedTypes.includes(item.part_type) ||
-              markedTypes.includes(item.mod_lbr_ty)
-          ),
+          ...jobLines.filter((item) => markedTypes.includes(item.part_type)),
         ])
       );
     }
@@ -448,21 +417,6 @@ 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>
   );
@@ -486,18 +440,6 @@ 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) ||
@@ -506,6 +448,15 @@ export function JobLinesComponent({
                 technician
               }
               onClick={() => {
+                // setPartsOrderContext({
+                //   actions: { refetch: refetch },
+                //   context: {
+                //     jobId: job.id,
+                //     job: job,
+                //     linesToOrder: selectedLines,
+                //   },
+                // });
+
                 setBillEnterContext({
                   actions: { refetch: refetch },
                   context: {
@@ -612,9 +563,6 @@ 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

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

@@ -1,167 +0,0 @@
-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,6 +1,6 @@
-import { notification, Select, Space } from "antd";
-import React, { useEffect, useState } from "react";
 import { useMutation } from "@apollo/client";
+import { notification, Select } from "antd";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -56,8 +56,10 @@ export function JobLineLocationPopup({ bodyshop, jobline, disabled }) {
         <LoadingSpinner loading={loading}>
           <Select
             autoFocus
+            allowClear
             dropdownMatchSelectWidth={100}
             value={location}
+            onClear={() => setLocation(null)}
             onSelect={handleChange}
             onBlur={handleSave}
           >
@@ -75,10 +77,7 @@ export function JobLineLocationPopup({ bodyshop, jobline, disabled }) {
       style={{ width: "100%", minHeight: "2rem", cursor: "pointer" }}
       onClick={() => !disabled && setEditing(true)}
     >
-      <Space wrap>
-        {jobline.location}
-        {jobline.parts_dispatch_lines?.length > 0 && "-Disp"}
-      </Space>
+      {jobline.location}
     </div>
   );
 }

client/src/components/job-line-team-assignment/job-line-team-assignmnent.component.jsx

@@ -1,115 +0,0 @@
-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-lines-bill-reference/job-lines-bill-reference.component.jsx

@@ -8,7 +8,7 @@ export default function JobLinesBillRefernece({ jobline }) {
   return (
     <div style={{ color: subletRequired && "tomato" }}>
       {subletRequired && <WarningFilled />}
-      {`${(billLine.actual_price * billLine.quantity).toFixed(2)} (${
+      {`${billLine.actual_price.toFixed(2)} x ${billLine.quantity} (${
         billLine.bill.vendor.name
       } #${billLine.bill.invoice_number})`}
     </div>

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

@@ -1,18 +0,0 @@
-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-search-select/job-search-select.component.jsx

@@ -33,7 +33,9 @@ const JobSearchSelect = (
     useLazyQuery(SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE);
 
   const executeSearch = (v) => {
-    if (v && v !== "") callSearch(v);
+    console.log(v);
+    if (v && v.variables?.search !== "" && v.variables.search.length >= 2)
+      callSearch(v);
   };
   const debouncedExecuteSearch = _.debounce(executeSearch, 500);
 

client/src/components/job-send-parts-price-change/job-send-parts-price-change.component.jsx

@@ -1,31 +0,0 @@
-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,8 +67,7 @@ export function JobsTotalsTableComponent({ jobRO, currentUser, job }) {
                 <JobTotalsTableTotals job={job} />
               </Card>
             </Col>
-            {(currentUser.email.includes("@imex.") ||
-              currentUser.email.includes("@rome.")) && (
+            {currentUser.email.includes("@imex.") && (
               <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,10 +123,11 @@ export default function JobTotalsTableLabor({ job }) {
               <Space>
                 {t("jobs.labels.mapa")}
                 {job.materials &&
-                  job.materials.MAPA &&
-                  job.materials.MAPA.cal_maxdlr !== undefined &&
+                  job.materials.mapa &&
+                  job.materials.mapa.cal_maxdlr &&
+                  job.materials.mapa.cal_maxdlr > 0 &&
                   t("jobs.labels.threshhold", {
-                    amount: job.materials.MAPA.cal_maxdlr,
+                    amount: job.materials.mapa.cal_maxdlr,
                   })}
               </Space>
             </Table.Summary.Cell>
@@ -147,10 +148,11 @@ export default function JobTotalsTableLabor({ job }) {
               <Space wrap>
                 {t("jobs.labels.mash")}
                 {job.materials &&
-                  job.materials.MASH &&
-                  job.materials.MASH.cal_maxdlr !== undefined &&
+                  job.materials.mash &&
+                  job.materials.mash.cal_maxdlr &&
+                  job.materials.mash.cal_maxdlr > 0 &&
                   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,22 +11,6 @@ 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(
@@ -90,11 +74,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>
@@ -106,24 +90,6 @@ 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,46 +28,26 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
         total: job.job_totals.totals.subtotal,
         bold: true,
       },
-
-      ...(job.job_totals.totals.us_sales_tax_breakdown
+      {
+        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"
         ? [
             {
-              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.fields.ca_bc_pvrt"),
+              total: job.job_totals.additional.pvrt,
             },
           ]
-        : [
-            {
-              key: t("jobs.labels.state_tax_amt"),
-              total: job.job_totals.totals.state_tax,
-            },
-          ]),
+        : []),
+      {
+        key: t("jobs.labels.federal_tax_amt"),
+        total: job.job_totals.totals.federal_tax,
+      },
       {
         key: t("jobs.labels.total_repairs"),
         total: job.job_totals.totals.total_repairs,
@@ -77,10 +57,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,
@@ -101,7 +81,7 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
         bold: true,
       },
     ];
-  }, [job.job_totals, t, bodyshop.md_responsibility_centers]);
+  }, [job.job_totals, t, bodyshop.region_config]);
 
   const columns = [
     {

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

@@ -13,6 +13,7 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { insertAuditTrail } from "../../redux/application/application.actions";
+import { DateTimeFormat } from "./../../utils/DateFormatter";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -53,7 +54,7 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
         operation: AuditTrailMapping.admin_jobfieldchange(
           key,
           changedAuditFields[key] instanceof moment
-            ? moment(changedAuditFields[key]).format("MM/DD/YYYY hh:mm a")
+            ? DateTimeFormat(changedAuditFields[key])
             : changedAuditFields[key]
         ),
       });
@@ -179,6 +180,12 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
           <Form.Item label={t("jobs.fields.date_void")} name="date_void">
             <DateTimePicker />
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.date_lost_sale")}
+            name="date_lost_sale"
+          >
+            <DateTimePicker />
+          </Form.Item>
         </LayoutFormRow>
       </Form>
 

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, act_price_before_ppc: null },
+        newData: { ...newLine, removed: false },
       });
 
       //Splice out item we found for performance.
@@ -50,6 +50,7 @@ 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 { Button, Col, Row, notification } from "antd";
+import { Col, notification, Row } from "antd";
 import Axios from "axios";
-import _ from "lodash";
+import Dinero from "dinero.js";
 import moment from "moment";
 import queryString from "query-string";
 import React, { useCallback, useEffect, useState } from "react";
@@ -30,6 +30,7 @@ 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";
@@ -72,6 +73,8 @@ export function JobsAvailableContainer({
 
   const [selectedJob, setSelectedJob] = useState(null);
   const [selectedOwner, setSelectedOwner] = useState(null);
+  const [partsQueueToggle, setPartsQueueToggle] = useState(bodyshop.md_functionality_toggles.parts_queue_toggle);
+
   const [insertLoading, setInsertLoading] = useState(false);
 
   const [insertNote] = useMutation(INSERT_NEW_NOTE);
@@ -89,14 +92,14 @@ export function JobsAvailableContainer({
   const modalSearchState = useState("");
 
   //Import Scenario
-  const onOwnerFindModalOk = async (lazyData) => {
+  const onOwnerFindModalOk = async () => {
     logImEXEvent("job_import_new");
 
     setOwnerModalVisible(false);
+
     setInsertLoading(true);
-    const estData = replaceEmpty(
-      lazyData?.available_jobs_by_pk || estDataRaw.data.available_jobs_by_pk
-    );
+
+    const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
 
     if (!(estData && estData.est_data)) {
       //We don't have the right data. Error!
@@ -106,25 +109,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) {
-      //There's vehicle data, need to double check the VIN.
+      //There's vehicle data, need to double-check the VIN.
       existingVehicles = await client.query({
         query: SEARCH_VEHICLE_BY_VIN,
         variables: {
@@ -135,9 +134,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: {
@@ -147,7 +146,7 @@ export function JobsAvailableContainer({
           text: t("jobs.labels.importnote"),
         },
       },
-      queued_for_parts: true,
+      queued_for_parts: partsQueueToggle,
       ...(existingVehicles && existingVehicles.data.vehicles.length > 0
         ? { vehicleid: existingVehicles.data.vehicles[0].id, vehicle: null }
         : {}),
@@ -161,23 +160,17 @@ export function JobsAvailableContainer({
       delete newJob.vehicle;
     }
 
-    if (typeof newJob.kmin === "string") {
-      newJob.kmin = null;
-    }
-
     try {
       const r = await insertNewJob({
         variables: {
           job: newJob,
         },
       });
-      await Axios.post("/job/totalsssu", {
-        id: r.data.insert_jobs.returning[0].id,
-      });
 
       if (CriticalPartsScanning.treatment === "on") {
         CriticalPartsScan(r.data.insert_jobs.returning[0].id);
       }
+
       notification["success"]({
         message: t("jobs.successes.created"),
         onClick: () => {
@@ -191,23 +184,27 @@ export function JobsAvailableContainer({
         operation: AuditTrailMapping.jobimported(),
       });
 
-      await deleteJob({
+      deleteJob({
         variables: { id: estData.id },
       }).then((r) => {
         refetch();
         setInsertLoading(false);
       });
-    } catch (r) {
+
+      setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
+    } catch (err) {
       //error while inserting
       notification["error"]({
-        message: t("jobs.errors.creating", { error: r.message }),
+        message: t("jobs.errors.creating", { error: err.message }),
       });
-      refetch();
+      refetch().catch(e => {console.error(`Something went wrong in jobs available table container - ${err.message || ''}`)});
       setInsertLoading(false);
+      setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
     }
+
   };
 
-  //Suplement scenario
+  //Supplement scenario
   const onJobFindModalOk = async () => {
     logImEXEvent("job_import_supplement");
 
@@ -227,7 +224,6 @@ 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;
@@ -260,11 +256,14 @@ export function JobsAvailableContainer({
             //   "0.00"
             // ),
             // job_totals: newTotals,
-            // queued_for_parts: true,
+            queued_for_parts: partsQueueToggle,
           },
         },
       });
-      if (CriticalPartsScanning.treatment === "on") {
+
+        setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
+
+        if (CriticalPartsScanning.treatment === "on") {
         CriticalPartsScan(updateResult.data.update_jobs.returning[0].id);
       }
       if (updateResult.errors) {
@@ -339,12 +338,14 @@ export function JobsAvailableContainer({
   const onOwnerModalCancel = () => {
     setOwnerModalVisible(false);
     setSelectedOwner(null);
+    setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
   };
 
   const onJobModalCancel = () => {
     setJobModalVisible(false);
     modalSearchState[1]("");
     setSelectedJob(null);
+    setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
   };
 
   const addJobAsNew = (record) => {
@@ -365,6 +366,8 @@ export function JobsAvailableContainer({
   }, [addJobAsSupp, availableJobId, clm_no]);
 
   if (error) return <AlertComponent type="error" message={error.message} />;
+
+
   return (
     <LoadingSpinner
       loading={insertLoading}
@@ -374,11 +377,14 @@ export function JobsAvailableContainer({
         loading={estDataRaw.loading}
         error={estDataRaw.error}
         owner={owner}
+        partsQueueToggle={partsQueueToggle}
+        setPartsQueueToggle={setPartsQueueToggle}
         selectedOwner={selectedOwner}
         setSelectedOwner={setSelectedOwner}
         visible={ownerModalVisible}
         onOk={onOwnerFindModalOk}
         onCancel={onOwnerModalCancel}
+
       />
       <JobsFindModalContainer
         loading={estDataRaw.loading}
@@ -390,26 +396,9 @@ export function JobsAvailableContainer({
         onOk={onJobFindModalOk}
         onCancel={onJobModalCancel}
         modalSearchState={modalSearchState}
+        partsQueueToggle={partsQueueToggle}
+        setPartsQueueToggle={setPartsQueueToggle}
       />
-      {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
@@ -441,158 +430,115 @@ function replaceEmpty(someObj, replaceValue = null) {
 }
 
 async function CheckTaxRates(estData, bodyshop) {
-  // //LKQ Check
-  // if (
-  //   !estData.parts_tax_rates?.PAL ||
-  //   estData.parts_tax_rates?.PAL?.prt_tax_rt === null ||
-  //   estData.parts_tax_rates?.PAL?.prt_tax_rt === 0
-  // ) {
-  //   const res = await confirmDialog(
-  //     `Rome Online has detected that there is a missing tax rate for LKQ parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
-  //   );
-  //   if (res) {
-  //     if (!estData.parts_tax_rates.PAL) {
-  //       estData.parts_tax_rates.PAL = {
-  //         prt_discp: 0,
-  //         prt_mktyp: true,
-  //         prt_mkupp: 0,
-  //         prt_type: "PAL",
-  //       };
-  //     }
-  //     estData.parts_tax_rates.PAL.prt_tax_rt =
-  //       bodyshop.bill_tax_rates.state_tax_rate / 100;
-  //     estData.parts_tax_rates.PAL.prt_tax_in = true;
-  //   }
-  // }
-  // //PAC Check
-  // if (
-  //   !estData.parts_tax_rates?.PAC ||
-  //   estData.parts_tax_rates?.PAC?.prt_tax_rt === null ||
-  //   estData.parts_tax_rates?.PAC?.prt_tax_rt === 0
-  // ) {
-  //   const res = await confirmDialog(
-  //     `Rome Online has detected that there is a missing tax rate for rechromed parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
-  //   );
-  //   if (res) {
-  //     if (!estData.parts_tax_rates.PAC) {
-  //       estData.parts_tax_rates.PAC = {
-  //         prt_discp: 0,
-  //         prt_mktyp: true,
-  //         prt_mkupp: 0,
-  //         prt_type: "PAC",
-  //       };
-  //     }
-  //     estData.parts_tax_rates.PAC.prt_tax_rt =
-  //       bodyshop.bill_tax_rates.state_tax_rate / 100;
-  //     estData.parts_tax_rates.PAC.prt_tax_in = true;
-  //   }
-  // }
-
+  //LKQ Check
+  if (
+    !estData.parts_tax_rates?.PAL ||
+    estData.parts_tax_rates?.PAL?.prt_tax_rt === null ||
+    estData.parts_tax_rates?.PAL?.prt_tax_rt === 0
+  ) {
+    const res = await confirmDialog(
+      `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;
+    }
+  }
   //PAM Check
-  if (!estData.parts_tax_rates?.PAM) {
-    estData.parts_tax_rates.PAM = estData.parts_tax_rates.PAC;
+  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;
+    }
   }
 
-  // //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;
-  //   }
-  // }
+  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;
+    }
+  }
 
   //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;
-      }
-    });
-  }
-}
-
-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;
+    //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;
     }
   });
-
-  //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,8 +36,6 @@ 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-convert-button/jobs-convert-button.component.jsx

@@ -108,7 +108,7 @@ export function JobsConvertButton({
             },
           ]}
         >
-          <Select>
+          <Select showSearch>
             {bodyshop.md_ins_cos.map((s, i) => (
               <Select.Option key={i} value={s.name}>
                 {s.name}

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

@@ -1,4 +1,4 @@
-import { Collapse, Form, Input, Select, Switch } from "antd";
+import { Collapse, Form, Input, InputNumber, Select, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -12,12 +12,6 @@ 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({
@@ -264,28 +258,26 @@ 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 />
@@ -364,10 +356,6 @@ 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-dates/jobs-detail-dates.component.jsx

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

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

@@ -18,12 +18,14 @@ import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENTS_BY_JOB_ID } from "../../graphql/appointments.queries";
 import { DELETE_JOB, UPDATE_JOB, VOID_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import JobsDetailHeaderActionsAddevent from "./jobs-detail-header-actions.addevent";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
@@ -48,10 +50,10 @@ 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" })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function JobsDetailHeaderActions({
@@ -65,8 +67,8 @@ export function JobsDetailHeaderActions({
   setJobCostingContext,
   jobRO,
   setTimeTicketContext,
-  setTimeTicketTaskContext,
   setCardPaymentContext,
+  insertAuditTrail,
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
@@ -161,6 +163,7 @@ export function JobsDetailHeaderActions({
                         scheduled_in: null,
                         scheduled_completion: null,
                         lost_sale_reason,
+                        date_lost_sale: new Date(),
                         status: bodyshop.md_ro_statuses.default_imported,
                       },
                     },
@@ -169,6 +172,11 @@ export function JobsDetailHeaderActions({
                     notification["success"]({
                       message: t("appointments.successes.canceled"),
                     });
+                    insertAuditTrail({
+                      jobid: job.id,
+                      operation:
+                        AuditTrailMapping.appointmentcancel(lost_sale_reason),
+                    });
                     return;
                   }
                 }}
@@ -260,24 +268,6 @@ 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-header-actions/jobs-detail-header-actions.duplicate.util.js

@@ -27,6 +27,8 @@ export default async function DuplicateJob(
   delete existingJob.id;
   delete existingJob.createdat;
   delete existingJob.updatedat;
+  delete existingJob.cieca_stl;
+  delete existingJob.cieca_ttl;
 
   const newJob = {
     ...existingJob,
@@ -81,6 +83,8 @@ export async function CreateIouForJob(
   delete existingJob.id;
   delete existingJob.createdat;
   delete existingJob.updatedat;
+  delete existingJob.cieca_stl;
+  delete existingJob.cieca_ttl;
 
   const newJob = {
     ...existingJob,

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

@@ -5,13 +5,9 @@ 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);
@@ -52,7 +48,6 @@ const adjSpan = {
 };
 
 export function JobsDetailLaborContainer({
-  bodyshop,
   jobRO,
   job,
   jobId,
@@ -63,12 +58,6 @@ export function JobsDetailLaborContainer({
   techConsole,
   adjustments,
 }) {
-  const { Enhanced_Payroll } = useTreatments(
-    ["Enhanced_Payroll"],
-    {},
-    bodyshop.imexshopid
-  );
-
   return (
     <Row gutter={[16, 16]}>
       <Col {...ticketSpan}>
@@ -81,28 +70,14 @@ export function JobsDetailLaborContainer({
           jobId={jobId}
         />
       </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>
-      )}
+      <Col {...adjSpan}>
+        <LaborAllocationsTableComponent
+          jobId={jobId}
+          joblines={joblines}
+          timetickets={timetickets}
+          adjustments={adjustments}
+        />
+      </Col>
     </Row>
   );
 }

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

@@ -6,14 +6,12 @@ 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>
@@ -45,13 +43,6 @@ 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,24 +39,12 @@ 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,21 +1,25 @@
-import { Divider, Form, Input, Select, Space, Switch, Tooltip } from "antd";
+import {
+  Divider,
+  Form,
+  Input,
+  InputNumber,
+  Select,
+  Space,
+  Switch,
+  Tooltip,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 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,
@@ -80,7 +84,14 @@ 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"
@@ -109,7 +120,41 @@ 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"
@@ -197,15 +242,7 @@ 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

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

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

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

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

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

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

client/src/components/jobs-documents-gallery/jobs-documents-gallery.external.component.jsx

@@ -1,7 +1,7 @@
 import React, { useEffect } from "react";
 import { Gallery } from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
-import { GenerateThumbUrl } from "./job-documents.utility";
+import { GenerateSrcUrl, GenerateThumbUrl } from "./job-documents.utility";
 
 function JobsDocumentGalleryExternal({
   data,
@@ -15,7 +15,7 @@ function JobsDocumentGalleryExternal({
     let documents = data.reduce((acc, value) => {
       if (value.type.startsWith("image")) {
         acc.push({
-          //src: GenerateSrcUrl(value),
+          fullsize: GenerateSrcUrl(value),
           src: GenerateThumbUrl(value),
           thumbnailHeight: 225,
           thumbnailWidth: 225,

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.external.component.jsx

@@ -52,7 +52,7 @@ function JobDocumentsLocalGalleryExternal({
               val.type.mime &&
               val.type.mime.startsWith("image")
             ) {
-              acc.push({ ...val, src: val.thumbnail });
+              acc.push({ ...val, src: val.thumbnail, fullsize: val.src });
             }
             return acc;
           }, [])

client/src/components/jobs-find-modal/jobs-find-modal.component.jsx

@@ -14,6 +14,8 @@ export default function JobsFindModalComponent({
   importOptionsState,
   modalSearchState,
   jobsListRefetch,
+  partsQueueToggle,
+  setPartsQueueToggle,
 }) {
   const { t } = useTranslation();
   const [modalSearch, setModalSearch] = modalSearchState;
@@ -199,6 +201,12 @@ export default function JobsFindModalComponent({
       >
         {t("jobs.labels.override_header")}
       </Checkbox>
+      <Checkbox
+          checked={partsQueueToggle}
+          onChange={(e) => setPartsQueueToggle(e.target.checked)}
+      >
+        {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
+      </Checkbox>
     </div>
   );
 }

client/src/components/jobs-find-modal/jobs-find-modal.container.jsx

@@ -24,6 +24,8 @@ export default connect(
   setSelectedJob,
   importOptionsState,
   modalSearchState,
+  partsQueueToggle,
+  setPartsQueueToggle,
   ...modalProps
 }) {
   const { t } = useTranslation();
@@ -91,6 +93,8 @@ export default connect(
           jobsListRefetch={jobsList.refetch}
           jobsList={jobsData}
           modalSearchState={modalSearchState}
+          partsQueueToggle={partsQueueToggle}
+          setPartsQueueToggle={setPartsQueueToggle}
         />
       ) : null}
     </Modal>

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

@@ -1,8 +1,8 @@
 import {
+  BranchesOutlined,
   ExclamationCircleFilled,
   PauseCircleOutlined,
   SyncOutlined,
-  BranchesOutlined,
 } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
 import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
@@ -14,8 +14,8 @@ import { Link, useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { onlyUnique } from "../../utils/arrayHelper";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { onlyUnique } from "../../utils/arrayHelper";
 import { alphaSort } from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
@@ -46,6 +46,7 @@ export function JobsReadyList({ bodyshop }) {
   const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
     variables: {
       statuses: readyStatuses,
+      isConverted: true,
     },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",

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

@@ -231,7 +231,14 @@ export function LaborAllocationsTable({
                   {summary.adjustments.toFixed(1)}
                 </Table.Summary.Cell>
                 <Table.Summary.Cell>
-                  {summary.difference.toFixed(1)}
+                  <Typography.Text
+                    style={{
+                      fontWeight: "bold",
+                      color: summary.difference >= 0 ? "green" : "red",
+                    }}
+                  >
+                    {summary.difference.toFixed(1)}
+                  </Typography.Text>
                 </Table.Summary.Cell>
               </Table.Summary.Row>
             )}

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

@@ -1,333 +0,0 @@
-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/owner-find-modal/owner-find-modal.component.jsx

@@ -8,10 +8,11 @@ export default function OwnerFindModalComponent({
   setSelectedOwner,
   ownersListLoading,
   ownersList,
+  partsQueueToggle,
+  setPartsQueueToggle,
 }) {
   //setSelectedOwner is used to set the record id of the owner to use for adding the job.
   const { t } = useTranslation();
-
   const columns = [
     {
       title: t("owners.fields.ownr_ln"),
@@ -109,6 +110,12 @@ export default function OwnerFindModalComponent({
       >
         {t("owners.labels.create_new")}
       </Checkbox>
+      <Checkbox
+          checked={partsQueueToggle}
+          onChange={(e) => setPartsQueueToggle(e.target.checked)}
+      >
+        {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
+      </Checkbox>
     </div>
   );
 }

client/src/components/owner-find-modal/owner-find-modal.container.jsx

@@ -14,6 +14,8 @@ export default function OwnerFindModalContainer({
   owner,
   selectedOwner,
   setSelectedOwner,
+  partsQueueToggle,
+  setPartsQueueToggle,
   ...modalProps
 }) {
   //use owner object to run query and find what possible owners there are.
@@ -59,6 +61,8 @@ export default function OwnerFindModalContainer({
             selectedOwner={selectedOwner}
             setSelectedOwner={setSelectedOwner}
             ownersListLoading={ownersList.loading}
+            partsQueueToggle={partsQueueToggle}
+            setPartsQueueToggle={setPartsQueueToggle}
             ownersList={
               ownersList.data && ownersList.data.search_owners
                 ? ownersList.data.search_owners

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

@@ -21,7 +21,8 @@ const OwnerSearchSelect = ({ value, onChange, onBlur, disabled }, ref) => {
     useLazyQuery(SEARCH_OWNERS_BY_ID_FOR_AUTOCOMPLETE);
 
   const executeSearch = (v) => {
-    callSearch(v);
+    if (v && v.variables?.search !== "" && v.variables.search.length >= 2)
+      callSearch(v);
   };
   const debouncedExecuteSearch = _.debounce(executeSearch, 500);
 

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

@@ -106,7 +106,11 @@ export default function OwnersListComponent({
           <Input.Search
             placeholder={search.search || t("general.labels.search")}
             onSearch={(value) => {
-              search.search = value;
+              if (value?.length >= 3) {
+                search.search = value;
+              } else {
+                delete search.search;
+              }
               history.push({ search: queryString.stringify(search) });
             }}
             enterButton

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

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

@@ -1,155 +0,0 @@
-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,4 +1,3 @@
-import { useTreatments } from "@splitsoftware/splitio-react";
 import { Card, Col, Input, Row, Space, Typography } from "antd";
 import _ from "lodash";
 import React, { useState } from "react";
@@ -24,13 +23,8 @@ 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 Templates =
+  const JobsReportsList =
     bodyshop.cdk_dealerid === null && bodyshop.pbs_serialnumber === null
       ? Object.keys(tempList)
           .map((key) => {
@@ -57,26 +51,7 @@ 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,11 +9,9 @@ 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);
@@ -22,18 +20,8 @@ export default function PrintWrapperComponent({
   return (
     <Space>
       {children || null}
-      {!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 }}
-      />
+      {!emailOnly && <PrinterFilled onClick={() => handlePrint("p")} />}
+      <MailFilled onClick={() => handlePrint("e")} />
       {loading && <Spin />}
     </Space>
   );

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

@@ -20,9 +20,9 @@ import ProductionBoardCard from "../production-board-kanban-card/production-boar
 import ProductionListDetailComponent from "../production-list-detail/production-list-detail.component";
 import ProductionBoardKanbanCardSettings from "./production-board-kanban.card-settings.component";
 //import "@asseinfo/react-kanban/dist/styles.css";
+import CardColorLegend from "../production-board-kanban-card/production-board-kanban-card-color-legend.component";
 import "./production-board-kanban.styles.scss";
 import { createBoardData } from "./production-board-kanban.utils.js";
-import CardColorLegend from "../production-board-kanban-card/production-board-kanban-card-color-legend.component";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   technician: selectTechnician,
@@ -153,6 +153,18 @@ export function ProductionBoardKanbanComponent({
       0
     )
     .toFixed(1);
+    const totalLAB = data
+    .reduce(
+      (acc, val) => acc + (val.labhrs?.aggregate?.sum?.mod_lb_hrs || 0),
+      0
+    )
+    .toFixed(1);
+  const totalLAR = data
+    .reduce(
+      (acc, val) => acc + (val.larhrs?.aggregate?.sum?.mod_lb_hrs || 0),
+      0
+    )
+    .toFixed(1);
   const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
     .filter((screen) => !!screen[1])
     .slice(-1)[0];
@@ -236,6 +248,14 @@ export function ProductionBoardKanbanComponent({
               title={t("dashboard.titles.productionhours")}
               value={totalHrs}
             />
+            <Statistic
+              title={t("dashboard.titles.labhours")}
+              value={totalLAB}
+            />
+            <Statistic
+              title={t("dashboard.titles.larhours")}
+              value={totalLAR}
+            />
             <Statistic
               title={t("appointments.labels.inproduction")}
               value={data && data.length}

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

@@ -24,8 +24,6 @@ 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 [
@@ -40,29 +38,6 @@ 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",
@@ -480,8 +455,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
-          bodyshop.employees.find((e) => e.id === a.employee_body)?.first_name,
-          bodyshop.employees.find((e) => e.id === b.employee_body)?.first_name
+          bodyshop.employees?.find((e) => e.id === a.employee_body)?.first_name,
+          bodyshop.employees?.find((e) => e.id === b.employee_body)?.first_name
         ),
       render: (text, record) => (
         <ProductionListEmployeeAssignment
@@ -499,8 +474,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
-          bodyshop.employees.find((e) => e.id === a.employee_prep)?.first_name,
-          bodyshop.employees.find((e) => e.id === b.employee_prep)?.first_name
+          bodyshop.employees?.find((e) => e.id === a.employee_prep)?.first_name,
+          bodyshop.employees?.find((e) => e.id === b.employee_prep)?.first_name
         ),
       render: (text, record) => (
         <ProductionListEmployeeAssignment
@@ -517,8 +492,8 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         state.sortedInfo.columnKey === "employee_csr" && state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
-          bodyshop.employees.find((e) => e.id === a.employee_csr)?.first_name,
-          bodyshop.employees.find((e) => e.id === b.employee_csr)?.first_name
+          bodyshop.employees?.find((e) => e.id === a.employee_csr)?.first_name,
+          bodyshop.employees?.find((e) => e.id === b.employee_csr)?.first_name
         ),
       render: (text, record) => (
         <ProductionListEmployeeAssignment record={record} type="employee_csr" />
@@ -533,9 +508,9 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         state.sortedInfo.order,
       sorter: (a, b) =>
         alphaSort(
-          bodyshop.employees.find((e) => e.id === a.employee_refinish)
+          bodyshop.employees?.find((e) => e.id === a.employee_refinish)
             ?.first_name,
-          bodyshop.employees.find((e) => e.id === b.employee_refinish)
+          bodyshop.employees?.find((e) => e.id === b.employee_refinish)
             ?.first_name
         ),
       render: (text, record) => (

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

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

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

@@ -55,25 +55,27 @@ export function ProductionListPrint({ bodyshop }) {
           <Menu.SubMenu
             title={t("reportcenter.templates.production_by_technician_one")}
           >
-            {bodyshop.employees.map((e) => (
-              <Menu.Item
-                key={e.id}
-                onClick={async () => {
-                  setLoading(true);
-                  await GenerateDocument(
-                    {
-                      name: production_by_technician_one.key,
-                      variables: { id: e.id },
-                    },
-                    {},
-                    "p"
-                  );
-                  setLoading(false);
-                }}
-              >
-                {e.first_name} {e.last_name}
-              </Menu.Item>
-            ))}
+            {bodyshop.employees
+              .filter((e) => e.active)
+              .map((e) => (
+                <Menu.Item
+                  key={e.id}
+                  onClick={async () => {
+                    setLoading(true);
+                    await GenerateDocument(
+                      {
+                        name: production_by_technician_one.key,
+                        variables: { id: e.id },
+                      },
+                      {},
+                      "p"
+                    );
+                    setLoading(false);
+                  }}
+                >
+                  {e.first_name} {e.last_name}
+                </Menu.Item>
+              ))}
           </Menu.SubMenu>
           <Menu.SubMenu
             title={t("reportcenter.templates.production_by_category_one")}

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

@@ -184,6 +184,18 @@ export function ProductionListTable({
       0
     )
     .toFixed(1);
+  const totalLAB = data
+    .reduce(
+      (acc, val) => acc + (val.labhrs?.aggregate?.sum?.mod_lb_hrs || 0),
+      0
+    )
+    .toFixed(1);
+  const totalLAR = data
+    .reduce(
+      (acc, val) => acc + (val.larhrs?.aggregate?.sum?.mod_lb_hrs || 0),
+      0
+    )
+    .toFixed(1);
   return (
     <div>
       <PageHeader
@@ -193,6 +205,14 @@ export function ProductionListTable({
               title={t("dashboard.titles.productionhours")}
               value={totalHrs}
             />
+            <Statistic
+              title={t("dashboard.titles.labhours")}
+              value={totalLAB}
+            />
+            <Statistic
+              title={t("dashboard.titles.larhours")}
+              value={totalLAR}
+            />
             <Statistic
               title={t("appointments.labels.inproduction")}
               value={dataSource && dataSource.length}

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

@@ -1,5 +1,4 @@
 import { useLazyQuery } from "@apollo/client";
-import { useTreatments } from "@splitsoftware/splitio-react";
 import {
   Button,
   Card,
@@ -20,7 +19,6 @@ 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";
@@ -29,7 +27,6 @@ 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))
@@ -39,38 +36,16 @@ export default connect(
   mapDispatchToProps
 )(ReportCenterModalComponent);
 
-export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
+export function ReportCenterModalComponent({ reportCenterModal }) {
   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 =
-    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 ReportsList = Object.keys(Templates).map((key) => {
+    return Templates[key];
+  });
   const { visible } = reportCenterModal;
 
   const [callVendorQuery, { data: vendorData, called: vendorCalled }] =

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

@@ -13,20 +13,29 @@ import {
   QUERY_APPOINTMENTS_BY_JOBID,
 } from "../../graphql/appointments.queries";
 import { QUERY_LBR_HRS_BY_PK, UPDATE_JOBS } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { setEmailOptions } from "../../redux/email/email.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectSchedule } from "../../redux/modals/modals.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import { DateTimeFormat } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ScheduleJobModalComponent from "./schedule-job-modal.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   scheduleModal: selectSchedule,
+  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("schedule")),
   setEmailOptions: (e) => dispatch(setEmailOptions(e)),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function ScheduleJobModalContainer({
@@ -34,6 +43,8 @@ export function ScheduleJobModalContainer({
   bodyshop,
   toggleModalVisible,
   setEmailOptions,
+  currentUser,
+  insertAuditTrail,
 }) {
   const { visible, context, actions } = scheduleModal;
   const { jobId, job, previousEvent } = context;
@@ -122,12 +133,22 @@ export function ScheduleJobModalContainer({
           end: moment(values.start).add(bodyshop.appt_length || 60, "minutes"),
           color: values.color,
           note: values.note,
+          created_by: currentUser.email,
         },
         jobId: jobId,
         altTransport: values.alt_transport,
       },
     });
 
+    if (!appt.errors) {
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.appointmentinsert(
+          DateTimeFormat(values.start)
+        ),
+      });
+    }
+
     if (!!appt.errors) {
       notification["error"]({
         message: t("appointments.errors.saving", {
@@ -149,6 +170,7 @@ export function ScheduleJobModalContainer({
             scheduled_in: values.start,
             scheduled_completion: values.scheduled_completion,
             lost_sale_reason: null,
+            date_lost_sale: null,
           },
         },
       });