IO-2719 Missing CC Filter

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

.circleci/config.yml

@@ -59,139 +59,6 @@ jobs:
           to: "s3://imex-online-production/"
           arguments: "--exclude '*.map'"
       - 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 18 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
-    resource_class: large
-    working_directory: ~/repo/client
-
-    steps:
-      - checkout:
-          path: ~/repo
-      - run:
-          name: Install Dependencies
-          command: npm i
-
-      - run: npm 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
-    resource_class: large
-    working_directory: ~/repo/client
-
-    steps:
-      - checkout:
-          path: ~/repo
-      - run:
-          name: Install Dependencies
-          command: npm i
-
-      - run: npm run build:test
-
-      - aws-s3/sync:
-          from: build
-          to: "s3://rome-online-test/"
-      - jira/notify 
-
-  app-beta-build:
-    docker:
-      - image: cimg/node:18.18.2
-    resource_class: large
-    working_directory: ~/repo/client
-
-    steps:
-      - checkout:
-          path: ~/repo
-      - run:
-          name: Install Dependencies
-          command: npm i
-
-      - run: npm run build
-
-      - aws-s3/sync:
-          from: build
-          to: "s3://imex-online-beta/"
-      - jira/notify  
-
-  rome-app-beta-build:
-    docker:
-      - image: cimg/node:18.18.2
-    resource_class: large
-    working_directory: ~/repo/client
-
-    steps:
-      - checkout:
-          path: ~/repo
-      - run:
-          name: Install Dependencies
-          command: npm i
-
-      - run: npm run build
-
-      - aws-s3/sync:
-          from: build
-          to: "s3://rome-online-production-beta/"
-      - jira/notify      
 
   test-hasura-migrate:
     docker:
@@ -234,49 +101,6 @@ jobs:
           arguments: "--exclude '*.map'"
       - jira/notify
 
-  test-app-beta-build:
-    docker:
-      - image: cimg/node:18.18.2
-    resource_class: large
-    working_directory: ~/repo/client
-
-    steps:
-      - checkout:
-          path: ~/repo
-
-      - run:
-          name: Install Dependencies
-          command: npm i
-
-      - run: npm run build:test
-
-      - aws-s3/sync:
-          from: build
-          to: "s3://imex-online-test-beta/"
-      - jira/notify
-
-  rome-test-app-beta-build:
-    docker:
-      - image: cimg/node:18.18.2
-    resource_class: large
-    working_directory: ~/repo/client
-
-    steps:
-      - checkout:
-          path: ~/repo
-
-      - run:
-          name: Install Dependencies
-          command: npm i
-
-      - run: npm run build:test
-
-      - aws-s3/sync:
-          from: build
-          to: "s3://rome-online-test-beta/"
-      - jira/notify
-
-
   admin-app-build:
     docker:
       - image: cimg/node:16.15.0
@@ -318,58 +142,20 @@ workflows:
           filters:
             branches:
               only: master
-      - app-beta-build:
-          filters:
-            branches:
-              only: master-beta
-      - rome-app-beta-build:
-          filters:
-            branches:
-              only: rome/master-beta
       - hasura-migrate:
           secret: ${HASURA_PROD_SECRET}
           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:
               only: test
-      - rome-test-app-beta-build:
-          filters:
-            branches:
-              only: rome/test-beta
-      - test-app-beta-build:
-          filters:
-            branches:
-              only: test-beta
       - test-hasura-migrate:
           secret: ${HASURA_TEST_SECRET}
           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:

_reference/reportFiltersAndSorters.md

@@ -59,7 +59,7 @@ Filters can make use of reflection to pre-fill select boxes, the following is an
         "type": "internal",
         "name": "special.job_statuses"
       }
-    },
+    }
 ```
 
 in this example, a reflector with the type 'internal' (all types at the moment require this, and it is used for future functionality), with a name of `special.job_statuses`
@@ -74,9 +74,13 @@ The following cases are available
 - `special.employees` - This will reflect the employees `bodyshop.employees`
 - `special.first_names` - This will reflect the first names `bodyshop.employees`
 - `special.last_names` - This will reflect the last names `bodyshop.employees`
-- `special.referral_sources` - This will reflect the referral sources `bodyshop.md_referral_sources
+- `special.referral_sources` - This will reflect the referral sources `bodyshop.md_referral_sources`
 - `special.class`- This will reflect the class `bodyshop.md_classes`
--
+- `special.lost_sale_reasons` - This will reflect the lost sale reasons `bodyshop.md_lost_sale_reasons`
+- `special.alt_transports` - This will reflect the alternative transports `bodyshop.appt_alt_transport`
+- `special.payment_types` - This will reflect the payment types `bodyshop.md_payment_types`
+- `special.payment_payers` - This is a special case with a key value set of [Customer, Insurance]
+
 ### Path without brackets, multi level
 
 `"name": "jobs.joblines.mod_lb_hrs",`
@@ -156,6 +160,7 @@ query gendoc_hours_sold_detail_open($starttz: timestamptz!, $endtz: timestamptz!
 - Do not add the ability to filter things that are already filtered as part of the original query, this would be
   redundant and could cause issues.
 - Do not add the ability to filter on things like FK constraints, must like the above example.
+- *INHERITANCE CAVEAT* If you have a filters file on a parent report that has a child that you do not want the filters inherited from, you must place a blank filters file (valid json so {}) on the child report level. This will than fetch the child filters, which are empty and move along, versus inheriting the parent filters.
 
 ## Sorters
 

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=true
+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

@@ -27,7 +27,7 @@ module.exports = {
           lessOptions: {
             modifyVars: {
               ...(process.env.NODE_ENV === "development"
-                ? { "@primary-color": "#B22234" }
+                ? { "@primary-color": "#a51d1d" }
                 : {
                     //"@primary-color": "#1DA57A"
                   }),

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,81 +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" /> -->
-
-    <!--Use the below code snippet to provide real time updates to the live chat plugin without the need of copying and paste each time to your website when changes are made via PBX-->
-
-<call-us-selector phonesystem-url=https://rometech.east.3cx.us:5001 party="LiveChat528346"></call-us-selector>
-
-<!--Incase you don't want real time updates to the live chat plugin when options are changed, use the below code snippet. Please note that each time you change the settings you will need to copy and paste the snippet code to your website-->
-
-<!--<call-us
-
-phonesystem-url=https://rometech.east.3cx.us:5001
-
-style="position:fixed;font-size:16px;line-height:17px;z-index: 99999;right: 20px; bottom: 20px;"
-
-id="wp-live-chat-by-3CX"
-
-minimized="true"
-
-animation-style="noanimation"
-
-party="LiveChat528346"
-
-minimized-style="bubbleright"
-
-allow-call="true"
-
-allow-video="false"
-
-allow-soundnotifications="true"
-
-enable-mute="true"
-
-enable-onmobile="true"
-
-offline-enabled="true"
-
-enable="true"
-
-ignore-queueownership="false"
-
-authentication="both"
-
-show-operator-actual-name="true"
-
-aknowledge-received="true"
-
-gdpr-enabled="false"
-
-message-userinfo-format="name"
-
-message-dateformat="both"
-
-lang="browser"
-
-button-icon-type="default"
-
-greeting-visibility="none"
-
-greeting-offline-visibility="none"
-
-chat-delay="2000"
-
-enable-direct-call="true"
-
-enable-ga="false"
-
-></call-us>-->
-
-<script defer src=https://downloads-global.3cx.com/downloads/livechatandtalk/v1/callus.js id="tcx-callus-js" charset="utf-8"></script>
-
     <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";
@@ -135,7 +77,7 @@ enable-ga="false"
       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

@@ -28,12 +28,6 @@ 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

@@ -78,9 +78,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]);
@@ -112,7 +112,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/accounting-payables-table/accounting-payables-table.component.jsx

@@ -1,21 +1,21 @@
-import { Input, Table, Checkbox, Card, Space } from "antd";
+import { Card, Checkbox, Input, Space, Table } from "antd";
+import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
-import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort, dateSort } from "../../utils/sorters";
-import PayableExportButton from "../payable-export-button/payable-export-button.component";
-import PayableExportAll from "../payable-export-all-button/payable-export-all-button.component";
-import { DateFormatter } from "../../utils/DateFormatter";
-import queryString from "query-string";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 import { connect } from "react-redux";
+import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { DateFormatter } from "../../utils/DateFormatter";
+import { pageLimit } from "../../utils/config";
+import { alphaSort, dateSort } from "../../utils/sorters";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+import PayableExportAll from "../payable-export-all-button/payable-export-all-button.component";
+import PayableExportButton from "../payable-export-button/payable-export-button.component";
 import BillMarkSelectedExported from "../payable-mark-selected-exported/payable-mark-selected-exported.component";
-import {pageLimit} from "../../utils/config";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -138,7 +138,6 @@ export function AccountingPayablesTableComponent({
       title: t("exportlogs.labels.attempts"),
       dataIndex: "attempts",
       key: "attempts",
-
       render: (text, record) => (
         <ExportLogsCountDisplay logs={record.exportlogs} />
       ),
@@ -147,8 +146,6 @@ export function AccountingPayablesTableComponent({
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
-      sorter: (a, b) => a.clm_total - b.clm_total,
-
       render: (text, record) => (
         <PayableExportButton
           billId={record.id}

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

@@ -8,14 +8,16 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
+import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
 import PaymentExportButton from "../payment-export-button/payment-export-button.component";
 import PaymentMarkSelectedExported from "../payment-mark-selected-exported/payment-mark-selected-exported.component";
 import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -75,7 +77,11 @@ export function AccountingPayablesTableComponent({
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
+      sorter: (a, b) =>
+        alphaSort(
+          OwnerNameDisplayFunction(a.job),
+          OwnerNameDisplayFunction(b.job)
+        ),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -94,6 +100,9 @@ export function AccountingPayablesTableComponent({
       title: t("payments.fields.amount"),
       dataIndex: "amount",
       key: "amount",
+      sorter: (a, b) => a.amount - b.amount,
+      sortOrder:
+        state.sortedInfo.columnKey === "amount" && state.sortedInfo.order,
       render: (text, record) => (
         <CurrencyFormatter>{record.amount}</CurrencyFormatter>
       ),
@@ -112,18 +121,21 @@ export function AccountingPayablesTableComponent({
       title: t("payments.fields.created_at"),
       dataIndex: "created_at",
       key: "created_at",
+      sorter: (a, b) => dateSort(a.created_at, b.created_at),
+      sortOrder:
+        state.sortedInfo.columnKey === "created_at" && state.sortedInfo.order,
       render: (text, record) => (
         <DateTimeFormatter>{record.created_at}</DateTimeFormatter>
       ),
     },
-    {
-      title: t("payments.fields.exportedat"),
-      dataIndex: "exportedat",
-      key: "exportedat",
-      render: (text, record) => (
-        <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
-      ),
-    },
+    // {
+    //   title: t("payments.fields.exportedat"),
+    //   dataIndex: "exportedat",
+    //   key: "exportedat",
+    //   render: (text, record) => (
+    //     <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
+    //   ),
+    // },
     {
       title: t("exportlogs.labels.attempts"),
       dataIndex: "attempts",
@@ -137,8 +149,6 @@ export function AccountingPayablesTableComponent({
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
-      sorter: (a, b) => a.clm_total - b.clm_total,
-
       render: (text, record) => (
         <PaymentExportButton
           paymentId={record.id}

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

@@ -4,17 +4,19 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort, dateSort } from "../../utils/sorters";
+import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
 import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component";
 import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-button.component";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 import { DateFormatter } from "../../utils/DateFormatter";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -63,7 +65,7 @@ export function AccountingReceivablesTableComponent({
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-      sorter: (a, b) => a.status - b.status,
+      sorter: (a, b) => statusSort(a, b, bodyshop.md_ro_statuses.statuses),
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
     },
@@ -83,7 +85,8 @@ export function AccountingReceivablesTableComponent({
       title: t("jobs.fields.owner"),
       dataIndex: "owner",
       key: "owner",
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      sorter: (a, b) =>
+        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -103,6 +106,15 @@ export function AccountingReceivablesTableComponent({
       dataIndex: "vehicle",
       key: "vehicle",
       ellipsis: true,
+      sorter: (a, b) =>
+        alphaSort(
+          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+            a.v_model_desc || ""
+          }`,
+          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
       render: (text, record) => {
         return record.vehicleid ? (
           <Link to={"/manage/vehicles/" + record.vehicleid}>

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

@@ -12,8 +12,8 @@ import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({});
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(BillDeleteButton);
@@ -51,6 +51,7 @@ export function BillDeleteButton({ bill, jobid, callback, insertAuditTrail }) {
       insertAuditTrail({
         jobid: jobid,
         operation: AuditTrailMapping.billdeleted(bill.invoice_number),
+        type: "billdeleted",
       });
 
       if (callback && typeof callback === "function") callback(bill.id);

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

@@ -33,8 +33,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "partsOrder" })),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(
@@ -150,6 +150,7 @@ export function BillDetailEditcontainer({
       jobid: bill.jobid,
       billid: search.billid,
       operation: AuditTrailMapping.billupdated(bill.invoice_number),
+      type: "billupdated",
     });
 
     await refetch();

client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx

@@ -16,8 +16,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "partsOrder" })),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(

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

@@ -1,5 +1,4 @@
 import { useApolloClient, useMutation } from "@apollo/client";
-import { useTreatments } from "@splitsoftware/splitio-react";
 import { Button, Checkbox, Form, Modal, Space, notification } from "antd";
 import _ from "lodash";
 import React, { useEffect, useMemo, useState } from "react";
@@ -38,8 +37,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
-  insertAuditTrail: ({ jobid, billid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, billid, operation })),
+  insertAuditTrail: ({ jobid, billid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, billid, operation, type })),
 });
 
 const Templates = TemplateList("job_special");
@@ -64,19 +63,9 @@ function BillEnterModalContainer({
     "enter_bill_generate_label",
     false
   );
-  const { Enhanced_Payroll } = useTreatments(
-    ["Enhanced_Payroll"],
-    {},
-    bodyshop.imexshopid
-  );
   const formValues = useMemo(() => {
     return {
       ...billEnterModal.context.bill,
-      //Added as a part of IO-2436 for capturing parts price changes.
-      billlines: billEnterModal.context?.bill?.billlines?.map((line) => ({
-        ...line,
-        original_actual_price: line.actual_price,
-      })),
       jobid:
         (billEnterModal.context.job && billEnterModal.context.job.id) || null,
       federal_tax_rate:
@@ -110,7 +99,6 @@ function BillEnterModalContainer({
     } = values;
 
     let adjustmentsToInsert = {};
-    let payrollAdjustmentsToInsert = [];
 
     const r1 = await insertBill({
       variables: {
@@ -126,33 +114,14 @@ function BillEnterModalContainer({
                     lbr_adjustment,
                     location: lineLocation,
                     part_type,
-                    create_ppc,
-                    original_actual_price,
                     ...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,
@@ -178,20 +147,6 @@ function BillEnterModalContainer({
       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.
@@ -216,6 +171,7 @@ function BillEnterModalContainer({
             mod_lbr_ty: key,
             hours: adjustmentsToInsert[key].toFixed(1),
           }),
+          type: "jobmodifylbradj",
         });
       });
 
@@ -300,14 +256,6 @@ function BillEnterModalContainer({
                   location: li.location || location,
                   status:
                     bodyshop.md_order_statuses.default_received || "Received*",
-                  //Added parts price changes.
-                  ...(li.create_ppc &&
-                  li.original_actual_price !== li.actual_price
-                    ? {
-                        act_price_before_ppc: li.original_actual_price,
-                        act_price: li.actual_price,
-                      }
-                    : {}),
                 },
               },
             });
@@ -373,15 +321,16 @@ function BillEnterModalContainer({
       operation: AuditTrailMapping.billposted(
         r1.data.insert_bills.returning[0].invoice_number
       ),
+      type: "billposted",
     });
 
     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

@@ -79,19 +79,19 @@ export function BillFormComponent({
       });
   };
 
-  // const handleFederalTaxExemptSwitchToggle = (checked) => {
-  //   // Early gate
-  //   if (!checked) return;
-  //   const values = form.getFieldsValue("billlines");
-  //   // Gate bill lines
-  //   if (!values?.billlines?.length) return;
+  const handleFederalTaxExemptSwitchToggle = (checked) => {
+    // Early gate
+    if (!checked) return;
+    const values = form.getFieldsValue("billlines");
+    // Gate bill lines
+    if (!values?.billlines?.length) return;
 
-  //   const billlines = values.billlines.map((b) => {
-  //     b.applicable_taxes.federal = false;
-  //     return b;
-  //   });
-  //   form.setFieldsValue({ billlines });
-  // };
+    const billlines = values.billlines.map((b) => {
+      b.applicable_taxes.federal = false;
+      return b;
+    });
+    form.setFieldsValue({ billlines });
+  };
 
   useEffect(() => {
     if (job) form.validateFields(["is_credit_memo"]);
@@ -380,15 +380,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")}
@@ -396,27 +394,22 @@ 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>
-        }
-        {
-          //Removed as a part of the merge to Rome Online. Federal tax not applicable. 
-        //   bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
-        //   <Form.Item
-        //     span={2}
-        //     label={t("bills.labels.federal_tax_exempt")}
-        //     name="federal_tax_exempt"
-        //   >
-        //     <Switch onChange={handleFederalTaxExemptSwitchToggle} />
-        //   </Form.Item>
-        // ) : null
-      }
+        <Form.Item
+          span={3}
+          label={t("bills.fields.local_tax_rate")}
+          name="local_tax_rate"
+        >
+          <CurrencyInput min={0} />
+        </Form.Item>
+        {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
+          <Form.Item
+            span={2}
+            label={t("bills.labels.federal_tax_exempt")}
+            name="federal_tax_exempt"
+          >
+            <Switch onChange={handleFederalTaxExemptSwitchToggle} />
+          </Form.Item>
+        ) : null}
         <Form.Item shouldUpdate span={13}>
           {() => {
             const values = form.getFieldsValue([
@@ -442,25 +435,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.lines.component.jsx

@@ -2,7 +2,6 @@ import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import {
   Button,
-  Checkbox,
   Form,
   Input,
   InputNumber,
@@ -47,13 +46,6 @@ export function BillEnterModalLinesComponent({
     {},
     bodyshop && bodyshop.imexshopid
   );
-
-  const { Enhanced_Payroll } = useTreatments(
-    ["Enhanced_Payroll"],
-    {},
-    bodyshop.imexshopid
-  );
-
   const columns = (remove) => {
     return [
       {
@@ -102,7 +94,6 @@ export function BillEnterModalLinesComponent({
                         line_desc: opt.line_desc,
                         quantity: opt.part_qty || 1,
                         actual_price: opt.cost,
-                        original_actual_price: opt.cost,
                         cost_center: opt.part_type
                           ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
                             ? opt.part_type !== "PAE"
@@ -229,43 +220,6 @@ export function BillEnterModalLinesComponent({
             }}
           />
         ),
-        additional: (record, index) => (
-          <Form.Item
-            dependencies={["billlines", record.name, "actual_price"]}
-            noStyle
-          >
-            {() => {
-              const billLine = getFieldValue(["billlines", record.name]);
-              const jobLine = lineData.find(
-                (line) => line.id === billLine?.joblineid
-              );
-
-              if (
-                !billEdit &&
-                billLine &&
-                jobLine &&
-                billLine?.actual_price !== jobLine?.act_price
-              ) {
-                return (
-                  <Space size="small">
-                    <Form.Item
-                      noStyle
-                      label={t("joblines.fields.create_ppc")}
-                      key={`${index}ppc`}
-                      valuePropName="checked"
-                      name={[record.name, "create_ppc"]}
-                    >
-                      <Checkbox />
-                    </Form.Item>
-                    {t("joblines.fields.create_ppc")}
-                  </Space>
-                );
-              } else {
-                return null;
-              }
-            }}
-          </Form.Item>
-        ),
       },
       {
         title: t("billlines.fields.actual_cost"),
@@ -407,7 +361,7 @@ export function BillEnterModalLinesComponent({
         },
         formInput: (record, index) => <Switch disabled={disabled} />,
         additional: (record, index) => (
-          <Form.Item shouldUpdate noStyle style={{ display: "inline-block" }}>
+          <Form.Item shouldUpdate style={{ display: "inline-block" }}>
             {() => {
               const price = getFieldValue([
                 "billlines",
@@ -422,31 +376,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,
@@ -500,44 +435,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 <></>;
@@ -545,21 +458,22 @@ 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:
+              form.getFieldValue("federal_tax_exempt") === true ? false : true,
+            name: [field.name, "applicable_taxes", "federal"],
+          };
+        },
+        formInput: (record, index) => <Switch disabled={disabled} />,
+      },
       {
         title: t("billlines.fields.state_tax_applicable"),
         dataIndex: "applicable_taxes.state",
@@ -574,20 +488,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"),
 
@@ -712,7 +626,7 @@ const EditableCell = ({
   if (additional)
     return (
       <td {...restProps}>
-        <div size="small">
+        <Space size="small">
           <Form.Item
             name={dataIndex}
             labelCol={{ span: 0 }}
@@ -721,7 +635,7 @@ const EditableCell = ({
             {(formInput && formInput(record, record.name)) || children}
           </Form.Item>
           {additional && additional(record, record.name)}
-        </div>
+        </Space>
       </td>
     );
   if (wrapper)

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/card-payment-modal/card-payment-modal.component..jsx

@@ -37,8 +37,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
   toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
 });
 
@@ -102,6 +102,7 @@ const CardPaymentModalComponent = ({
         insertAuditTrail({
           jobid: payment.jobid,
           operation: AuditTrailMapping.failedpayment(),
+          type: "failedpayment",
         })
       );
     });

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

@@ -61,6 +61,10 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           text: t("courtesycars.status.in"),
           value: "courtesycars.status.in",
         },
+        {
+          text: t("courtesycars.status.inservice"),
+          value: "courtesycars.status.inservice",
+        },
         {
           text: t("courtesycars.status.out"),
           value: "courtesycars.status.out",
@@ -74,7 +78,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           value: "courtesycars.status.leasereturn",
         },
       ],
-      onFilter: (value, record) => value.includes(record.status),
+      onFilter: (value, record) => record.status === value,
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => {

client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx

@@ -0,0 +1,169 @@
+import {Card, Table, Tag} from "antd";
+import LoadingSkeleton from "../../loading-skeleton/loading-skeleton.component";
+import {useTranslation} from "react-i18next";
+import React, {useEffect, useState} from "react";
+import moment from "moment";
+import DashboardRefreshRequired from "../refresh-required.component";
+import axios from "axios";
+
+const fortyFiveDaysAgo = () => moment().subtract(45, 'days').toLocaleString();
+
+export default function JobLifecycleDashboardComponent({data, bodyshop, ...cardProps}) {
+    const {t} = useTranslation();
+    const [loading, setLoading] = useState(false);
+    const [lifecycleData, setLifecycleData] = useState(null);
+
+    useEffect(() => {
+        async function getLifecycleData() {
+            if (data && data.job_lifecycle) {
+                setLoading(true);
+                const response = await axios.post("/job/lifecycle", {
+                    jobids: data.job_lifecycle.map(x => x.id),
+                    statuses: bodyshop.md_order_statuses
+                });
+                setLifecycleData(response.data.durations);
+                setLoading(false);
+            }
+        }
+
+        getLifecycleData().catch(e => {
+            console.error(`Error in getLifecycleData: ${e}`);
+        })
+    }, [data, bodyshop]);
+
+    const columns = [
+        {
+            title: t('job_lifecycle.columns.status'),
+            dataIndex: 'status',
+            bgColor: 'red',
+            key: 'status',
+            render: (text, record) => {
+                return <Tag color={record.color}>{record.status}</Tag>
+            }
+        },
+        {
+            title: t('job_lifecycle.columns.human_readable'),
+            dataIndex: 'humanReadable',
+            key: 'humanReadable',
+        },
+        {
+            title: t('job_lifecycle.columns.status_count'),
+            key: 'statusCount',
+            render: (text, record) => {
+                return lifecycleData.statusCounts[record.status];
+            }
+        },
+        {
+            title: t('job_lifecycle.columns.percentage'),
+            dataIndex: 'percentage',
+            key: 'percentage',
+            render: (text, record) => {
+                return record.percentage.toFixed(2) + '%';
+            }
+        },
+    ];
+
+    if (!data) return null;
+
+    if (!data.job_lifecycle || !lifecycleData) return <DashboardRefreshRequired {...cardProps} />;
+
+    const extra = `${t('job_lifecycle.content.calculated_based_on')} ${lifecycleData.jobs} ${t('job_lifecycle.content.jobs_in_since')} ${fortyFiveDaysAgo()}`
+
+    return (
+        <Card title={t("job_lifecycle.titles.dashboard")} {...cardProps}>
+            <LoadingSkeleton loading={loading}>
+                <div style={{overflow: 'scroll', height: "100%"}}>
+                    <div id="bar-container" style={{
+                        display: 'flex',
+                        width: '100%',
+                        height: '100px',
+                        textAlign: 'center',
+                        borderRadius: '5px',
+                        borderWidth: '5px',
+                        borderStyle: 'solid',
+                        borderColor: '#f0f2f5',
+                        margin: 0,
+                        padding: 0
+                    }}>
+                        {lifecycleData.summations.map((key, index, array) => {
+                            const isFirst = index === 0;
+                            const isLast = index === array.length - 1;
+                            return (
+                                <div key={key.status} style={{
+                                    overflow: 'hidden',
+                                    display: 'flex',
+                                    flexDirection: 'column',
+                                    justifyContent: 'center',
+                                    alignItems: 'center',
+                                    margin: 0,
+                                    padding: 0,
+
+                                    borderTop: '1px solid #f0f2f5',
+                                    borderBottom: '1px solid #f0f2f5',
+                                    borderLeft: isFirst ? '1px solid #f0f2f5' : undefined,
+                                    borderRight: isLast ? '1px solid #f0f2f5' : undefined,
+
+                                    backgroundColor: key.color,
+                                    width: `${key.percentage}%`
+                                }}
+                                     aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
+                                     title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
+                                >
+
+                                    {key.percentage > 15 ?
+                                        <>
+                                            <div>{key.roundedPercentage}</div>
+                                            <div style={{
+                                                backgroundColor: '#f0f2f5',
+                                                borderRadius: '5px',
+                                                paddingRight: '2px',
+                                                paddingLeft: '2px',
+                                                fontSize: '0.8rem',
+                                            }}>
+                                                {key.status}
+                                            </div>
+                                        </>
+                                        : null}
+                                </div>
+                            );
+                        })}
+                    </div>
+                    <Card extra={extra} type='inner' title={t('job_lifecycle.content.legend_title')}
+                          style={{marginTop: '10px'}}>
+                        <div>
+                            {lifecycleData.summations.map((key) => (
+                                <Tag color={key.color} style={{width: '13vh', padding: '4px', margin: '4px'}}>
+                                    <div
+                                        aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
+                                        title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
+                                        style={{
+                                            backgroundColor: '#f0f2f5',
+                                            color: '#000',
+                                            padding: '4px',
+                                            textAlign: 'center'
+                                        }}>
+                                        {key.status} [{lifecycleData.statusCounts[key.status]}] ({key.roundedPercentage})
+                                    </div>
+                                </Tag>
+                            ))}
+                        </div>
+                    </Card>
+                    <Card style={{marginTop: "5px"}} type='inner' title={t("job_lifecycle.titles.top_durations")}>
+                        <Table size="small" pagination={false} columns={columns}
+                               dataSource={lifecycleData.summations.sort((a, b) => b.value - a.value).slice(0, 3)}/>
+                    </Card>
+                </div>
+            </LoadingSkeleton>
+        </Card>
+    );
+}
+
+export const JobLifecycleDashboardGQL = `
+job_lifecycle: jobs(where: {
+    actual_in: {
+        _gte: "${moment().subtract(45, 'days').toISOString()}"
+    }
+}) {
+    id
+    actual_in
+} `;

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

@@ -1,380 +1,391 @@
-import Icon, { SyncOutlined } from "@ant-design/icons";
-import { gql, useMutation, useQuery } from "@apollo/client";
-import { Button, Dropdown, Menu, PageHeader, Space, notification } from "antd";
+import Icon, {SyncOutlined} from "@ant-design/icons";
+import {gql, useMutation, useQuery} from "@apollo/client";
+import {Button, Dropdown, Menu, notification, PageHeader, Space} from "antd";
 import i18next from "i18next";
 import _ from "lodash";
 import moment from "moment";
-import React, { useState } from "react";
-import { Responsive, WidthProvider } from "react-grid-layout";
-import { useTranslation } from "react-i18next";
-import { MdClose } from "react-icons/md";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { UPDATE_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
-import {
-  selectBodyshop,
-  selectCurrentUser,
-} from "../../redux/user/user.selectors";
+import React, {useState} from "react";
+import {Responsive, WidthProvider} from "react-grid-layout";
+import {useTranslation} from "react-i18next";
+import {MdClose} from "react-icons/md";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {logImEXEvent} from "../../firebase/firebase.utils";
+import {UPDATE_DASHBOARD_LAYOUT} from "../../graphql/user.queries";
+import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import DashboardMonthlyEmployeeEfficiency, {
-  DashboardMonthlyEmployeeEfficiencyGql,
+    DashboardMonthlyEmployeeEfficiencyGql,
 } from "../dashboard-components/monthly-employee-efficiency/monthly-employee-efficiency.component";
 import DashboardMonthlyJobCosting from "../dashboard-components/monthly-job-costing/monthly-job-costing.component";
 import DashboardMonthlyLaborSales from "../dashboard-components/monthly-labor-sales/monthly-labor-sales.component";
 import DashboardMonthlyPartsSales from "../dashboard-components/monthly-parts-sales/monthly-parts-sales.component";
 import DashboardMonthlyRevenueGraph, {
-  DashboardMonthlyRevenueGraphGql,
+    DashboardMonthlyRevenueGraphGql,
 } from "../dashboard-components/monthly-revenue-graph/monthly-revenue-graph.component";
 import DashboardProjectedMonthlySales, {
-  DashboardProjectedMonthlySalesGql,
+    DashboardProjectedMonthlySalesGql,
 } from "../dashboard-components/pojected-monthly-sales/projected-monthly-sales.component";
-import DashboardTotalProductionDollars from "../dashboard-components/total-production-dollars/total-production-dollars.component";
+import DashboardTotalProductionDollars
+    from "../dashboard-components/total-production-dollars/total-production-dollars.component";
 import DashboardTotalProductionHours, {
-  DashboardTotalProductionHoursGql,
+    DashboardTotalProductionHoursGql,
 } from "../dashboard-components/total-production-hours/total-production-hours.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 //Combination of the following:
 // /node_modules/react-grid-layout/css/styles.css
 // /node_modules/react-resizable/css/styles.css
 import DashboardScheduledInToday, {
-  DashboardScheduledInTodayGql,
+    DashboardScheduledInTodayGql,
 } from "../dashboard-components/scheduled-in-today/scheduled-in-today.component";
 import DashboardScheduledOutToday, {
-  DashboardScheduledOutTodayGql,
+    DashboardScheduledOutTodayGql,
 } from "../dashboard-components/scheduled-out-today/scheduled-out-today.component";
+import JobLifecycleDashboardComponent, {
+    JobLifecycleDashboardGQL
+} from "../dashboard-components/job-lifecycle/job-lifecycle-dashboard.component";
 import "./dashboard-grid.styles.scss";
-import { GenerateDashboardData } from "./dashboard-grid.utils";
+import {GenerateDashboardData} from "./dashboard-grid.utils";
 
 const ResponsiveReactGridLayout = WidthProvider(Responsive);
 
 const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser,
-  bodyshop: selectBodyshop,
+    currentUser: selectCurrentUser,
+    bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+    //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-export function DashboardGridComponent({ currentUser, bodyshop }) {
-  const { t } = useTranslation();
-  const [state, setState] = useState({
-    ...(bodyshop.associations[0].user.dashboardlayout
-      ? bodyshop.associations[0].user.dashboardlayout
-      : { items: [], layout: {}, layouts: [] }),
-  });
-
-  const { loading, error, data, refetch } = useQuery(
-    createDashboardQuery(state),
-    { fetchPolicy: "network-only", nextFetchPolicy: "network-only" }
-  );
-
-  const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);
-
-  const handleLayoutChange = async (layout, layouts) => {
-    logImEXEvent("dashboard_change_layout");
-
-    setState({ ...state, layout, layouts });
-
-    const result = await updateLayout({
-      variables: {
-        email: currentUser.email,
-        layout: { ...state, layout, layouts },
-      },
+export function DashboardGridComponent({currentUser, bodyshop}) {
+    const {t} = useTranslation();
+    const [state, setState] = useState({
+        ...(bodyshop.associations[0].user.dashboardlayout
+            ? bodyshop.associations[0].user.dashboardlayout
+            : {items: [], layout: {}, layouts: []}),
     });
-    if (!!result.errors) {
-      notification["error"]({
-        message: t("dashboard.errors.updatinglayout", {
-          message: JSON.stringify(result.errors),
-        }),
-      });
-    }
-  };
-  const handleRemoveComponent = (key) => {
-    logImEXEvent("dashboard_remove_component", { name: key });
-    const idxToRemove = state.items.findIndex((i) => i.i === key);
 
-    const items = _.cloneDeep(state.items);
+    const {loading, error, data, refetch} = useQuery(
+        createDashboardQuery(state),
+        {fetchPolicy: "network-only", nextFetchPolicy: "network-only"}
+    );
 
-    items.splice(idxToRemove, 1);
-    setState({ ...state, items });
-  };
+    const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);
 
-  const handleAddComponent = (e) => {
-    logImEXEvent("dashboard_add_component", { name: e });
-    setState({
-      ...state,
-      items: [
-        ...state.items,
-        {
-          i: e.key,
-          x: (state.items.length * 2) % (state.cols || 12),
-          y: 99, // puts it at the bottom
-          w: componentList[e.key].w || 2,
-          h: componentList[e.key].h || 2,
-        },
-      ],
-    });
-  };
+    const handleLayoutChange = async (layout, layouts) => {
+        logImEXEvent("dashboard_change_layout");
 
-  const dashboarddata = React.useMemo(
-    () => GenerateDashboardData(data),
-    [data]
-  );
-  const existingLayoutKeys = state.items.map((i) => i.i);
-  const addComponentOverlay = (
-    <Menu onClick={handleAddComponent}>
-      {Object.keys(componentList).map((key) => (
-        <Menu.Item
-          key={key}
-          value={key}
-          disabled={existingLayoutKeys.includes(key)}
-        >
-          {componentList[key].label}
-        </Menu.Item>
-      ))}
-    </Menu>
-  );
+        setState({...state, layout, layouts});
 
-  if (error) return <AlertComponent message={error.message} type="error" />;
-
-  return (
-    <div>
-      <PageHeader
-        extra={
-          <Space>
-            <Button onClick={() => refetch()}>
-              <SyncOutlined />
-            </Button>
-            <Dropdown overlay={addComponentOverlay} trigger={["click"]}>
-              <Button>{t("dashboard.actions.addcomponent")}</Button>
-            </Dropdown>
-          </Space>
+        const result = await updateLayout({
+            variables: {
+                email: currentUser.email,
+                layout: {...state, layout, layouts},
+            },
+        });
+        if (!!result.errors) {
+            notification["error"]({
+                message: t("dashboard.errors.updatinglayout", {
+                    message: JSON.stringify(result.errors),
+                }),
+            });
         }
-      />
+    };
+    const handleRemoveComponent = (key) => {
+        logImEXEvent("dashboard_remove_component", {name: key});
+        const idxToRemove = state.items.findIndex((i) => i.i === key);
 
-      <ResponsiveReactGridLayout
-        className="layout"
-        breakpoints={{ lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 }}
-        cols={{ lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 }}
-        width="100%"
-        layouts={state.layouts}
-        onLayoutChange={handleLayoutChange}
-        //   onBreakpointChange={onBreakpointChange}
-      >
-        {state.items.map((item, index) => {
-          const TheComponent = componentList[item.i].component;
-          return (
-            <div
-              key={item.i}
-              data-grid={{
-                ...item,
-                minH: componentList[item.i].minH || 1,
-                minW: componentList[item.i].minW || 1,
-              }}
+        const items = _.cloneDeep(state.items);
+
+        items.splice(idxToRemove, 1);
+        setState({...state, items});
+    };
+
+    const handleAddComponent = (e) => {
+        logImEXEvent("dashboard_add_component", {name: e});
+        setState({
+            ...state,
+            items: [
+                ...state.items,
+                {
+                    i: e.key,
+                    x: (state.items.length * 2) % (state.cols || 12),
+                    y: 99, // puts it at the bottom
+                    w: componentList[e.key].w || 2,
+                    h: componentList[e.key].h || 2,
+                },
+            ],
+        });
+    };
+
+    const dashboarddata = React.useMemo(
+        () => GenerateDashboardData(data),
+        [data]
+    );
+    const existingLayoutKeys = state.items.map((i) => i.i);
+    const addComponentOverlay = (
+        <Menu onClick={handleAddComponent}>
+            {Object.keys(componentList).map((key) => (
+                <Menu.Item
+                    key={key}
+                    value={key}
+                    disabled={existingLayoutKeys.includes(key)}
+                >
+                    {componentList[key].label}
+                </Menu.Item>
+            ))}
+        </Menu>
+    );
+
+    if (error) return <AlertComponent message={error.message} type="error"/>;
+
+    return (
+        <div>
+            <PageHeader
+                extra={
+                    <Space>
+                        <Button onClick={() => refetch()}>
+                            <SyncOutlined/>
+                        </Button>
+                        <Dropdown overlay={addComponentOverlay} trigger={["click"]}>
+                            <Button>{t("dashboard.actions.addcomponent")}</Button>
+                        </Dropdown>
+                    </Space>
+                }
+            />
+
+            <ResponsiveReactGridLayout
+                className="layout"
+                breakpoints={{lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0}}
+                cols={{lg: 12, md: 10, sm: 6, xs: 4, xxs: 2}}
+                width="100%"
+                layouts={state.layouts}
+                onLayoutChange={handleLayoutChange}
+                //   onBreakpointChange={onBreakpointChange}
             >
-              <LoadingSkeleton loading={loading}>
-                <Icon
-                  component={MdClose}
-                  key={item.i}
-                  style={{
-                    position: "absolute",
-                    zIndex: "2",
-                    right: ".25rem",
-                    top: ".25rem",
-                    cursor: "pointer",
-                  }}
-                  onClick={() => handleRemoveComponent(item.i)}
-                />
-                <TheComponent className="dashboard-card" data={dashboarddata} />
-              </LoadingSkeleton>
-            </div>
-          );
-        })}
-      </ResponsiveReactGridLayout>
-    </div>
-  );
+                {state.items.map((item, index) => {
+                    const TheComponent = componentList[item.i].component;
+                    return (
+                        <div
+                            key={item.i}
+                            data-grid={{
+                                ...item,
+                                minH: componentList[item.i].minH || 1,
+                                minW: componentList[item.i].minW || 1,
+                            }}
+                        >
+                            <LoadingSkeleton loading={loading}>
+                                <Icon
+                                    component={MdClose}
+                                    key={item.i}
+                                    style={{
+                                        position: "absolute",
+                                        zIndex: "2",
+                                        right: ".25rem",
+                                        top: ".25rem",
+                                        cursor: "pointer",
+                                    }}
+                                    onClick={() => handleRemoveComponent(item.i)}
+                                />
+                                <TheComponent className="dashboard-card" bodyshop={bodyshop} data={dashboarddata}/>
+                            </LoadingSkeleton>
+                        </div>
+                    );
+                })}
+            </ResponsiveReactGridLayout>
+        </div>
+    );
 }
 
 export default connect(
-  mapStateToProps,
-  mapDispatchToProps
+    mapStateToProps,
+    mapDispatchToProps
 )(DashboardGridComponent);
 
 const componentList = {
-  ProductionDollars: {
-    label: i18next.t("dashboard.titles.productiondollars"),
-    component: DashboardTotalProductionDollars,
-    gqlFragment: null,
-    w: 1,
-    h: 1,
-    minW: 2,
-    minH: 1,
-  },
-  ProductionHours: {
-    label: i18next.t("dashboard.titles.productionhours"),
-    component: DashboardTotalProductionHours,
-    gqlFragment: DashboardTotalProductionHoursGql,
-    w: 3,
-    h: 1,
-    minW: 3,
-    minH: 1,
-  },
-  ProjectedMonthlySales: {
-    label: i18next.t("dashboard.titles.projectedmonthlysales"),
-    component: DashboardProjectedMonthlySales,
-    gqlFragment: DashboardProjectedMonthlySalesGql,
-    w: 2,
-    h: 1,
-    minW: 2,
-    minH: 1,
-  },
-  MonthlyRevenueGraph: {
-    label: i18next.t("dashboard.titles.monthlyrevenuegraph"),
-    component: DashboardMonthlyRevenueGraph,
-    gqlFragment: DashboardMonthlyRevenueGraphGql,
-    w: 4,
-    h: 2,
-    minW: 4,
-    minH: 2,
-  },
-  MonthlyJobCosting: {
-    label: i18next.t("dashboard.titles.monthlyjobcosting"),
-    component: DashboardMonthlyJobCosting,
-    gqlFragment: null,
-    minW: 6,
-    minH: 3,
-    w: 6,
-    h: 3,
-  },
-  MonthlyPartsSales: {
-    label: i18next.t("dashboard.titles.monthlypartssales"),
-    component: DashboardMonthlyPartsSales,
-    gqlFragment: null,
-    minW: 2,
-    minH: 2,
-    w: 2,
-    h: 2,
-  },
-  MonthlyLaborSales: {
-    label: i18next.t("dashboard.titles.monthlylaborsales"),
-    component: DashboardMonthlyLaborSales,
-    gqlFragment: null,
-    minW: 2,
-    minH: 2,
-    w: 2,
-    h: 2,
-  },
-  MonthlyEmployeeEfficency: {
-    label: i18next.t("dashboard.titles.monthlyemployeeefficiency"),
-    component: DashboardMonthlyEmployeeEfficiency,
-    gqlFragment: DashboardMonthlyEmployeeEfficiencyGql,
-    minW: 2,
-    minH: 2,
-    w: 2,
-    h: 2,
-  },
-  ScheduleInToday: {
-    label: i18next.t("dashboard.titles.scheduledintoday"),
-    component: DashboardScheduledInToday,
-    gqlFragment: DashboardScheduledInTodayGql,
-    minW: 6,
-    minH: 2,
-    w: 10,
-    h: 3,
-  },
-  ScheduleOutToday: {
-    label: i18next.t("dashboard.titles.scheduledouttoday"),
-    component: DashboardScheduledOutToday,
-    gqlFragment: DashboardScheduledOutTodayGql,
-    minW: 6,
-    minH: 2,
-    w: 10,
-    h: 3,
-  },
+    ProductionDollars: {
+        label: i18next.t("dashboard.titles.productiondollars"),
+        component: DashboardTotalProductionDollars,
+        gqlFragment: null,
+        w: 1,
+        h: 1,
+        minW: 2,
+        minH: 1,
+    },
+    ProductionHours: {
+        label: i18next.t("dashboard.titles.productionhours"),
+        component: DashboardTotalProductionHours,
+        gqlFragment: DashboardTotalProductionHoursGql,
+        w: 3,
+        h: 1,
+        minW: 3,
+        minH: 1,
+    },
+    ProjectedMonthlySales: {
+        label: i18next.t("dashboard.titles.projectedmonthlysales"),
+        component: DashboardProjectedMonthlySales,
+        gqlFragment: DashboardProjectedMonthlySalesGql,
+        w: 2,
+        h: 1,
+        minW: 2,
+        minH: 1,
+    },
+    MonthlyRevenueGraph: {
+        label: i18next.t("dashboard.titles.monthlyrevenuegraph"),
+        component: DashboardMonthlyRevenueGraph,
+        gqlFragment: DashboardMonthlyRevenueGraphGql,
+        w: 4,
+        h: 2,
+        minW: 4,
+        minH: 2,
+    },
+    MonthlyJobCosting: {
+        label: i18next.t("dashboard.titles.monthlyjobcosting"),
+        component: DashboardMonthlyJobCosting,
+        gqlFragment: null,
+        minW: 6,
+        minH: 3,
+        w: 6,
+        h: 3,
+    },
+    MonthlyPartsSales: {
+        label: i18next.t("dashboard.titles.monthlypartssales"),
+        component: DashboardMonthlyPartsSales,
+        gqlFragment: null,
+        minW: 2,
+        minH: 2,
+        w: 2,
+        h: 2,
+    },
+    MonthlyLaborSales: {
+        label: i18next.t("dashboard.titles.monthlylaborsales"),
+        component: DashboardMonthlyLaborSales,
+        gqlFragment: null,
+        minW: 2,
+        minH: 2,
+        w: 2,
+        h: 2,
+    },
+    // Typo in Efficency should be Efficiency, but changing it would reset users dashboard settings
+    MonthlyEmployeeEfficency: {
+        label: i18next.t("dashboard.titles.monthlyemployeeefficiency"),
+        component: DashboardMonthlyEmployeeEfficiency,
+        gqlFragment: DashboardMonthlyEmployeeEfficiencyGql,
+        minW: 2,
+        minH: 2,
+        w: 2,
+        h: 2,
+    },
+    ScheduleInToday: {
+        label: i18next.t("dashboard.titles.scheduledintoday"),
+        component: DashboardScheduledInToday,
+        gqlFragment: DashboardScheduledInTodayGql,
+        minW: 6,
+        minH: 2,
+        w: 10,
+        h: 3,
+    },
+    ScheduleOutToday: {
+        label: i18next.t("dashboard.titles.scheduledouttoday"),
+        component: DashboardScheduledOutToday,
+        gqlFragment: DashboardScheduledOutTodayGql,
+        minW: 6,
+        minH: 2,
+        w: 10,
+        h: 3,
+    },
+    JobLifecycle: {
+        label: i18next.t("dashboard.titles.joblifecycle"),
+        component: JobLifecycleDashboardComponent,
+        gqlFragment: JobLifecycleDashboardGQL,
+        minW: 6,
+        minH: 3,
+        w: 6,
+        h: 3,
+    },
 };
 
 const createDashboardQuery = (state) => {
-  const componentBasedAdditions =
-    state &&
-    Array.isArray(state.layout) &&
-    state.layout
-      .map((item, index) => componentList[item.i].gqlFragment || "")
-      .join("");
-  return gql`
-    query QUERY_DASHBOARD_DETAILS { ${componentBasedAdditions || ""} 
-      monthly_sales: jobs(where: {_and: [
-        { voided: {_eq: false}},
-        {date_invoiced: {_gte: "${moment()
+    const componentBasedAdditions =
+        state &&
+        Array.isArray(state.layout) &&
+        state.layout
+            .map((item, index) => componentList[item.i].gqlFragment || "")
+            .join("");
+    return gql`
+        query QUERY_DASHBOARD_DETAILS { ${componentBasedAdditions || ""}
+            monthly_sales: jobs(where: {_and: [
+                { voided: {_eq: false}},
+                {date_invoiced: {_gte: "${moment()
           .startOf("month")
-          .startOf("day")
-          .toISOString()}"}}, {date_invoiced: {_lte: "${moment()
+                .startOf("day")
+                .toISOString()}"}}, {date_invoiced: {_lte: "${moment()
     .endOf("month")
     .endOf("day")
     .toISOString()}"}}]}) {
       id
-      ro_number
-      date_invoiced
-      job_totals
-      rate_la1
-      rate_la2
-      rate_la3
-      rate_la4
-      rate_laa
-      rate_lab
-      rate_lad
-      rate_lae
-      rate_laf
-      rate_lag
-      rate_lam
-      rate_lar
-      rate_las
-      rate_lau
-      rate_ma2s
-      rate_ma2t
-      rate_ma3s
-      rate_mabl
-      rate_macs
-      rate_mahw
-      rate_mapa
-      rate_mash
-      rate_matd
-      joblines(where: { removed: { _eq: false } }) {
-        id
-        mod_lbr_ty
-        mod_lb_hrs
-        act_price
-        part_qty
-        part_type
-      }
-    }
-    production_jobs: jobs(where: { inproduction: { _eq: true } }) {
-      id
-      ro_number
-      ins_co_nm
-      job_totals
-      joblines(where: { removed: { _eq: false } }) {
-        id
-        mod_lbr_ty
-        mod_lb_hrs
-        act_price
-        part_qty
-        part_type
-      }
-      labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
-        aggregate {
-          sum {
-            mod_lb_hrs
-          }
-        }
-      }
-      larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }) {
-        aggregate {
-          sum {
-            mod_lb_hrs
-          }
-        }
-      }
-    }
-  }`;
+                ro_number
+                date_invoiced
+                job_totals
+                rate_la1
+                rate_la2
+                rate_la3
+                rate_la4
+                rate_laa
+                rate_lab
+                rate_lad
+                rate_lae
+                rate_laf
+                rate_lag
+                rate_lam
+                rate_lar
+                rate_las
+                rate_lau
+                rate_ma2s
+                rate_ma2t
+                rate_ma3s
+                rate_mabl
+                rate_macs
+                rate_mahw
+                rate_mapa
+                rate_mash
+                rate_matd
+                joblines(where: { removed: { _eq: false } }) {
+                    id
+                    mod_lbr_ty
+                    mod_lb_hrs
+                    act_price
+                    part_qty
+                    part_type
+                }
+                }
+                production_jobs: jobs(where: { inproduction: { _eq: true } }) {
+                    id
+                    ro_number
+                    ins_co_nm
+                    job_totals
+                    joblines(where: { removed: { _eq: false } }) {
+                    id
+                    mod_lbr_ty
+                    mod_lb_hrs
+                    act_price
+                    part_qty
+                    part_type
+                }
+                labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
+                    aggregate {
+                        sum {
+                            mod_lb_hrs
+                        }
+                    }
+                }
+                larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }) {
+                    aggregate {
+                        sum {
+                            mod_lb_hrs
+                        }
+                    }
+                }
+                }
+            }`;
 };

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/header/header.component.jsx

@@ -13,8 +13,7 @@ import Icon, {
   FileFilled,
   //GlobalOutlined,
   HomeFilled,
-  ImportOutlined,
-  // InfoCircleOutlined,
+  ImportOutlined, InfoCircleOutlined,
   LineChartOutlined,
   PaperClipOutlined,
   PhoneOutlined,
@@ -27,11 +26,8 @@ import Icon, {
   UserOutlined,
 } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
-import {
-  Layout,
-  Menu, // Switch, Tooltip
-} from "antd";
-import React from "react"; //, { useEffect, useState }
+import {Layout, Menu, Switch, Tooltip} from "antd";
+import React, {useEffect, useState} from "react";
 import { useTranslation } from "react-i18next";
 import { BsKanban } from "react-icons/bs";
 import {
@@ -56,7 +52,7 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-//import { handleBeta, setBeta, checkBeta } from "../../utils/handleBeta";
+import {handleBeta, setBeta, checkBeta} from "../../utils/handleBeta";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -107,20 +103,20 @@ function Header({
     {},
     bodyshop && bodyshop.imexshopid
   );
-  //const [betaSwitch, setBetaSwitch] = useState(false);
+  const [betaSwitch, setBetaSwitch] = useState(false);
 
   const { t } = useTranslation();
 
-  // useEffect(() => {
-  //   const isBeta = checkBeta();
-  //   setBetaSwitch(isBeta);
-  // }, []);
+  useEffect(() => {
+    const isBeta = checkBeta();
+    setBetaSwitch(isBeta);
+  }, []);
 
-  // const betaSwitchChange = (checked) => {
-  //   setBeta(checked);
-  //   setBetaSwitch(checked);
-  //   handleBeta();
-  // };
+  const betaSwitchChange = (checked) => {
+    setBeta(checked);
+    setBetaSwitch(checked);
+    handleBeta();
+  }
 
   return (
     <Layout.Header>
@@ -285,13 +281,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} />}
@@ -406,12 +395,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>
@@ -447,18 +444,17 @@ function Header({
             </Menu.Item>
           ))}
         </Menu.SubMenu>
-        {
-          // <Menu.Item style={{marginLeft: 'auto'}} key="profile">
-          //   <Tooltip title="A more modern ImEX Online is ready for you to try! You can switch back at any time.">
-          //     <InfoCircleOutlined/>
-          //     <span style={{marginRight: 8}}>Try the new ImEX Online</span>
-          //     <Switch
-          //         checked={betaSwitch}
-          //         onChange={betaSwitchChange}
-          //     />
-          //   </Tooltip>
-          // </Menu.Item>
-        }
+        <Menu.Item style={{marginLeft: 'auto'}} key="profile">
+          <Tooltip title="A more modern ImEX Online is ready for you to try! You can switch back at any time.">
+            <InfoCircleOutlined/>
+            <span style={{marginRight: 8}}>Try the new ImEX Online</span>
+            <Switch
+                checked={betaSwitch}
+                onChange={betaSwitchChange}
+            />
+          </Tooltip>
+        </Menu.Item>
+
       </Menu>
     </Layout.Header>
   );

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

@@ -53,6 +53,7 @@ export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
           insertAuditTrail({
             jobid: event.job.id,
             operation: AuditTrailMapping.appointmentcancel(lost_sale_reason),
+            type: "appointmentcancel",
           })
         );
       }

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

@@ -87,8 +87,7 @@ export default function JobBillsTotalComponent({
   const totalPartsSublet = Dinero(totals.parts.parts.total)
     .add(Dinero(totals.parts.sublets.total))
     .add(Dinero(totals.additional.shipping))
-    .add(Dinero(totals.additional.towing))
-    .add(Dinero(totals.additional.additionalCosts));
+    .add(Dinero(totals.additional.towing));
 
   const discrepancy = totalPartsSublet.subtract(billTotals);
 

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

@@ -28,8 +28,8 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function JobChecklistForm({
@@ -183,6 +183,7 @@ export function JobChecklistForm({
           (type === "intake" && bodyshop.md_ro_statuses.default_arrived) ||
             (type === "deliver" && bodyshop.md_ro_statuses.default_delivered)
         ),
+        type: "jobchecklist",
       });
     } else {
       notification["error"]({

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-cards/job-detail-cards.totals.component.jsx

@@ -18,10 +18,8 @@ export default function JobDetailCardsTotalsComponent({ loading, data }) {
           />
           <Statistic
             className="imex-flex-row__margin-large"
-            title={t("jobs.fields.ded_amt")}
-            value={Dinero({
-              amount: Math.round((data.ded_amt || 0) * 100),
-            }).toFormat()}
+            title={t("jobs.fields.customerowing")}
+            value={Dinero(data.job_totals.totals.custPayable.total).toFormat()}
           />
           <Statistic
             className="imex-flex-row__margin-large"

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-employee-assignments/job-employee-assignments.container.jsx

@@ -14,8 +14,8 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(
   mapStateToProps,
@@ -46,6 +46,7 @@ export function JobEmployeeAssignmentsContainer({
     insertAuditTrail({
       jobid: job.id,
       operation: AuditTrailMapping.jobassignmentchange(operation, name),
+      type: "jobassignmentchange",
     });
 
     if (!!result.errors) {
@@ -76,6 +77,7 @@ export function JobEmployeeAssignmentsContainer({
     insertAuditTrail({
       jobid: job.id,
       operation: AuditTrailMapping.jobassignmentremoved(operation),
+      type: "jobassignmentremoved",
     });
     setLoading(false);
   };

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-convert-to-labor/job-line-convert-to-labor.component.jsx

@@ -28,8 +28,8 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(
   mapStateToProps,
@@ -113,6 +113,7 @@ export function JobLineConvertToLabor({
         hours: calculateAdjustment({ mod_lbr_ty, job, jobline }).toFixed(1),
         mod_lbr_ty,
       }),
+      type: "jobmodifylbradj",
     });
     setLoading(false);
     setVisibility(false);

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,5 +1,5 @@
 import { useMutation } from "@apollo/client";
-import { notification, Select, Space } from "antd";
+import { notification, Select } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -77,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-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-reconciliation-modal/job-reconciliation-modal.component.jsx

@@ -19,8 +19,7 @@ export default function JobReconciliationModalComponent({ job, bills }) {
 
   const jobLineData = job.joblines.filter(
     (j) =>
-      (j.part_type !== "PAE" && j.act_price !== 0 && j.part_qty !== 0) ||
-      j.misc_amt !== 0 ||
+      (j.part_type !== null && j.part_type !== "PAE") ||
       (j.line_desc &&
         j.line_desc.toLowerCase().includes("towing") &&
         j.lbr_op === "OP13") ||

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,109 +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"
-              } - ${[
-                job.cieca_pft.ty1_rate1,
-                job.cieca_pft.ty1_rate2,
-                job.cieca_pft.ty1_rate3,
-                job.cieca_pft.ty1_rate4,
-                job.cieca_pft.ty1_rate5,
-              ]
-                .filter((i) => i > 0)
-                .join(", ")}%`,
-              total: job.job_totals.totals.us_sales_tax_breakdown.ty1Tax,
+              key: t("jobs.fields.ca_bc_pvrt"),
+              total: job.job_totals.additional.pvrt,
             },
-            {
-              key: `${
-                bodyshop.md_responsibility_centers.taxes.tax_ty2?.tax_type2 ||
-                "T2"
-              } - ${[
-                job.cieca_pft.ty2_rate1,
-                job.cieca_pft.ty2_rate2,
-                job.cieca_pft.ty2_rate3,
-                job.cieca_pft.ty2_rate4,
-                job.cieca_pft.ty2_rate5,
-              ]
-                .filter((i) => i > 0)
-                .join(", ")}%`,
-              total: job.job_totals.totals.us_sales_tax_breakdown.ty2Tax,
-            },
-            {
-              key: `${
-                bodyshop.md_responsibility_centers.taxes.tax_ty3?.tax_type3 ||
-                "T3"
-              } - ${[
-                job.cieca_pft.ty3_rate1,
-                job.cieca_pft.ty3_rate2,
-                job.cieca_pft.ty3_rate3,
-                job.cieca_pft.ty3_rate4,
-                job.cieca_pft.ty3_rate5,
-              ]
-                .filter((i) => i > 0)
-                .join(", ")}%`,
-              total: job.job_totals.totals.us_sales_tax_breakdown.ty3Tax,
-            },
-            {
-              key: `${
-                bodyshop.md_responsibility_centers.taxes.tax_ty4?.tax_type4 ||
-                "T4"
-              } - ${[
-                job.cieca_pft.ty4_rate1,
-                job.cieca_pft.ty4_rate2,
-                job.cieca_pft.ty4_rate3,
-                job.cieca_pft.ty4_rate4,
-                job.cieca_pft.ty4_rate5,
-              ]
-                .filter((i) => i > 0)
-                .join(", ")}%`,
-              total: job.job_totals.totals.us_sales_tax_breakdown.ty4Tax,
-            },
-            {
-              key: `${
-                bodyshop.md_responsibility_centers.taxes.tax_ty5?.tax_type5 ||
-                "TT"
-              } - ${[
-                job.cieca_pft.ty5_rate1,
-                job.cieca_pft.ty5_rate2,
-                job.cieca_pft.ty5_rate3,
-                job.cieca_pft.ty5_rate4,
-                job.cieca_pft.ty5_rate5,
-              ]
-                .filter((i) => i > 0)
-                .join(", ")}%`,
-              total: job.job_totals.totals.us_sales_tax_breakdown.ty5Tax,
-            },
-            {
-              key: t("jobs.labels.total_sales_tax"),
-              bold: true,
-              total: Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty1Tax)
-                .add(
-                  Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty2Tax)
-                )
-                .add(
-                  Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty3Tax)
-                )
-                .add(
-                  Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty4Tax)
-                )
-                .add(
-                  Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty5Tax)
-                ).toJSON(),
-            },
-          ].filter((item) => item.total.amount !== 0)
-        : [
-            {
-              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,
@@ -140,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,
@@ -164,7 +81,7 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
         bold: true,
       },
     ];
-  }, [job.job_totals, job.cieca_pft, t, bodyshop.md_responsibility_centers]);
+  }, [job.job_totals, t, bodyshop.region_config]);
 
   const columns = [
     {

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

@@ -14,8 +14,8 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminStatus);
 
@@ -32,6 +32,7 @@ export function JobsAdminStatus({ insertAuditTrail, bodyshop, job }) {
         insertAuditTrail({
           jobid: job.id,
           operation: AuditTrailMapping.admin_jobstatuschange(status),
+          type: "admin_jobstatuschange",
         });
         // refetch();
       })

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

@@ -20,8 +20,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(
@@ -57,6 +57,7 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
             ? DateTimeFormat(changedAuditFields[key])
             : changedAuditFields[key]
         ),
+        type: "admin_jobfieldchange",
       });
     });
 

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

@@ -23,8 +23,8 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(
   mapStateToProps,
@@ -59,6 +59,7 @@ export function JobAdminMarkReexport({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobmarkforreexport(),
+        type: "admin_jobmarkforreexport",
       });
     } else {
       notification["error"]({
@@ -99,6 +100,7 @@ export function JobAdminMarkReexport({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobmarkexported(),
+        type: "admin_jobmarkexported",
       });
     } else {
       notification["error"]({
@@ -124,6 +126,7 @@ export function JobAdminMarkReexport({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobuninvoice(),
+        type: "admin_jobuninvoice",
       });
     } else {
       notification["error"]({

client/src/components/jobs-admin-remove-ar/jobs-admin-remove-ar.component.jsx

@@ -10,8 +10,8 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({});
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminRemoveAR);
@@ -34,6 +34,7 @@ export function JobsAdminRemoveAR({ insertAuditTrail, job }) {
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_job_remove_from_ar(value),
+        type: "admin_job_remove_from_ar",
       });
       setSwitchValue(value);
     } else {

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

@@ -17,8 +17,8 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminUnvoid);
 
@@ -49,6 +49,7 @@ export function JobsAdminUnvoid({
       insertAuditTrail({
         jobid: job.id,
         operation: AuditTrailMapping.admin_jobunvoid(),
+        type: "admin_jobunvoid",
       });
     } else {
       notification["error"]({

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.

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, Row, notification } from "antd";
 import Axios from "axios";
-import _ from "lodash";
+import Dinero from "dinero.js";
 import moment from "moment-business-days";
 import queryString from "query-string";
 import React, { useCallback, useEffect, useState } from "react";
@@ -31,7 +31,7 @@ import {
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
-//import confirmDialog from "../../utils/asyncConfirm";
+import confirmDialog from "../../utils/asyncConfirm";
 import CriticalPartsScan from "../../utils/criticalPartsScan";
 import AlertComponent from "../alert/alert.component";
 import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component";
@@ -47,8 +47,8 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export function JobsAvailableContainer({
   bodyshop,
@@ -100,15 +100,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!
@@ -118,21 +117,17 @@ 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) {
@@ -147,9 +142,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: {
@@ -173,23 +168,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: () => {
@@ -201,9 +190,10 @@ export function JobsAvailableContainer({
       insertAuditTrail({
         jobid: r.data.insert_jobs.returning[0].id,
         operation: AuditTrailMapping.jobimported(),
+        type: "jobimported",
       });
 
-      await deleteJob({
+      deleteJob({
         variables: { id: estData.id },
       }).then((r) => {
         refetch();
@@ -211,12 +201,12 @@ export function JobsAvailableContainer({
       });
 
       setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
-    } catch (r) {
+    } catch (err) {
       //error while inserting
       notification["error"]({
-        message: t("jobs.errors.creating", { error: r.message }),
+        message: t("jobs.errors.creating", { error: err.message }),
       });
-      refetch().catch((err) => {
+      refetch().catch((e) => {
         console.error(
           `Something went wrong in jobs available table container - ${
             err.message || ""
@@ -225,7 +215,6 @@ export function JobsAvailableContainer({
       });
       setInsertLoading(false);
       setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
-
     }
   };
 
@@ -249,7 +238,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);
 
       if (updateSchComp.checked === true) {
         if (updateSchComp.automatic === true) {
@@ -363,6 +351,7 @@ export function JobsAvailableContainer({
       insertAuditTrail({
         jobid: selectedJob,
         operation: AuditTrailMapping.jobsupplement(),
+        type: "jobsupplement",
       });
     }
   };
@@ -441,25 +430,6 @@ export function JobsAvailableContainer({
         updateSchComp={updateSchComp}
         setSchComp={setSchComp}
       />
-      {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
@@ -491,158 +461,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-change-status/jobs-change-status.component.jsx

@@ -16,8 +16,8 @@ const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
@@ -35,6 +35,7 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
         insertAuditTrail({
           jobid: job.id,
           operation: AuditTrailMapping.jobstatuschange(status),
+          type: "jobstatuschange",
         });
         // refetch();
       })

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-close-export-button/jobs-close-export-button.component.jsx

@@ -23,8 +23,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 function updateJobCache(items) {
@@ -192,6 +192,7 @@ export function JobsCloseExportButton({
           insertAuditTrail({
             jobid: jobId,
             operation: AuditTrailMapping.jobexported(),
+            type: "jobexported",
           });
           updateJobCache(
             jobUpdateResponse.data.update_jobs.returning.map((job) => job.id)
@@ -217,6 +218,7 @@ export function JobsCloseExportButton({
         insertAuditTrail({
           jobid: jobId,
           operation: AuditTrailMapping.jobexported(),
+          type: "jobexported",
         });
         updateJobCache([
           ...new Set(

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

@@ -25,8 +25,8 @@ const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function JobsConvertButton({
@@ -78,6 +78,7 @@ export function JobsConvertButton({
         operation: AuditTrailMapping.jobconverted(
           res.data.update_jobs.returning[0].ro_number
         ),
+        type: "jobconverted",
       });
 
       setVisible(false);

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-header-actions/jobs-detail-header-actions.addtoproduction.util.jsx

@@ -29,6 +29,7 @@ export default function AddToProduction(
         insertAuditTrail({
           jobid: jobId,
           operation: AuditTrailMapping.jobinproductionchange(!remove),
+          type: "jobinproductionchange",
         })
       );
       if (completionCallback) completionCallback();

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

@@ -50,12 +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 })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function JobsDetailHeaderActions({
@@ -69,7 +67,6 @@ export function JobsDetailHeaderActions({
   setJobCostingContext,
   jobRO,
   setTimeTicketContext,
-  setTimeTicketTaskContext,
   setCardPaymentContext,
   insertAuditTrail,
 }) {
@@ -118,6 +115,7 @@ export function JobsDetailHeaderActions({
           ? !job.production_vars.alert
           : true
       ),
+      type: "alertToggle",
     });
   };
 
@@ -137,6 +135,7 @@ export function JobsDetailHeaderActions({
       operation: AuditTrailMapping.jobsuspend(
         !!job.suspended ? !job.suspended : true
       ),
+      type: "jobsuspend",
     });
   };
 
@@ -193,6 +192,7 @@ export function JobsDetailHeaderActions({
                       jobid: job.id,
                       operation:
                         AuditTrailMapping.appointmentcancel(lost_sale_reason),
+                      type: "appointmentcancel",
                     });
                     return;
                   }
@@ -285,24 +285,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}
@@ -570,6 +552,7 @@ export function JobsDetailHeaderActions({
                   insertAuditTrail({
                     jobid: job.id,
                     operation: AuditTrailMapping.jobvoid(),
+                    type: "jobvoid",
                   });
                   //go back to jobs list.
                   history.push(`/manage/`);

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

@@ -4,7 +4,7 @@ import {
   PauseCircleOutlined,
   WarningFilled,
 } from "@ant-design/icons";
-import { Card, Col, Row, Space, Tag, Tooltip } from "antd";
+import { Card, Col, Divider, Row, Space, Tag, Tooltip } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -26,6 +26,7 @@ import ProductionListColumnComment from "../production-list-columns/production-l
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 import "./jobs-detail-header.styles.scss";
+import moment from "moment";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -62,6 +63,13 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
   ${job.v_make_desc || ""} 
   ${job.v_model_desc || ""}`.trim();
 
+  const bodyHrs = job.joblines
+    .filter((j) => j.mod_lbr_ty !== "LAR")
+    .reduce((acc, val) => acc + val.mod_lb_hrs, 0);
+  const refinishHrs = job.joblines
+    .filter((line) => line.mod_lbr_ty === "LAR")
+    .reduce((acc, val) => acc + val.mod_lb_hrs, 0);
+
   const ownerTitle = OwnerNameDisplayFunction(job).trim();
 
   return (
@@ -93,7 +101,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 {job.status === bodyshop.md_ro_statuses.default_scheduled &&
                 job.scheduled_in ? (
                   <Tag>
-                    <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
+                    <Link to={`/manage/schedule?date=${moment(job.scheduled_in).format('YYYY-MM-DD')}`}>
+                      <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
+                    </Link>
                   </Tag>
                 ) : null}
               </Space>
@@ -299,6 +309,11 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
         >
           <div>
             <JobEmployeeAssignments job={job} />
+            <Divider style={{ margin: ".5rem" }} />
+            <DataLabel label={t("jobs.labels.labor_hrs")}>
+              {bodyHrs.toFixed(1)} / {refinishHrs.toFixed(1)} /{" "}
+              {(bodyHrs + refinishHrs).toFixed(1)}
+            </DataLabel>
           </div>
         </Card>
       </Col>

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-export-all-button/jobs-export-all-button.component.jsx

@@ -23,8 +23,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 function updateJobCache(items) {
@@ -189,6 +189,7 @@ export function JobsExportAllButton({
                 insertAuditTrail({
                   jobid: job.id,
                   operation: AuditTrailMapping.jobexported(),
+                  type: "jobexported",
                 });
               });
               updateJobCache(
@@ -230,6 +231,7 @@ export function JobsExportAllButton({
               insertAuditTrail({
                 jobid: successfulTransactionsSet[0],
                 operation: AuditTrailMapping.jobexported(),
+                type: "jobexported",
               });
             }
             updateJobCache(successfulTransactionsSet);

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

@@ -21,6 +21,7 @@ import useLocalStorage from "../../utils/useLocalStorage";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import { OwnerNameDisplayFunction } from "./../owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -145,7 +146,8 @@ export function JobsList({ bodyshop }) {
       key: "owner",
       ellipsis: true,
       responsive: ["md"],
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      sorter: (a, b) =>
+        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
@@ -188,7 +190,8 @@ export function JobsList({ bodyshop }) {
       dataIndex: "status",
       key: "status",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a.status, b.status),
+      sorter: (a, b) =>
+        statusSort(a.status, b.status, bodyshop.md_ro_statuses.active_statuses),
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       filteredValue: filter?.status || null,
@@ -219,6 +222,15 @@ export function JobsList({ bodyshop }) {
       dataIndex: "vehicle",
       key: "vehicle",
       ellipsis: true,
+      sorter: (a, b) =>
+        alphaSort(
+          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+            a.v_model_desc || ""
+          }`,
+          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
       render: (text, record) => {
         return record.vehicleid ? (
           <Link
@@ -266,6 +278,9 @@ export function JobsList({ bodyshop }) {
       dataIndex: "ins_co_nm",
       key: "ins_co_nm",
       ellipsis: true,
+      sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
+      sortOrder:
+        state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order,
       filteredValue: filter?.ins_co_nm || null,
       filters:
         (jobs &&
@@ -302,6 +317,13 @@ export function JobsList({ bodyshop }) {
       key: "estimator",
       ellipsis: true,
       responsive: ["xl"],
+      sorter: (a, b) =>
+        alphaSort(
+          `${a.est_ct_fn || ""} ${a.est_ct_ln || ""}`.trim(),
+          `${b.est_ct_fn || ""} ${b.est_ct_ln || ""}`.trim()
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "estimator" && state.sortedInfo.order,
       filterSearch: true,
       filteredValue: filter?.estimator || null,
       filters:

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

@@ -19,8 +19,8 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobNotesContainer);
 
@@ -49,6 +49,7 @@ export function JobNotesContainer({ jobId, insertAuditTrail }) {
       insertAuditTrail({
         jobid: jobId,
         operation: AuditTrailMapping.jobnotedeleted(),
+        type: "jobnotedeleted",
       });
     });
     setDeleteLoading(false);

client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx

@@ -20,8 +20,8 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 export default connect(
   mapStateToProps,
@@ -76,6 +76,7 @@ export function LaborAllocationsAdjustmentEdit({
             values.hours -
             ((adjustments && adjustments[mod_lbr_ty]) || 0).toFixed(1),
         }),
+        type: "jobmodifylbradj",
       });
     }
     setLoading(false);

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/note-upsert-modal/note-upsert-modal.container.jsx

@@ -19,8 +19,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("noteUpsert")),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function NoteUpsertModalContainer({
@@ -70,6 +70,7 @@ export function NoteUpsertModalContainer({
         insertAuditTrail({
           jobid: context.jobId,
           operation: AuditTrailMapping.jobnoteupdated(),
+          type: "jobnoteupdated",
         });
       });
       if (refetch) refetch();
@@ -102,6 +103,7 @@ export function NoteUpsertModalContainer({
           insertAuditTrail({
             jobid: newJobId,
             operation: AuditTrailMapping.jobnoteadded(),
+            type: "jobnoteadded",
           });
         });
       }
@@ -115,6 +117,7 @@ export function NoteUpsertModalContainer({
       insertAuditTrail({
         jobid: context.jobId,
         operation: AuditTrailMapping.jobnoteadded(),
+        type: "jobnoteadded",
       });
     }
   };

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

@@ -24,7 +24,7 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
   const handleTableChange = (pagination, filters, sorter) => {
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
-  
+
   const columns = [
     {
       title: t("jobs.fields.ro_number"),
@@ -44,6 +44,15 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       title: t("jobs.fields.vehicle"),
       dataIndex: "vehicleid",
       key: "vehicleid",
+      sorter: (a, b) =>
+        alphaSort(
+          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+            a.v_model_desc || ""
+          }`,
+          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "vehicleid" && state.sortedInfo.order,
       render: (text, record) =>
         record.vehicleid ? (
           <Link to={`/manage/vehicles/${record.vehicleid}`}>
@@ -67,9 +76,15 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-      sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
+      sorter: (a, b) =>
+        statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+      filters: bodyshop.md_ro_statuses.statuses.map((status) => ({
+        text: status,
+        value: status,
+      })),
+      onFilter: (value, record) => value.includes(record.status),
     },
 
     {

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/parts-order-modal/parts-order-modal.container.jsx

@@ -1,12 +1,16 @@
-import { useMutation, useQuery, useApolloClient } from "@apollo/client";
+import { useApolloClient, useMutation, useQuery } from "@apollo/client";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import { Form, Modal, notification } from "antd";
+import axios from "axios";
+import _ from "lodash";
 import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { logImEXEvent, auth } from "../../firebase/firebase.utils";
+import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB_LINE_STATUS } from "../../graphql/jobs-lines.queries";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import {
   INSERT_NEW_PARTS_ORDERS,
   QUERY_PARTS_ORDER_OEC,
@@ -29,10 +33,6 @@ import { TemplateList } from "../../utils/TemplateConstants";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import PartsOrderModalComponent from "./parts-order-modal.component";
-import axios from "axios";
-import { useTreatments } from "@splitsoftware/splitio-react";
-import _ from "lodash";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -45,8 +45,8 @@ const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("partsOrder")),
   setBillEnterContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "billEnter" })),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function PartsOrderModalContainer({
@@ -142,6 +142,7 @@ export function PartsOrderModalContainer({
         : AuditTrailMapping.jobspartsorder(
             insertResult.data.insert_parts_orders.returning[0].order_number
           ),
+      type: isReturn ? "jobspartsreturn" : "jobspartsorder",
     });
 
     const jobLinesResult = await updateJobLines({

client/src/components/parts-queue-list/parts-queue.list.component.jsx

@@ -95,15 +95,13 @@ export function PartsQueueListComponent({ bodyshop }) {
   };
 
   const handleOnRowClick = (record) => {
-    if (record) {
-      if (record.id) {
-        history.push({
-          search: queryString.stringify({
-            ...searchParams,
-            selected: record.id,
-          }),
-        });
-      }
+    if (record?.id) {
+      history.replace({
+        search: queryString.stringify({
+          ...searchParams,
+          selected: record.id,
+        }),
+      });
     }
   };
 
@@ -350,6 +348,13 @@ export function PartsQueueListComponent({ bodyshop }) {
           selectedRowKeys: [selected],
           type: "radio",
         }}
+        onRow={(record, rowIndex) => {
+          return {
+            onClick: (event) => {
+              handleOnRowClick(record);
+            },
+          };
+        }}
       />
     </Card>
   );

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

@@ -1,6 +1,12 @@
 import { Button, Form, Input, PageHeader, Space } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  selectAuthLevel,
+  selectBodyshop,
+} from "../../redux/user/user.selectors";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import PhoneFormItem, {
@@ -8,12 +14,6 @@ import PhoneFormItem, {
 } from "../form-items-formatted/phone-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import {
-  selectAuthLevel,
-  selectBodyshop,
-} from "../../redux/user/user.selectors";
 const mapStateToProps = createStructuredSelector({
   authLevel: selectAuthLevel,
   bodyshop: selectBodyshop,
@@ -46,13 +46,19 @@ export function PhonebookFormComponent({
   return (
     <div>
       <PageHeader
-        title={`${form.getFieldValue("firstname") || ""} ${
-          form.getFieldValue("lastname") || ""
-        }${
-          form.getFieldValue("company")
-            ? ` - ${form.getFieldValue("company")}`
-            : ""
-        }`}
+        title={
+          <Form.Item shouldUpdate>
+            {() =>
+              `${form.getFieldValue("firstname") || ""} ${
+                form.getFieldValue("lastname") || ""
+              }${
+                form.getFieldValue("company")
+                  ? ` - ${form.getFieldValue("company")}`
+                  : ""
+              }`
+            }
+          </Form.Item>
+        }
         extra={
           <Space>
             <Button

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

@@ -29,8 +29,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function ProductionBoardKanbanComponent({
@@ -133,6 +133,7 @@ export function ProductionBoardKanbanComponent({
     insertAuditTrail({
       jobid: card.id,
       operation: AuditTrailMapping.jobstatuschange(destination.toColumnId),
+      type: "jobstatuschange",
     });
 
     if (update.errors) {

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

@@ -13,8 +13,8 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 const mapStateToProps = createStructuredSelector({});
 
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function ProductionListColumnAlert({ record, insertAuditTrail }) {
@@ -46,6 +46,7 @@ export function ProductionListColumnAlert({ record, insertAuditTrail }) {
           ? !record.production_vars.alert
           : true
       ),
+      type: "alertToggle",
     }).then(() => {
       if (record.refetch) record.refetch();
     });