IO-2302 California Consumer Law Update 1

Change label for FIPPA switch

.circleci/config.yml

@@ -68,6 +68,69 @@ jobs:
           from: build
           to: "s3://imex-online-production/"
       - jira/notify
+      
+  rome-api-deploy:
+    docker:
+      - image: "cimg/base:stable"
+    steps:
+      - checkout
+      - eb/setup
+      - run:
+          command: |
+            eb init romeonline-productionapi -r us-east-2 -p "Node.js 16 running on 64bit Amazon Linux 2"
+            eb status --verbose
+            eb deploy
+            eb status
+      - jira/notify
+
+  rome-hasura-migrate:
+    docker:
+      - image: cimg/node:16.15.0
+    parameters:
+      secret:
+        type: string
+        default: $HASURA_PROD_SECRET
+    working_directory: ~/repo/hasura
+    steps:
+      - checkout:
+          path: ~/repo
+      - run:
+          name: Execute migration
+          command: |
+            npm install hasura-cli -g
+            hasura migrate apply --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >>
+            hasura metadata apply --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >>
+            hasura metadata reload --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >>
+
+  rome-app-build:
+    docker:
+      - image: cimg/node:16.15.0
+
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+
+      - restore_cache:
+          name: Restore Yarn Package Cache
+          keys:
+            - yarn-packages-{{ checksum "yarn.lock" }}
+      - run:
+          name: Install Dependencies
+          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+      - save_cache:
+          name: Save Yarn Package Cache
+          key: yarn-packages-{{ checksum "yarn.lock" }}
+          paths:
+            - ~/.cache/yarn
+
+      - run: yarn run build
+
+      - aws-s3/sync:
+          from: build
+          to: "s3://rome-online-production/"
+      - jira/notify
 
   test-hasura-migrate:
     docker:
@@ -165,6 +228,19 @@ workflows:
           filters:
             branches:
               only: master
+      - rome-api-deploy:
+          filters:
+            branches:
+              only: rome/master
+      - rome-app-build:
+          filters:
+            branches:
+              only: rome/master
+      - rome-hasura-migrate:
+          secret: ${HASURA_PROD_SECRET}
+          filters:
+            branches:
+              only: rome/master
       - test-app-build:
           filters:
             branches:

bodyshop_translations.babel

@@ -5650,6 +5650,27 @@
                                     <folder_node>
                                         <name>md_tasks_presets</name>
                                         <children>
+                                            <concept_node>
+                                                <name>enable_tasks</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>hourstype</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -5734,6 +5755,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>use_approvals</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                         </children>
                                     </folder_node>
                                     <concept_node>
@@ -45372,6 +45414,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>commit</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>commitone</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>enter</name>
                                         <definition_loaded>false</definition_loaded>
@@ -45414,6 +45498,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>uncommit</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                 </children>
                             </folder_node>
                             <folder_node>
@@ -46337,6 +46442,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>committed</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>created</name>
                                         <definition_loaded>false</definition_loaded>
@@ -48464,6 +48590,53 @@
                                     </concept_node>
                                 </children>
                             </folder_node>
+                            <folder_node>
+                                <name>labels</name>
+                                <children>
+                                    <concept_node>
+                                        <name>approval_queue_in_use</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>calculate</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                </children>
+                            </folder_node>
                         </children>
                     </folder_node>
                     <folder_node>

client/.env.development

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

client/.env.production

@@ -1,14 +1,13 @@
-GENERATE_SOURCEMAP=false
-REACT_APP_GRAPHQL_ENDPOINT=https://db.imex.online/v1/graphql
-REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.imex.online/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT=https://db.romeonline.io/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.romeonline.io/v1/graphql
 REACT_APP_GA_CODE=231103507
-REACT_APP_FIREBASE_CONFIG={"apiKey":"AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU","authDomain":"imex-prod.firebaseapp.com","databaseURL":"https://imex-prod.firebaseio.com","projectId":"imex-prod","storageBucket":"imex-prod.appspot.com","messagingSenderId":"253497221485","appId":"1:253497221485:web:3c81c483b94db84b227a64","measurementId":"G-NTWBKG2L0M"}
+REACT_APP_FIREBASE_CONFIG={  "apiKey": "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE",  "authDomain": "rome-prod-1.firebaseapp.com",  "projectId": "rome-prod-1",  "storageBucket": "rome-prod-1.appspot.com",  "messagingSenderId": "147786367145",  "appId": "1:147786367145:web:9d4cba68071c3f29a8a9b8",  "measurementId": "G-G8Z9DRHTZS"}
 REACT_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/bodyshop
 REACT_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/bodyshop
 REACT_APP_CLOUDINARY_API_KEY=473322739956866
 REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
-REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BMgZT1NZztW2DsJl8Mg2L04hgY9FzAg6b8fbzgNAfww2VDzH3VE63Ot9EaP_U7KWS2JT-7HPHaw0T_Tw_5vkZc8'
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
 REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-REACT_APP_AXIOS_BASE_API_URL=https://api.imex.online/
-REACT_APP_REPORTS_SERVER_URL=https://reports.imex.online
+REACT_APP_AXIOS_BASE_API_URL=https://api.romeonline.io/
+REACT_APP_REPORTS_SERVER_URL=https://reports.romeonline.io
 REACT_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk

client/.env.test

@@ -8,7 +8,7 @@ REACT_APP_CLOUDINARY_API_KEY=473322739956866
 REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BN2GcDPjipR5MTEosO5dT4CfQ3cmrdBIsI4juoOQrRijn_5aRiHlwj1mlq0W145mOusx6xynEKl_tvYJhpCc9lo'
 REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-REACT_APP_AXIOS_BASE_API_URL=https://api.test.imex.online/
-REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
+REACT_APP_AXIOS_BASE_API_URL=https://api.romeonline.io/
+REACT_APP_REPORTS_SERVER_URL=https://reports.romeonline.io
 REACT_APP_IS_TEST=true
 REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc

client/craco.config.js

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

client/public/firebase-messaging-sw.js

@@ -28,6 +28,17 @@ switch (this.location.hostname) {
       // measurementId: "${config.measurementId}",
     };
     break;
+  case "romeonline.io":
+    firebaseConfig = {
+      apiKey: "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE",
+      authDomain: "rome-prod-1.firebaseapp.com",
+      projectId: "rome-prod-1",
+      storageBucket: "rome-prod-1.appspot.com",
+      messagingSenderId: "147786367145",
+      appId: "1:147786367145:web:9d4cba68071c3f29a8a9b8",
+      measurementId: "G-G8Z9DRHTZS",
+    };
+    break;
   case "imex.online":
   default:
     firebaseConfig = {

client/public/index.html

@@ -2,23 +2,31 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.png" />
+    <link rel="icon" href="%PUBLIC_URL%/ro-favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#002366" />
-    <meta name="description" content="ImEX Online" />
+    <meta name="description" content="Rome Online" />
     <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
     <link rel="apple-touch-icon" href="logo192.png" />
     <script type="text/javascript">
-      window.$crisp = [];
-      window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
-      (function () {
-        d = document;
-        s = d.createElement("script");
-        s.src = "https://client.crisp.chat/l.js";
-        s.async = 1;
-        d.getElementsByTagName("head")[0].appendChild(s);
-      })();
+      var $zoho = $zoho || {};
+      $zoho.salesiq = $zoho.salesiq || {
+        widgetcode:
+          "2ee4b2212fbdb380fb1e5e612f1e2dd7fe52032bee013140e27458e960add8e65b3cc65a44e7ecddabee40ced28dcfbd",
+        values: {},
+        ready: function () {},
+      };
+      var d = document;
+      s = d.createElement("script");
+      s.type = "text/javascript";
+      s.id = "zsiqscript";
+      s.defer = true;
+      s.src = "https://salesiq.zoho.com/widget";
+      t = d.getElementsByTagName("script")[0];
+      t.parentNode.insertBefore(s, t);
+      d.write("<div id='zsiqwidget'></div>");
     </script>
+
     <script>
       !(function () {
         "use strict";
@@ -77,7 +85,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>ImEX Online</title>
+    <title>Rome Online</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

client/public/manifest.json

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

client/src/App/App.container.jsx

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

client/src/App/App.jsx

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

client/src/components/_test/paymentMethod.jsx

@@ -1,49 +0,0 @@
-import React from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { setEmailOptions } from "../../redux/email/email.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { TemplateList } from "../../utils/TemplateConstants";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  setEmailOptions: (e) => dispatch(setEmailOptions(e)),
-});
-
-function Test({ bodyshop, setEmailOptions }) {
-  return (
-    <div>
-      <button
-        onClick={() => {
-          setEmailOptions({
-            messageOptions: {
-              to: ["patrickwf@gmail.com"],
-              replyTo: bodyshop.email,
-            },
-            template: {
-              name: TemplateList().parts_order.key,
-              variables: {
-                id: "a7c2d4e1-f519-42a9-a071-c48cf0f22979",
-              },
-            },
-          });
-        }}
-      >
-        send email
-      </button>
-      <button
-        onClick={() => {
-          logImEXEvent("IMEXEVENT", { somethignArThare: 5 });
-        }}
-      >
-        Log an ImEX Event.
-      </button>
-    </div>
-  );
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Test);

client/src/components/_test/payment_response.json

@@ -0,0 +1,63 @@
+{
+  "status": 24201299,
+  "custid": 19607899,
+  "paymentid": 24201299,
+  "response": "A",
+  "authcode": "498680",
+  "declinereason": "Approved",
+  "fee": 0,
+  "invoice": "",
+  "account": "john",
+  "amount": 1000,
+  "amountincludesfee": false,
+  "total": 1000,
+  "paymenttype": "C",
+  "methodhint": "VI ***1111",
+  "cardbrand": "Visa",
+  "cardnumdisplay": "***1111",
+  "receiptelements": {
+    "authcode": "498680",
+    "cust_srv_ph_num": "1-555-555-5555",
+    "rcpt_pg_ftr_txt": "Thank You\nPlease Come Again",
+    "rcpt_currency": "USD",
+    "responsecode": "A",
+    "rcpt_pay_mthd": "Visa",
+    "transid": "C00 915799",
+    "merch_disp_nm": "CP Devel Test",
+    "rcpt_input_mthd": "Keyed",
+    "rcpt_pg_hdr_txt": "Welcome!",
+    "rcpt_tran_time": "Thursday February 23 2023, 11:25:36 pm +08",
+    "rcpt_trans_type": "Normal Transaction (Sale)",
+    "message": "Approved",
+    "rcpt_dba_addr": "1234 Storefront Ave\nSome City, UT 84111",
+    "avsdata": "N",
+    "receiptrequirements": "S",
+    "rcpt_cardnum": "************1111",
+    "cv2result": "M",
+    "rfnd_policy_txt": "<b>No Refunds</b>\nStore Credit Only",
+    "labels": {
+      "tranref": "REF#",
+      "tid": "TID",
+      "validationcode": "ValCode",
+      "emvapplicationid": "AID",
+      "emvatc": "ATC",
+      "rcpt_pay_mthd": "Pay Method",
+      "transid": "TransID",
+      "rcpt_input_mthd": "IMode",
+      "emvtsi": "TSI",
+      "emvac": "AC",
+      "rcpt_trans_type": "TranType",
+      "emvapplicationname": "PApp",
+      "visarewards": "RewardsProg"
+    }
+  },
+  "receipttoken": "H4sIAAAAAAAAACXMTQuCMBgA4P/ynh3tw_3dBI/ipQ8NOtRN53QiblpBRfTfCzo/8LwhxGAdZCCwFYoJJFQjI2kvHdGu74lVkgmrWyWNhASW5jW7cB87yHjKKePGJODnxrrnMl7dDTKmEJlSOqV/_N30XPpyj2Eddq57_KKZ8FLzmh_G1VQnVfhjiXGK1XYTc/h8AVOkf4qUAAAA",
+  "call": "card_payment",
+  "nonce": "488b5568-b5c1-4f38-8b2f-3b050f3abb11P",
+  "hmac": "JyPAJ9Yx0SlYBTtqns1OxAFRt+xF3l2UiLPO5zTDRBE=",
+  "paymentreferenceid": "C19607899P24201299",
+  "cardnum": "...1111",
+  "email": "",
+  "nameOnCard": "John Allen",
+  "cardType": "visa"
+}

client/src/components/_test/test.component.jsx

@@ -1,9 +0,0 @@
-import React from "react";
-import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
-export default function Test() {
-  return (
-    <div>
-      <QboAuthorizeComponent />
-    </div>
-  );
-}

client/src/components/_test/test.page.jsx

@@ -0,0 +1,31 @@
+import { Button } from "antd";
+import React from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { setModalContext } from "../../redux/modals/modals.actions";
+
+const mapStateToProps = createStructuredSelector({});
+
+const mapDispatchToProps = (dispatch) => ({
+  setRefundPaymentContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "refund_payment" })),
+});
+
+function Test({ setRefundPaymentContext, refundPaymentModal }) {
+  console.log("refundPaymentModal", refundPaymentModal);
+  return (
+    <div>
+      <Button
+        onClick={() =>
+          setRefundPaymentContext({
+            context: {},
+          })
+        }
+      >
+        Open Modal
+      </Button>
+    </div>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(Test);

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

@@ -1,14 +1,15 @@
 import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import {
-  Button, Form,
+  Button,
+  Form,
   Input,
   InputNumber,
   Select,
   Space,
   Switch,
   Table,
-  Tooltip
+  Tooltip,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -466,7 +467,7 @@ export function BillEnterModalLinesComponent({
           return {
             key: `${field.index}fedtax`,
             valuePropName: "checked",
-            initialValue: true,
+            //  initialValue: true,
             name: [field.name, "applicable_taxes", "federal"],
           };
         },

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

@@ -0,0 +1,277 @@
+import React, { useCallback, useEffect } from "react";
+import axios from "axios";
+import { useTranslation } from "react-i18next";
+import { Button, Card, Form, Input, InputNumber, Row, Select } from "antd";
+import moment from "moment";
+import { useMutation, useQuery } from "@apollo/client";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
+import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
+import {
+  INSERT_PAYMENT_RESPONSE,
+  QUERY_RO_AND_OWNER_BY_JOB_PK,
+} from "../../graphql/payment_response.queries";
+import DataLabel from "../data-label/data-label.component";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import { connect } from "react-redux";
+import { toggleModalVisible } from "../../redux/modals/modals.actions";
+
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+  toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
+});
+
+const CardPaymentModalComponent = ({
+  bodyshop,
+  context,
+  toggleModalVisible,
+  insertAuditTrail,
+}) => {
+  const [form] = Form.useForm();
+  const amount = Form.useWatch("amount", form);
+  const payer = Form.useWatch("payer", form);
+  const jobid = Form.useWatch("jobid", form);
+  const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
+  const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
+  const { t } = useTranslation();
+
+  const { data, refetch } = useQuery(QUERY_RO_AND_OWNER_BY_JOB_PK, {
+    variables: { jobid: context?.jobid ?? "" },
+  });
+
+  const nonApproval = useCallback(
+    async (response) => {
+      // Mutate unsuccessful payment
+      await insertPaymentResponse({
+        variables: {
+          paymentResponse: {
+            amount: response.amount,
+            bodyshopid: bodyshop.id,
+            jobid: jobid || context.jobid,
+            declinereason: response.declinereason,
+            ext_paymentid: response.paymentid.toString(),
+            successful: false,
+            response,
+          },
+        },
+      });
+
+      // Insert failed payment to audit trail
+      insertAuditTrail({
+        jobid: jobid || context?.jobid,
+        operation: AuditTrailMapping.failedpayment(),
+      });
+    },
+    [bodyshop, context, insertAuditTrail, insertPaymentResponse, jobid]
+  );
+
+  const initIntellipayFunctions = useCallback(() => {
+    if (window.intellipay !== undefined && typeof jobid !== "undefined") {
+      console.log("intellipay init functions");
+
+      window.intellipay.runOnClose(() => {
+        window.intellipay.initialize();
+      });
+
+      window.intellipay.runOnApproval(async function (response) {
+        form.setFieldValue("paymentResponse", response);
+        form.submit();
+
+        toggleModalVisible();
+      });
+
+      window.intellipay.runOnNonApproval(nonApproval);
+    }
+  }, [form, jobid, nonApproval, toggleModalVisible]);
+
+  const initJobId = useCallback(() => {
+    if (context?.jobid) {
+      form.setFieldValue("jobid", context.jobid);
+    }
+
+    form.setFieldValue("payer", t("payments.labels.customer"));
+  }, [context?.jobid, form, t]);
+
+  useEffect(() => {
+    initJobId();
+
+    axios
+      .post("/intellipay/lightbox_credentials", { bodyshop })
+      .then((response) => {
+        var rg = document.createRange();
+        let node = rg.createContextualFragment(response.data);
+
+        document.documentElement.appendChild(node);
+        window.intellipay.initialize();
+
+        initIntellipayFunctions();
+      });
+
+    function handleEvents(...props) {
+      const operation = props[0].data.operation;
+
+      if (operation === "updateform") {
+        props[0].stopImmediatePropagation();
+      }
+    }
+
+    window.addEventListener("message", handleEvents, false);
+
+    return () => window.removeEventListener("message", handleEvents, false);
+  }, [bodyshop, initJobId, initIntellipayFunctions]);
+
+  const handleFinish = async (values) => {
+    const paymentResult = await insertPayment({
+      variables: {
+        paymentInput: {
+          amount: values.amount,
+          transactionid: values.paymentResponse.receiptelements.transid,
+          payer: values.payer,
+          type: values.paymentResponse.cardType,
+          jobid: values.jobid,
+          date: moment(Date.now()),
+        },
+      },
+      update(cache, { data }) {
+        cache.modify({
+          id: cache.identify({ id: jobid, __typename: "jobs" }),
+          fields: {
+            payments(payments) {
+              return [...data.insert_payments.returning, ...payments];
+            },
+          },
+        });
+      },
+    });
+
+    await insertPaymentResponse({
+      variables: {
+        paymentResponse: {
+          amount: values.amount,
+          bodyshopid: bodyshop.id,
+          paymentid: paymentResult.data.insert_payments.returning[0].id,
+          jobid: values.jobid,
+          declinereason: values.paymentResponse.declinereason,
+          ext_paymentid: values.paymentResponse.paymentid.toString(),
+          successful: true,
+          response: values.paymentResponse,
+        },
+      },
+    });
+  };
+
+  return (
+    <Card title="Card Payment">
+      <Form onFinish={handleFinish} form={form}>
+        <LayoutFormRow grow>
+          <Form.Item
+            name="jobid"
+            label={t("bills.fields.ro_number")}
+            rules={[
+              {
+                required: true,
+                // message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <JobSearchSelectComponent
+              disabled={context?.jobid}
+              notExported={false}
+              clm_no
+              onChange={(e) => {
+                refetch({ jobid: e });
+              }}
+            />
+          </Form.Item>
+        </LayoutFormRow>
+
+        {/* Lighbox Input amount needs to be hidden */}
+        <Input
+          className="ipayfield"
+          data-ipayname="amount"
+          type="hidden"
+          value={amount}
+          hidden
+        />
+        <Input
+          className="ipayfield"
+          data-ipayname="account"
+          type="hidden"
+          value={data?.jobs_by_pk.ro_number}
+          hidden
+        />
+        <Input
+          className="ipayfield"
+          data-ipayname="email"
+          type="hidden"
+          value={data?.jobs_by_pk.owner.ownr_ea}
+          hidden
+        />
+        {/* Lightbox payment response when it is completed */}
+        <Form.Item name="paymentResponse" hidden>
+          <Input type="hidden" value={amount} />
+        </Form.Item>
+
+        <LayoutFormRow grow>
+          <Form.Item
+            label={t("payments.fields.payer")}
+            name="payer"
+            rules={[
+              {
+                required: true,
+                // message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <Select>
+              <Select.Option value={t("payments.labels.customer")}>
+                {t("payments.labels.customer")}
+              </Select.Option>
+              <Select.Option value={t("payments.labels.insurance")}>
+                {t("payments.labels.insurance")}
+              </Select.Option>
+            </Select>
+          </Form.Item>
+
+          <Form.Item
+            label="Amount"
+            name="amount"
+            rules={[
+              {
+                required: true,
+                // message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <InputNumber />
+          </Form.Item>
+
+          <Row justify="space-around">
+            <Button
+              type="primary"
+              data-ipayname="submit"
+              className="ipayfield"
+              disabled={!amount || !payer || !jobid}
+            >
+              {t("job_payments.buttons.proceedtopayment")}
+            </Button>
+            {context?.balance && (
+              <DataLabel
+                valueStyle={{
+                  color: context?.balance.getAmount() !== 0 ? "red" : "green",
+                }}
+                label={t("payments.labels.balance")}
+              >
+                {context?.balance.toFormat()}
+              </DataLabel>
+            )}
+          </Row>
+        </LayoutFormRow>
+      </Form>
+    </Card>
+  );
+};
+
+export default connect(null, mapDispatchToProps)(CardPaymentModalComponent);

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

@@ -0,0 +1,57 @@
+import { Button, Modal } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { toggleModalVisible } from "../../redux/modals/modals.actions";
+import { selectCardPayment } from "../../redux/modals/modals.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import CardPaymentModalComponent from "./card-payment-modal.component.";
+
+const mapStateToProps = createStructuredSelector({
+  cardPaymentModal: selectCardPayment,
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
+});
+
+function CardPaymentModalContainer({
+  cardPaymentModal,
+  toggleModalVisible,
+  bodyshop,
+}) {
+  const { context, visible } = cardPaymentModal;
+  const { t } = useTranslation();
+
+  const handleCancel = () => {
+    toggleModalVisible();
+  };
+
+  const handleOK = () => {
+    toggleModalVisible();
+  };
+
+  return (
+    <Modal
+      visible={visible}
+      onOk={handleOK}
+      onCancel={handleCancel}
+      footer={[
+        <Button key="back" onClick={handleCancel}>
+          {t("job_payments.buttons.goback")}
+        </Button>,
+      ]}
+      width="60%"
+      destroyOnClose
+    >
+      <CardPaymentModalComponent bodyshop={bodyshop} context={context} />
+    </Modal>
+  );
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(CardPaymentModalContainer);

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

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

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

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

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

@@ -70,6 +70,8 @@ const mapDispatchToProps = (dispatch) => ({
   setReportCenterContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "reportCenter" })),
   signOutStart: () => dispatch(signOutStart()),
+  setCardPaymentContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "cardPayment" })),
 });
 
 function Header({
@@ -83,6 +85,7 @@ function Header({
   setPaymentContext,
   setReportCenterContext,
   recentItems,
+  setCardPaymentContext,
 }) {
   const { Simple_Inventory } = useTreatments(
     ["Simple_Inventory"],
@@ -240,12 +243,32 @@ function Header({
           >
             {t("menus.header.enterpayment")}
           </Menu.Item>
+          {/* TODO: Enter Card Payment */}
+          <Menu.Item
+            key="entercardpayments"
+            onClick={() => {
+              setCardPaymentContext({
+                actions: {},
+                context: null,
+              });
+            }}
+            icon={<Icon component={FaCreditCard} />}
+          >
+            {t("menus.header.entercardpayment")}
+          </Menu.Item>
           <Menu.Divider key="div5" />
           <Menu.Item key="timetickets" icon={<FieldTimeOutlined />}>
             <Link to="/manage/timetickets">
               {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} />}

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

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

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

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

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

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

client/src/components/job-detail-lines/job-lines-part-price-change.component.jsx

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

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

@@ -1,12 +1,12 @@
 import {
   DeleteFilled,
+  EditFilled,
   FilterFilled,
+  HomeOutlined,
+  MinusCircleTwoTone,
+  PlusCircleTwoTone,
   SyncOutlined,
   WarningFilled,
-  EditFilled,
-  PlusCircleTwoTone,
-  MinusCircleTwoTone,
-  HomeOutlined,
 } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
 import {
@@ -29,7 +29,6 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { onlyUnique } from "../../utils/arrayHelper";
-import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort } from "../../utils/sorters";
 import JobLineLocationPopup from "../job-line-location-popup/job-line-location-popup.component";
 import JobLineNotePopup from "../job-line-note-popup/job-line-note-popup.component";
@@ -38,13 +37,14 @@ import JobLinesBillRefernece from "../job-lines-bill-reference/job-lines-bill-re
 // import AllocationsAssignmentContainer from "../allocations-assignment/allocations-assignment.container";
 // import AllocationsBulkAssignmentContainer from "../allocations-bulk-assignment/allocations-bulk-assignment.container";
 // import AllocationsEmployeeLabelContainer from "../allocations-employee-label/allocations-employee-label.container";
-import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
 import _ from "lodash";
-import JobCreateIOU from "../job-create-iou/job-create-iou.component";
-import JobLinesExpander from "./job-lines-expander.component";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import moment from "moment";
-import JobLineConvertToLabor from "../job-line-convert-to-labor/job-line-convert-to-labor.component";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import JobCreateIOU from "../job-create-iou/job-create-iou.component";
+import JobSendPartPriceChangeComponent from "../job-send-parts-price-change/job-send-parts-price-change.component";
+import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
+import JobLinesExpander from "./job-lines-expander.component";
+import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -220,20 +220,7 @@ export function JobLinesComponent({
         state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
       ellipsis: true,
       render: (text, record) => (
-        <JobLineConvertToLabor jobline={record} job={job}>
-          <CurrencyFormatter>
-            {record.db_ref === "900510" || record.db_ref === "900511"
-              ? record.prt_dsmk_m
-              : record.act_price}
-          </CurrencyFormatter>
-          {record.prt_dsmk_p && record.prt_dsmk_p !== 0 ? (
-            <span
-              style={{ marginLeft: ".2rem" }}
-            >{`(${record.prt_dsmk_p}%)`}</span>
-          ) : (
-            <></>
-          )}
-        </JobLineConvertToLabor>
+        <JobLinesPartPriceChange line={record} job={job} refetch={refetch} />
       ),
     },
     {
@@ -448,15 +435,6 @@ export function JobLinesComponent({
                 technician
               }
               onClick={() => {
-                // setPartsOrderContext({
-                //   actions: { refetch: refetch },
-                //   context: {
-                //     jobId: job.id,
-                //     job: job,
-                //     linesToOrder: selectedLines,
-                //   },
-                // });
-
                 setBillEnterContext({
                   actions: { refetch: refetch },
                   context: {
@@ -563,6 +541,9 @@ export function JobLinesComponent({
             >
               {t("joblines.actions.new")}
             </Button>
+            {bodyshop.region_config.toLowerCase().startsWith("us") && (
+              <JobSendPartPriceChangeComponent job={job} />
+            )}
             <JobCreateIOU job={job} selectedJobLines={selectedLines} />
             <Input.Search
               placeholder={t("general.labels.search")}

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

@@ -14,6 +14,13 @@ import { alphaSort, dateSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
 import DataLabel from "../data-label/data-label.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
+import PaymentExpandedRowComponent from "../payment-expanded-row/payment-expanded-row.component";
+import {
+  setMessage,
+  openChatByPhone,
+} from "../../redux/messaging/messaging.actions";
+import { parsePhoneNumber } from "libphonenumber-js";
+import axios from "axios";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -23,13 +30,20 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setPaymentContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "payment" })),
+  setCardPaymentContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "cardPayment" })),
+  openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
+  setMessage: (text) => dispatch(setMessage(text)),
 });
 
 export function JobPayments({
   job,
   jobRO,
   bodyshop,
+  setMessage,
+  openChatByPhone,
   setPaymentContext,
+  setCardPaymentContext,
   refetch,
 }) {
   const { t } = useTranslation();
@@ -37,6 +51,8 @@ export function JobPayments({
     sortedInfo: {},
     filteredInfo: {},
   });
+  const [generatingURL, setGeneratingtURL] = useState(false);
+
   const columns = [
     {
       title: t("payments.fields.date"),
@@ -149,6 +165,39 @@ export function JobPayments({
       title={t("payments.labels.title")}
       extra={
         <Space wrap>
+          <Button
+            disabled={!job.converted}
+            loading={generatingURL}
+            onClick={async () => {
+              const p = parsePhoneNumber(job.ownr_ph1, "CA");
+              setGeneratingtURL(true);
+              const response = await axios.post(
+                "/intellipay/generate_payment_url",
+                {
+                  bodyshop,
+                  amount: balance.getAmount(),
+                  account: job.ro_number,
+                }
+              );
+              setGeneratingtURL(false);
+
+              console.log("SMS", response);
+
+              openChatByPhone({
+                phone_num: p.formatInternational(),
+                jobid: job.id,
+              });
+              setMessage(
+                t("appointments.labels.smspaymentreminder", {
+                  shopname: bodyshop.shopname,
+                  amount: balance.toFormat(),
+                  payment_link: response.data.shorUrl,
+                })
+              );
+            }}
+          >
+            {t("menus.header.paymentremindersms")}
+          </Button>
           <Button
             disabled={!job.converted}
             onClick={() =>
@@ -160,6 +209,16 @@ export function JobPayments({
           >
             {t("menus.header.enterpayment")}
           </Button>
+          <Button
+            onClick={() =>
+              setCardPaymentContext({
+                actions: { refetch },
+                context: { jobid: job.id, balance },
+              })
+            }
+          >
+            {t("menus.header.entercardpayment")}
+          </Button>
           <DataLabel
             valueStyle={{ color: balance.getAmount() !== 0 ? "red" : "green" }}
             label={t("payments.labels.balance")}
@@ -178,6 +237,11 @@ export function JobPayments({
         scroll={{
           x: true,
         }}
+        expandable={{
+          expandedRowRender: (record) => (
+            <PaymentExpandedRowComponent record={record} bodyshop={bodyshop} />
+          ),
+        }}
         summary={() => (
           <>
             <Table.Summary.Row>

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

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

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

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

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

@@ -124,8 +124,7 @@ export default function JobTotalsTableLabor({ job }) {
                 {t("jobs.labels.mapa")}
                 {job.materials &&
                   job.materials.mapa &&
-                  job.materials.mapa.cal_maxdlr &&
-                  job.materials.mapa.cal_maxdlr > 0 &&
+                  job.materials.mapa.cal_maxdlr !== undefined &&
                   t("jobs.labels.threshhold", {
                     amount: job.materials.mapa.cal_maxdlr,
                   })}
@@ -149,8 +148,7 @@ export default function JobTotalsTableLabor({ job }) {
                 {t("jobs.labels.mash")}
                 {job.materials &&
                   job.materials.mash &&
-                  job.materials.mash.cal_maxdlr &&
-                  job.materials.mash.cal_maxdlr > 0 &&
+                  job.materials.mash.cal_maxdlr !== undefined &&
                   t("jobs.labels.threshhold", {
                     amount: job.materials.mash.cal_maxdlr,
                   })}

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

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

client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js

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

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

@@ -3,12 +3,11 @@ import {
   useApolloClient,
   useLazyQuery,
   useMutation,
-  useQuery
+  useQuery,
 } from "@apollo/client";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import { Col, notification, Row } from "antd";
 import Axios from "axios";
-import Dinero from "dinero.js";
 import moment from "moment";
 import queryString from "query-string";
 import React, { useCallback, useEffect, useState } from "react";
@@ -20,7 +19,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   DELETE_AVAILABLE_JOB,
   QUERY_AVAILABLE_JOBS,
-  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK
+  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK,
 } from "../../graphql/available-jobs.queries";
 import { INSERT_NEW_JOB, UPDATE_JOB } from "../../graphql/jobs.queries";
 import { INSERT_NEW_NOTE } from "../../graphql/notes.queries";
@@ -28,7 +27,7 @@ import { SEARCH_VEHICLE_BY_VIN } from "../../graphql/vehicles.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
   selectBodyshop,
-  selectCurrentUser
+  selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import confirmDialog from "../../utils/asyncConfirm";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
@@ -41,6 +40,7 @@ import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.contai
 import { GetSupplementDelta } from "./jobs-available-supplement.estlines.util";
 import HeaderFields from "./jobs-available-supplement.headerfields";
 import JobsAvailableTableComponent from "./jobs-available-table.component";
+import _ from "lodash";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -106,17 +106,21 @@ export function JobsAvailableContainer({
       });
       return;
     }
+    // if (process.env.REACT_APP_COUNTRY === "USA") {
+    //Massage the CCC file set to remove duplicate UNQ_SEQ.
+    await ResolveCCCLineIssues(estData.est_data, bodyshop);
+    //   } else {
     //IO-539 Check for Parts Rate on PAL for SGI use case.
     await CheckTaxRates(estData.est_data, bodyshop);
-
-    const newTotals = (
-      await Axios.post("/job/totals", {
-        job: {
-          ...estData.est_data,
-          joblines: estData.est_data.joblines.data,
-        },
-      })
-    ).data;
+    //  }
+    // const newTotals = (
+    //   await Axios.post("/job/totals", {
+    //     job: {
+    //       ...estData.est_data,
+    //       joblines: estData.est_data.joblines.data,
+    //     },
+    //   })
+    // ).data;
 
     let existingVehicles;
     if (estData.est_data.v_vin) {
@@ -131,9 +135,9 @@ export function JobsAvailableContainer({
 
     const newJob = {
       ...estData.est_data,
-      clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
-      owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
-      job_totals: newTotals,
+      // clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
+      // owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
+      // job_totals: newTotals,
       date_open: moment(),
       notes: {
         data: {
@@ -162,6 +166,10 @@ export function JobsAvailableContainer({
       },
     })
       .then((r) => {
+        Axios.post("/job/totalsssu", {
+          id: r.data.insert_jobs.returning[0].id,
+        });
+
         if (CriticalPartsScanning.treatment === "on") {
           CriticalPartsScan(r.data.insert_jobs.returning[0].id);
         }
@@ -215,6 +223,7 @@ export function JobsAvailableContainer({
       let supp = replaceEmpty({ ...estData.est_data });
       //IO-539 Check for Parts Rate on PAL for SGI use case.
       await CheckTaxRates(supp, bodyshop);
+      await ResolveCCCLineIssues(supp, bodyshop);
 
       delete supp.owner;
       delete supp.vehicle;
@@ -416,7 +425,7 @@ async function CheckTaxRates(estData, bodyshop) {
     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.`
+      `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) {
@@ -439,7 +448,7 @@ async function CheckTaxRates(estData, bodyshop) {
     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.`
+      `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) {
@@ -462,7 +471,7 @@ async function CheckTaxRates(estData, bodyshop) {
     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.`
+      `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) {
@@ -485,7 +494,7 @@ async function CheckTaxRates(estData, bodyshop) {
     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.`
+      `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) {
@@ -504,20 +513,58 @@ async function CheckTaxRates(estData, bodyshop) {
 
   //IO-1387 If a sublet line is NOT R&R, use the labor tax. If it is, use the sublet tax rate.
   //Currently limited to SK shops only.
-  //if (bodyshop.region_config === "CA_SK") {
-  estData.joblines.data.forEach((jl, index) => {
-    if (
-      (jl.part_type === "PASL" || jl.part_type === "PAS") &&
-      jl.lbr_op !== "OP11"
-    ) {
-      estData.joblines.data[index].tax_part = jl.lbr_tax;
-    }
+  if (bodyshop.region_config === "CA_SK") {
+    estData.joblines.data.forEach((jl, index) => {
+      if (
+        (jl.part_type === "PASL" || jl.part_type === "PAS") &&
+        jl.lbr_op !== "OP11"
+      ) {
+        estData.joblines.data[index].tax_part = jl.lbr_tax;
+      }
 
-    //Set markup lines and tax lines as taxable.
-    //900510 is a mark up. 900510 is a discount.
-    if (jl.db_ref === "900510") {
-      estData.joblines.data[index].tax_part = true;
+      //Set markup lines and tax lines as taxable.
+      //900510 is a mark up. 900510 is a discount.
+      if (jl.db_ref === "900510") {
+        estData.joblines.data[index].tax_part = true;
+      }
+    });
+  }
+}
+
+async function ResolveCCCLineIssues(estData, bodyshop) {
+  //Find all misc amounts, populate them to the act price.
+  //TODO Ensure that this doesnt get violated
+  //This needs to be done before cleansing unq_seq since some misc prices could move over.
+  estData.joblines.data.forEach((line) => {
+    if (line.misc_amt && line.misc_amt !== 0) {
+      line.act_price = line.misc_amt;
+      line.part_type = "PAS";
+      line.tax_part = !!line.misc_tax;
     }
   });
-  //}
+
+  //Generate the list of duplicated UNQ_SEQ that will feed into the next section to scrub the lines.
+  const unqSeqHash = _.groupBy(estData.joblines.data, "unq_seq");
+  const duplicatedUnqSeq = Object.keys(unqSeqHash).filter(
+    (key) => unqSeqHash[key].length > 1
+  );
+
+  duplicatedUnqSeq.forEach((unq_seq) => {
+    //Keys are strings, convert to int.
+    const int_unq_seq = parseInt(unq_seq);
+
+    //When line splitting, the first line is always the non-refinish line. We will keep it as is.
+    //We will cleanse the second line, which is always the next line.
+    const nonRefLineIndex = estData.joblines.data.findIndex(
+      (line) => line.unq_seq === int_unq_seq
+    );
+    estData.joblines.data[nonRefLineIndex + 1] = {
+      ...estData.joblines.data[nonRefLineIndex + 1],
+      part_type: null,
+      act_price: 0,
+      db_price: 0,
+      prt_dsmk_p: 0,
+      prt_dsmk_m: 0,
+    };
+  });
 }

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

@@ -48,6 +48,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" })),
 });
 
 export function JobsDetailHeaderActions({
@@ -61,6 +65,8 @@ export function JobsDetailHeaderActions({
   setJobCostingContext,
   jobRO,
   setTimeTicketContext,
+  setTimeTicketTaskContext,
+  setCardPaymentContext,
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
@@ -245,6 +251,24 @@ export function JobsDetailHeaderActions({
       >
         {t("timetickets.actions.enter")}
       </Menu.Item>
+      {bodyshop.md_tasks_presets.enable_tasks && (
+        <Menu.Item
+          key="claimtimetickettasks"
+          disabled={
+            !job.converted ||
+            (!bodyshop.tt_allow_post_to_invoiced && job.date_invoiced)
+          }
+          onClick={() => {
+            setTimeTicketTaskContext({
+              actions: {},
+              context: { jobid: job.id },
+            });
+          }}
+        >
+          {t("timetickets.actions.claimtasks")}
+        </Menu.Item>
+      )}
+
       <Menu.Item
         key="enterpayments"
         disabled={!job.converted}
@@ -259,6 +283,18 @@ export function JobsDetailHeaderActions({
       >
         {t("menus.header.enterpayment")}
       </Menu.Item>
+      <Menu.Item
+        key="entercardpayments"
+        disabled={!job.converted}
+        onClick={() => {
+          setCardPaymentContext({
+            actions: {},
+            context: { jobid: job.id },
+          });
+        }}
+      >
+        {t("menus.header.entercardpayment")}
+      </Menu.Item>
       <Menu.Item key="cccontract" disabled={jobRO || !job.converted}>
         <Link
           to={{

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

@@ -29,7 +29,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAA", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -42,7 +42,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
             name={["parts_tax_rates", "PAA", "prt_mkupp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -68,7 +68,7 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
                 </Form.Item>
               );
             }}
@@ -79,7 +79,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAC", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -92,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -118,7 +118,7 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
                 </Form.Item>
               );
             }}
@@ -129,7 +129,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAL", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -142,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -168,7 +168,7 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
                 </Form.Item>
               );
             }}
@@ -179,7 +179,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAG", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -192,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -218,7 +218,7 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
                 </Form.Item>
               );
             }}
@@ -229,7 +229,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAM", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -242,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -268,7 +268,7 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
                 </Form.Item>
               );
             }}
@@ -279,7 +279,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAN", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -292,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -318,7 +318,7 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
                 </Form.Item>
               );
             }}
@@ -329,7 +329,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAO", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -342,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -368,7 +368,7 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
                 </Form.Item>
               );
             }}
@@ -379,7 +379,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAP", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -392,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -418,7 +418,7 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
                 </Form.Item>
               );
             }}
@@ -429,7 +429,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAR", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -442,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -468,7 +468,7 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
                 </Form.Item>
               );
             }}
@@ -479,7 +479,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PAS", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -492,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -518,7 +518,7 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
                 </Form.Item>
               );
             }}
@@ -529,7 +529,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "PASL", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -542,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -568,7 +568,7 @@ export function JobsDetailRatesParts({
                     },
                   ]}
                 >
-                  <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+                  <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
                 </Form.Item>
               );
             }}
@@ -579,7 +579,7 @@ export function JobsDetailRatesParts({
             label={t("jobs.fields.parts_tax_rates.prt_discp")}
             name={["parts_tax_rates", "CCDR", "prt_discp"]}
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -592,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -605,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.CCF")}>
@@ -613,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -626,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -639,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.CCM")}>
@@ -647,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -660,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -673,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.CCC")}>
@@ -681,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -694,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -707,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow header={t("joblines.fields.part_types.CCD")}>
@@ -715,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -728,7 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -741,39 +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={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow>
           <Form.Item label={t("jobs.fields.tax_tow_rt")} name="tax_tow_rt">
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item label={t("jobs.fields.tax_str_rt")} name="tax_str_rt">
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.tax_paint_mat_rt")}
             name="tax_paint_mat_rt"
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.tax_shop_mat_rt")}
             name="tax_shop_mat_rt"
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item label={t("jobs.fields.tax_sub_rt")} name="tax_sub_rt">
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item label={t("jobs.fields.tax_lbr_rt")} name="tax_lbr_rt">
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.tax_levies_rt")}
             name="tax_levies_rt"
           >
-            <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+            <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
           </Form.Item>
         </LayoutFormRow>
       </Collapse.Panel>

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

@@ -0,0 +1,172 @@
+import React, { useState } from "react";
+import { useMutation, useQuery } from "@apollo/client";
+import {
+  GET_REFUNDABLE_AMOUNT_BY_JOBID,
+  INSERT_PAYMENT_RESPONSE,
+  QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID,
+} from "../../graphql/payment_response.queries";
+import { Button, Descriptions, InputNumber, Modal, notification } from "antd";
+import moment from "moment";
+import axios from "axios";
+import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
+import { useTranslation } from "react-i18next";
+
+const { confirm } = Modal;
+
+const openNotificationWithIcon = (type, t) => {
+  notification[type]({
+    message: t("job_payments.notifications.error.title"),
+    description: t("job_payments.notifications.error.description"),
+  });
+};
+
+const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
+  const [refundAmount, setRefundAmount] = useState(0);
+  const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
+  const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
+  const { t } = useTranslation();
+
+  const { loading, error, data } = useQuery(
+    QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID,
+    {
+      variables: {
+        paymentid: record.id,
+        fetchPolicy: "network-only",
+        nextFetchPolicy: "network-only",
+      },
+    }
+  );
+
+  const { data: refundable_amount, refetch } = useQuery(
+    GET_REFUNDABLE_AMOUNT_BY_JOBID,
+    {
+      variables: {
+        jobid: record.jobid,
+      },
+    }
+  );
+
+  const insertPayments = async (payment_response, refund_response) => {
+    await insertPayment({
+      variables: {
+        paymentInput: {
+          amount: -refund_response.data.amount,
+          transactionid: payment_response.response.receiptelements.transid,
+          payer: record.payer,
+          type: "Refund",
+          jobid: payment_response.jobid,
+          date: moment(Date.now()),
+        },
+      },
+      update(cache, { data }) {
+        cache.modify({
+          id: cache.identify({
+            id: payment_response.jobid,
+            __typename: "jobs",
+          }),
+          fields: {
+            payments(payments) {
+              return [...data.insert_payments.returning, ...payments];
+            },
+          },
+        });
+      },
+    });
+
+    await insertPaymentResponse({
+      variables: {
+        paymentResponse: {
+          amount: -refund_response.data.amount,
+          bodyshopid: payment_response.bodyshopid,
+          paymentid: payment_response.paymentid,
+          jobid: payment_response.jobid,
+          declinereason: "Refund",
+          ext_paymentid: payment_response.ext_paymentid,
+          successful: true,
+          response: refund_response.data,
+        },
+      },
+    });
+  };
+
+  const showConfirm = (payment_response) => {
+    confirm({
+      title: "Do you want to refund payment?",
+      content:
+        "The payment will be refunded. Click OK to confirm and Cancel to dismiss.",
+      async onOk() {
+        const refundResponse = await axios.post("/intellipay/payment_refund", {
+          bodyshop,
+          amount: refundAmount,
+          paymentid: payment_response.ext_paymentid,
+        });
+
+        if (refundResponse.data.status < 0) {
+          openNotificationWithIcon("error", t);
+          return;
+        }
+
+        insertPayments(payment_response, refundResponse);
+
+        // refetch refundable amount
+        refetch();
+      },
+      onCancel() {},
+    });
+  };
+
+  if (loading) return null;
+
+  if (error) return <p>Error loading data. Please Reload</p>;
+
+  const payment_response = data.payment_response[0];
+  const max_refundable_amount =
+    refundable_amount?.payment_response_aggregate.aggregate.sum.amount;
+
+  return (
+    <div>
+      <Descriptions
+        title={t("job_payments.titles.descriptions")}
+        contentStyle={{ fontWeight: "600" }}
+        column={4}
+      >
+        <Descriptions.Item label={t("job_payments.titles.payer")}>
+          {record.payer}
+        </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.payername")}>
+          {payment_response?.response?.nameOnCard ?? ""}
+        </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.amount")}>
+          {record.amount}
+        </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.dateOfPayment")}>
+          {moment(record.created_at).format("YYYY-MM-DD HH:mm:ss")}
+        </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.transactionid")}>
+          {record.transactionid}
+        </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.paymentid")}>
+          {payment_response?.response?.paymentreferenceid ?? ""}
+        </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.paymenttype")}>
+          {record.type}
+        </Descriptions.Item>
+        {payment_response && (
+          <Descriptions.Item label={t("job_payments.titles.refundamount")}>
+            <InputNumber
+              onChange={setRefundAmount}
+              max={max_refundable_amount}
+              min={0}
+            />
+
+            <Button onClick={() => showConfirm(payment_response)}>
+              {t("job_payments.buttons.refundpayment")}
+            </Button>
+          </Descriptions.Item>
+        )}
+      </Descriptions>
+    </div>
+  );
+};
+
+export default PaymentExpandedRowComponent;

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

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

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

@@ -11,7 +11,7 @@ import {
   Switch,
   Table,
 } from "antd";
-import { useForm } from "antd/es/form/Form";
+
 import moment from "moment";
 import querystring from "query-string";
 import React, { useEffect } from "react";
@@ -46,7 +46,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ShopEmployeesFormComponent({ bodyshop }) {
   const { t } = useTranslation();
-  const [form] = useForm();
+  const [form] = Form.useForm();
   const history = useHistory();
   const search = querystring.parse(useLocation().search);
   const [deleteVacation] = useMutation(DELETE_VACATION);

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

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

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

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

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

@@ -4419,6 +4419,31 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           <InputNumber precision={2} />
         </Form.Item>
       </LayoutFormRow>
+      <Form.Item
+        label={t("bodyshop.fields.responsibilitycenters.itemexemptcode")}
+        rules={[
+          {
+            required: true,
+            //message: t("general.validation.required"),
+          },
+        ]}
+        name={["md_responsibility_centers", "taxes", "itemexemptcode"]}
+      >
+        <Input />
+      </Form.Item>
+      <Form.Item
+        label={t("bodyshop.fields.responsibilitycenters.invoiceexemptcode")}
+        rules={[
+          {
+            required: true,
+            //message: t("general.validation.required"),
+          },
+        ]}
+        name={["md_responsibility_centers", "taxes", "invoiceexemptcode"]}
+      >
+        <Input />
+      </Form.Item>
+
       <LayoutFormRow id="local_tax">
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.local_tax")}

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

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

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

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

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

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

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

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

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

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

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

@@ -6,7 +6,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, Redirect, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import ImEXOnlineLogo from "../../assets/logo192.png";
+import RomeLogo from "../../assets/romelogo.png";
 import {
   emailSignInStart,
   sendPasswordReset,
@@ -53,7 +53,7 @@ export function SignInComponent({
   return (
     <div className="login-container">
       <div className="login-logo-container">
-        <img src={ImEXOnlineLogo} height="100" width="100" alt="ImEX Online" />
+        <img src={RomeLogo} width={200} alt="Rome Online" />
         <Typography.Title>{t("titles.app")}</Typography.Title>
       </div>
       <Form onFinish={handleFinish} form={form} size="large">

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

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

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

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

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

@@ -1,17 +1,18 @@
 import { EditFilled } from "@ant-design/icons";
-import { Card, Space, Table } from "antd";
+import { Button, Card, Checkbox, Space, Table } from "antd";
 import moment from "moment";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { setModalContext } from "../../redux/modals/modals.actions";
 import {
   selectAuthLevel,
   selectBodyshop,
 } from "../../redux/user/user.selectors";
-import { onlyUnique } from "../../utils/arrayHelper";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
+import { onlyUnique } from "../../utils/arrayHelper";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import RbacWrapper, {
   HasRbacAccess,
@@ -22,12 +23,14 @@ const mapStateToProps = createStructuredSelector({
   authLevel: selectAuthLevel,
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  setTimeTicketTaskContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "timeTicketTask" })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(TimeTicketList);
 
 export function TimeTicketList({
   bodyshop,
+  setTimeTicketTaskContext,
   authLevel,
   disabled,
   loading,
@@ -58,6 +61,14 @@ export function TimeTicketList({
   }, [timetickets]);
 
   const columns = [
+    {
+      title: t("timetickets.fields.committed"),
+      dataIndex: "committed_at",
+      key: "committed_at",
+      render: (text, record) => (
+        <Checkbox disabled checked={record.committed_at} />
+      ),
+    },
     {
       title: t("timetickets.fields.date"),
       dataIndex: "date",
@@ -193,7 +204,15 @@ export function TimeTicketList({
         }
       },
     },
-
+    // {
+    //   title: "Pay",
+    //   dataIndex: "pay",
+    //   key: "pay",
+    //   render: (text, record) =>
+    //     Dinero({ amount: Math.round(record.rate * 100) })
+    //       .multiply(record.flat_rate ? record.productivehrs : record.actualhrs)
+    //       .toFormat("$0.00"),
+    // },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",
@@ -223,6 +242,11 @@ export function TimeTicketList({
                   timeticket: record,
                 }}
                 disabled={
+                  HasRbacAccess({
+                    bodyshop,
+                    authLevel: authLevel,
+                    action: "timetickets:editcommitted",
+                  }) &&
                   HasRbacAccess({
                     bodyshop,
                     authLevel: authLevel,
@@ -250,6 +274,24 @@ export function TimeTicketList({
       title={t("timetickets.labels.timetickets")}
       extra={
         <Space wrap>
+          {
+            //  <TimeTicketListTeamPay
+            //      actions={{ refetch }}
+            //      context={{ jobId: jobId }}
+            //    />
+          }
+          {bodyshop.md_tasks_presets.enable_tasks && (
+            <Button
+              onClick={() => {
+                setTimeTicketTaskContext({
+                  actions: {},
+                  context: { jobid: jobId },
+                });
+              }}
+            >
+              {t("timetickets.actions.claimtasks")}
+            </Button>
+          )}
           {jobId &&
             (techConsole ? null : (
               <TimeTicketEnterButton

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

@@ -19,6 +19,7 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
+import TimeTicketCalculatorComponent from "../time-ticket-calculator/time-ticket-calculator.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -36,6 +37,7 @@ export function TimeTicketModalComponent({
   authLevel,
   employeeAutoCompleteOptions,
   isEdit,
+  disabled,
   employeeSelectDisabled,
 }) {
   const { t } = useTranslation();
@@ -49,7 +51,7 @@ export function TimeTicketModalComponent({
       <Select
         value={value === "timetickets.labels.shift" ? t(value) : value}
         {...props}
-        disabled={value === "timetickets.labels.shift"}
+        disabled={value === "timetickets.labels.shift" || disabled}
       >
         {emps &&
           emps.rates.map((item) => (
@@ -72,7 +74,7 @@ export function TimeTicketModalComponent({
       <Input
         value={value?.startsWith("timetickets.") ? t(value) : value}
         {...props}
-        disabled={value?.startsWith("timetickets.")}
+        disabled={value?.startsWith("timetickets.") || disabled}
       />
     );
   };
@@ -126,7 +128,7 @@ export function TimeTicketModalComponent({
           ]}
         >
           <EmployeeSearchSelect
-            disabled={employeeSelectDisabled}
+            disabled={employeeSelectDisabled || disabled}
             options={employeeAutoCompleteOptions}
             onSelect={(value) => {
               const emps =
@@ -178,65 +180,73 @@ export function TimeTicketModalComponent({
       <LayoutFormRow>
         <Form.Item shouldUpdate>
           {() => (
-            <Form.Item
-              label={t("timetickets.fields.productivehrs")}
-              name="productivehrs"
-              rules={[
-                ({ getFieldValue }) => ({
-                  validator(rule, value) {
-                    if (!bodyshop.tt_enforce_hours_for_tech_console) {
-                      return Promise.resolve();
-                    }
-                    if (
-                      !value ||
-                      getFieldValue("cost_center") === null ||
-                      !lineTicketData
-                    )
-                      return Promise.resolve();
+            <>
+              <Form.Item
+                label={t("timetickets.fields.productivehrs")}
+                name="productivehrs"
+                rules={[
+                  ({ getFieldValue }) => ({
+                    validator(rule, value) {
+                      if (!bodyshop.tt_enforce_hours_for_tech_console) {
+                        return Promise.resolve();
+                      }
+                      if (
+                        !value ||
+                        getFieldValue("cost_center") === null ||
+                        !lineTicketData
+                      )
+                        return Promise.resolve();
 
-                    //Check the cost center,
-                    const totals = CalculateAllocationsTotals(
-                      bodyshop,
-                      lineTicketData.joblines,
-                      lineTicketData.timetickets,
-                      lineTicketData.jobs_by_pk.lbr_adjustments
-                    );
-
-                    const fieldTypeToCheck =
-                      bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
-                        ? "mod_lbr_ty"
-                        : "cost_center";
-
-                    const costCenterDiff =
-                      Math.round(
-                        totals.find(
-                          (total) =>
-                            total[fieldTypeToCheck] ===
-                            getFieldValue("cost_center")
-                        )?.difference * 10
-                      ) / 10;
-
-                    if (value > costCenterDiff)
-                      return Promise.reject(
-                        t(
-                          "timetickets.validation.hoursenteredmorethanavailable"
-                        )
+                      //Check the cost center,
+                      const totals = CalculateAllocationsTotals(
+                        bodyshop,
+                        lineTicketData.joblines,
+                        lineTicketData.timetickets,
+                        lineTicketData.jobs_by_pk.lbr_adjustments
                       );
-                    else {
-                      return Promise.resolve();
-                    }
+
+                      const fieldTypeToCheck =
+                        bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                          ? "mod_lbr_ty"
+                          : "cost_center";
+
+                      const costCenterDiff =
+                        Math.round(
+                          totals.find(
+                            (total) =>
+                              total[fieldTypeToCheck] ===
+                              getFieldValue("cost_center")
+                          )?.difference * 10
+                        ) / 10;
+
+                      if (value > costCenterDiff)
+                        return Promise.reject(
+                          t(
+                            "timetickets.validation.hoursenteredmorethanavailable"
+                          )
+                        );
+                      else {
+                        return Promise.resolve();
+                      }
+                    },
+                  }),
+                  {
+                    required:
+                      form.getFieldValue("cost_center") !==
+                      "timetickets.labels.shift",
+                    //message: t("general.validation.required"),
                   },
-                }),
-                {
-                  required:
-                    form.getFieldValue("cost_center") !==
-                    "timetickets.labels.shift",
-                  //message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <InputNumber precision={1} />
-            </Form.Item>
+                ]}
+              >
+                <InputNumber precision={1} />
+              </Form.Item>
+              <TimeTicketCalculatorComponent
+                jobid={form.getFieldValue("jobid")}
+                setProductiveHours={(productivehrs) =>
+                  form.setFieldsValue({ productivehrs })
+                }
+              />
+            </>
           )}
         </Form.Item>
         <Form.Item
@@ -270,6 +280,7 @@ export function TimeTicketModalComponent({
               <FormDateTimePicker
                 minuteStep={5}
                 disabled={
+                  disabled ||
                   !HasRbacAccess({
                     bodyshop,
                     authLevel,
@@ -308,6 +319,7 @@ export function TimeTicketModalComponent({
               <FormDateTimePicker
                 minuteStep={5}
                 disabled={
+                  disabled ||
                   !HasRbacAccess({
                     bodyshop,
                     authLevel,
@@ -363,7 +375,12 @@ export function TimeTicketModalComponent({
   );
 }
 
-export function LaborAllocationContainer({ jobid, loading, lineTicketData }) {
+export function LaborAllocationContainer({
+  jobid,
+  loading,
+  lineTicketData,
+  hideTimeTickets = false,
+}) {
   if (loading) return <LoadingSkeleton />;
   if (!lineTicketData) return null;
   return (
@@ -374,12 +391,13 @@ export function LaborAllocationContainer({ jobid, loading, lineTicketData }) {
         timetickets={lineTicketData.timetickets}
         adjustments={lineTicketData.jobs_by_pk.lbr_adjustments}
       />
-
-      <TimeTicketList
-        loading={loading}
-        timetickets={lineTicketData.timetickets}
-        techConsole
-      />
+      {!hideTimeTickets && (
+        <TimeTicketList
+          loading={loading}
+          timetickets={lineTicketData.timetickets}
+          techConsole
+        />
+      )}
     </div>
   );
 }

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

@@ -14,6 +14,7 @@ import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectTimeTicket } from "../../redux/modals/modals.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import TimeTicketModalComponent from "./time-ticket-modal.component";
+import TimeTicketsCommitToggleComponent from "../time-tickets-commit-toggle/time-tickets-commit-toggle.component";
 
 const mapStateToProps = createStructuredSelector({
   timeTicketModal: selectTimeTicket,
@@ -174,7 +175,11 @@ export function TimeTicketModalContainer({
       footer={
         <span>
           <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
-          <Button loading={loading} onClick={() => form.submit()}>
+          <Button
+            loading={loading}
+            disabled={timeTicketModal.context?.timeticket?.committed_at}
+            onClick={() => form.submit()}
+          >
             {t("general.actions.save")}
           </Button>
           {timeTicketModal.context && timeTicketModal.context.id ? null : (
@@ -198,6 +203,7 @@ export function TimeTicketModalContainer({
         autoComplete={"off"}
         form={form}
         onFinishFailed={() => setEnterAgain(false)}
+        disabled={timeTicketModal.context?.timeticket?.committed_at}
         initialValues={
           timeTicketModal.context.timeticket
             ? {
@@ -218,6 +224,9 @@ export function TimeTicketModalContainer({
         <PageHeader
           extra={
             <Space>
+              <TimeTicketsCommitToggleComponent
+                timeticket={timeTicketModal.context?.timeticket}
+              />
               <Button onClick={handleCancel}>
                 {t("general.actions.cancel")}
               </Button>
@@ -241,14 +250,16 @@ export function TimeTicketModalContainer({
         <TimeTicketModalComponent
           isEdit={timeTicketModal.context.id}
           form={form}
+          disabled={timeTicketModal.context?.timeticket?.committed_at}
           employeeAutoCompleteOptions={
             EmployeeAutoCompleteData && EmployeeAutoCompleteData.employees
           }
           employeeSelectDisabled={
-            timeTicketModal.context?.timeticket?.employeeid &&
+            timeTicketModal.context?.timeticket?.committed_at ||
+            (timeTicketModal.context?.timeticket?.employeeid &&
             !timeTicketModal.context.id
               ? true
-              : false
+              : false)
           }
         />
       </Form>

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

@@ -0,0 +1,378 @@
+import {
+  Alert,
+  Button,
+  Checkbox,
+  Col,
+  Form,
+  Input,
+  InputNumber,
+  Row,
+  Space,
+  Table,
+} from "antd";
+import _ from "lodash";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import EmployeeSearchSelectComponent from "../employee-search-select/employee-search-select.component";
+import EmployeeTeamSearchSelectComponent from "../employee-team-search-select/employee-team-search-select.component";
+import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
+import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
+import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
+import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component";
+import TimeTicketsTasksPresets from "../time-ticket-tasks-presets/time-ticket-tasks-presets.component";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TimeTicketTaskModalComponent);
+
+export function TimeTicketTaskModalComponent({
+  bodyshop,
+  form,
+  lineTicketCalled,
+  calculateTimeTickets,
+  lineTicketLoading,
+  lineTicketData,
+  queryJobInfo,
+}) {
+  const { t } = useTranslation();
+
+  return (
+    <div>
+      <TimeTicketsTasksPresets
+        form={form}
+        calculateTimeTickets={calculateTimeTickets}
+      />
+      <Row gutter={[16, 16]}>
+        <Col xl={12} lg={24}>
+          <Form.Item
+            name="jobid"
+            label={t("timetickets.fields.ro_number")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <JobSearchSelectComponent
+              convertedOnly={!bodyshop.tt_allow_post_to_invoiced}
+              notExported={!bodyshop.tt_allow_post_to_invoiced}
+            />
+          </Form.Item>
+
+          <Form.Item
+            name="employeeteamid"
+            label={t("timetickets.fields.employee_team")}
+          >
+            <EmployeeTeamSearchSelectComponent />
+          </Form.Item>
+
+          <Form.Item
+            name="hourstype"
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <Checkbox.Group>
+              <Space wrap>
+                <Checkbox value="LAB" style={{ display: "flex" }}>
+                  {t("jobs.fields.lab")}
+                </Checkbox>
+                <Checkbox value="LAR" style={{ display: "flex" }}>
+                  {t("jobs.fields.lar")}
+                </Checkbox>
+                <Checkbox value="LAM" style={{ display: "flex" }}>
+                  {t("jobs.fields.lam")}
+                </Checkbox>
+                <Checkbox value="LAF" style={{ display: "flex" }}>
+                  {t("jobs.fields.laf")}
+                </Checkbox>
+                <Checkbox value="LAG" style={{ display: "flex" }}>
+                  {t("jobs.fields.lag")}
+                </Checkbox>
+              </Space>
+            </Checkbox.Group>
+          </Form.Item>
+          <Space wrap align="start">
+            <Form.Item
+              name="percent"
+              rules={[
+                {
+                  required: true,
+                  //message: t("general.validation.required"),
+                },
+              ]}
+            >
+              <InputNumber min={0} max={100} precision={1} addonAfter="%" />
+            </Form.Item>
+
+            <Button onClick={calculateTimeTickets}>
+              {t("tt_approvals.labels.calculate")}
+            </Button>
+          </Space>
+        </Col>
+        <Col xl={12} lg={24}>
+          <Form.Item shouldUpdate>
+            {() => {
+              const data = form.getFieldValue("timetickets");
+              return (
+                <Table
+                  dataSource={data}
+                  rowKey={"employeeid"}
+                  columns={[
+                    {
+                      title: t("timetickets.fields.employee"),
+                      dataIndex: "employee",
+                      key: "employee",
+                      render: (text, record) => {
+                        const emp = bodyshop.employees.find(
+                          (e) => e.id === record.employeeid
+                        );
+                        return `${emp?.first_name} ${emp?.last_name}`;
+                      },
+                    },
+                    {
+                      title: t("timetickets.fields.cost_center"),
+                      dataIndex: "cost_center",
+                      key: "cost_center",
+
+                      render: (text, record) =>
+                        record.cost_center === "timetickets.labels.shift"
+                          ? t(record.cost_center)
+                          : record.cost_center,
+                    },
+                    {
+                      title: t("timetickets.fields.productivehrs"),
+                      dataIndex: "productivehrs",
+                      key: "productivehrs",
+                    },
+                    {
+                      title: "Percentage",
+                      dataIndex: "percentage",
+                      key: "percentage",
+                    },
+                    {
+                      title: "Rate",
+                      dataIndex: "rate",
+                      key: "rate",
+                    },
+                    // {
+                    //   title: "Pay",
+                    //   dataIndex: "pay",
+                    //   key: "pay",
+                    // },
+                  ]}
+                />
+              );
+            }}
+          </Form.Item>
+
+          <Form.List
+            name={["timetickets"]}
+            rules={[
+              {
+                validator: (rule, value) => {
+                  //Check the cost center,
+                  const totals = CalculateAllocationsTotals(
+                    bodyshop,
+                    lineTicketData.joblines,
+                    lineTicketData.timetickets,
+                    lineTicketData.jobs_by_pk.lbr_adjustments
+                  );
+
+                  const grouped = _.groupBy(value, "cost_center");
+                  let error = false;
+                  Object.keys(grouped).forEach((key) => {
+                    const totalProdTicketHours = grouped[key].reduce(
+                      (acc, val) => acc + val.productivehrs,
+                      0
+                    );
+
+                    const fieldTypeToCheck = "cost_center";
+                    // bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                    //   ? "mod_lbr_ty"
+                    //   : "cost_center";
+
+                    const costCenterDiff =
+                      Math.round(
+                        totals.find((total) => total[fieldTypeToCheck] === key)
+                          ?.difference * 10
+                      ) / 10;
+
+                    if (totalProdTicketHours > costCenterDiff) error = true;
+                    else {
+                      // return Promise.resolve();
+                    }
+                  });
+
+                  if (!error) return Promise.resolve();
+                  return Promise.reject(
+                    "Too many hours are being claimed as a part of this task"
+                  );
+                },
+              },
+            ]}
+          >
+            {(fields, { add, remove, move }, { errors }) => {
+              return (
+                <div>
+                  {errors.map((e, idx) => (
+                    <Alert key={idx} message={e} />
+                  ))}
+                  <div
+                    style={{
+                      display: "none",
+                    }}
+                  >
+                    {fields.map((field, index) => (
+                      <Form.Item
+                        key={field.key}
+                        style={{ padding: 0, margin: 2 }}
+                      >
+                        <Space wrap>
+                          <Form.Item
+                            label={t("timetickets.fields.employeeid")}
+                            key={`${index}employeeid`}
+                            name={[field.name, "employeeid"]}
+                            rules={[
+                              {
+                                required: true,
+                                //message: t("general.validation.required"),
+                              },
+                            ]}
+                          >
+                            <EmployeeSearchSelectComponent
+                              options={bodyshop.employees}
+                            />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("timetickets.fields.date")}
+                            key={`${index}date`}
+                            name={[field.name, "date"]}
+                            rules={[
+                              {
+                                required: true,
+                                //message: t("general.validation.required"),
+                              },
+                            ]}
+                          >
+                            <FormDateTimePickerComponent />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("timetickets.fields.productivehrs")}
+                            key={`${index}productivehrs`}
+                            name={[field.name, "productivehrs"]}
+                            rules={[
+                              {
+                                required: true,
+                                //message: t("general.validation.required"),
+                              },
+                            ]}
+                          >
+                            <InputNumber min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("timetickets.fields.actualhrs")}
+                            key={`${index}actualhrs`}
+                            name={[field.name, "actualhrs"]}
+                            rules={[
+                              {
+                                required: true,
+                                //message: t("general.validation.required"),
+                              },
+                            ]}
+                          >
+                            <InputNumber min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("timetickets.fields.rate")}
+                            key={`${index}rate`}
+                            name={[field.name, "rate"]}
+                            rules={[
+                              {
+                                required: true,
+                                //message: t("general.validation.required"),
+                              },
+                            ]}
+                          >
+                            <InputNumber />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("timetickets.fields.cost_center")}
+                            key={`${index}cost_center`}
+                            name={[field.name, "cost_center"]}
+                            rules={[
+                              {
+                                required: true,
+                                //message: t("general.validation.required"),
+                              },
+                            ]}
+                          >
+                            <Input />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("timetickets.fields.memo")}
+                            key={`${index}memo`}
+                            name={[field.name, "memo"]}
+                          >
+                            <Input />
+                          </Form.Item>
+                        </Space>
+                      </Form.Item>
+                    ))}
+                  </div>
+                </div>
+              );
+            }}
+          </Form.List>
+        </Col>
+      </Row>
+      <Form.Item dependencies={["jobid"]}>
+        {() => {
+          const jobid = form.getFieldValue("jobid");
+
+          if (
+            (!lineTicketCalled && jobid) ||
+            (jobid &&
+              lineTicketData?.jobs_by_pk?.id !== jobid &&
+              !lineTicketLoading)
+          ) {
+            queryJobInfo({ variables: { id: jobid } }).then(() =>
+              calculateTimeTickets("")
+            );
+          }
+          return (
+            <LaborAllocationContainer
+              jobid={jobid || null}
+              loading={lineTicketLoading}
+              lineTicketData={lineTicketData}
+              hideTimeTickets
+            />
+          );
+        }}
+      </Form.Item>
+      {bodyshop?.md_tasks_presets?.use_approvals && (
+        <Col span={24}>
+          <Alert
+            message={t("tt_approvals.labels.approval_queue_in_use")}
+            type="warning"
+          />
+        </Col>
+      )}
+    </div>
+  );
+}

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

@@ -0,0 +1,215 @@
+import React, { useEffect } from "react";
+
+import { useLazyQuery, useMutation, useQuery } from "@apollo/client";
+import { Form, Modal, notification } from "antd";
+import Dinero from "dinero.js";
+import _ from "lodash";
+import moment from "moment";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { QUERY_ACTIVE_EMPLOYEES } from "../../graphql/employees.queries";
+import { GET_JOB_INFO_DRAW_CALCULATIONS } from "../../graphql/jobs-lines.queries";
+import { INSERT_NEW_TIME_TICKET } from "../../graphql/timetickets.queries";
+import { toggleModalVisible } from "../../redux/modals/modals.actions";
+import { selectTimeTicketTasks } from "../../redux/modals/modals.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import TimeTicketTaskModalComponent from "./time-ticket-task-modal.component";
+import { INSERT_NEW_TT_APPROVALS } from "../../graphql/tt-approvals.queries";
+
+const mapStateToProps = createStructuredSelector({
+  timeTicketTasksModal: selectTimeTicketTasks,
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  toggleModalVisible: () => dispatch(toggleModalVisible("timeTicketTask")),
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TimeTickeTaskModalContainer);
+
+export function TimeTickeTaskModalContainer({
+  bodyshop,
+  timeTicketTasksModal,
+  toggleModalVisible,
+}) {
+  const [form] = Form.useForm();
+  const { context, visible } = timeTicketTasksModal;
+  const { data: EmployeeAutoCompleteData } = useQuery(QUERY_ACTIVE_EMPLOYEES, {
+    skip: !visible,
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+  });
+
+  const { t } = useTranslation();
+  const [insertTimeTickets] = useMutation(INSERT_NEW_TIME_TICKET);
+  const [insertTimeTicketApproval] = useMutation(INSERT_NEW_TT_APPROVALS);
+  const [queryJobInfo, { called, loading, data: lineTicketData }] =
+    useLazyQuery(GET_JOB_INFO_DRAW_CALCULATIONS, {
+      fetchPolicy: "network-only",
+      nextFetchPolicy: "network-only",
+    });
+
+  async function handleFinish(values) {
+    try {
+      if (bodyshop.md_tasks_presets.use_approvals) {
+        const result = await insertTimeTicketApproval({
+          variables: {
+            timeTicketInput: values.timetickets.map((ticket) => ({
+              ..._.omit(ticket, "pay"),
+              bodyshopid: bodyshop.id,
+            })),
+          },
+        });
+        if (result.errors) {
+          notification.open({
+            type: "error",
+            message: t("timetickets.errors.creating", {
+              message: JSON.stringify(result.errors),
+            }),
+          });
+        } else {
+          notification.open({
+            type: "success",
+            message: t("timetickets.successes.created"),
+          });
+          form.resetFields();
+          toggleModalVisible();
+        }
+      } else {
+        const result = await insertTimeTickets({
+          variables: {
+            timeTicketInput: values.timetickets.map((ticket) =>
+              _.omit(ticket, "pay")
+            ),
+          },
+          refetchQueries: ["GET_LINE_TICKET_BY_PK"]
+        });
+        if (result.errors) {
+          notification.open({
+            type: "error",
+            message: t("timetickets.errors.creating", {
+              message: JSON.stringify(result.errors),
+            }),
+          });
+        } else {
+          notification.open({
+            type: "success",
+            message: t("timetickets.successes.created"),
+          });
+          toggleModalVisible();
+        }
+      }
+    } catch (error) {
+      console.log("🚀 ~ file: time-ticket-task-modal.container.jsx:104 ~ handleFinish ~ error:", error)
+      notification.open({
+        type: "error",
+        message: t("timetickets.errors.creating", {
+          message: JSON.stringify(error),
+        }),
+      });
+    } finally {
+    }
+  }
+
+  useEffect(() => {
+    if (visible && context.jobid) {
+      queryJobInfo({ variables: { id: context.jobid } });
+    }
+  }, [context.jobid, queryJobInfo, visible]);
+
+  const calculateTimeTickets = (presetMemo) => {
+    const formData = form.getFieldsValue();
+    if (
+      !formData.jobid ||
+      !formData.employeeteamid ||
+      !formData.hourstype ||
+      formData.hourstype.length === 0 ||
+      !formData.percent ||
+      !lineTicketData
+    ) {
+      return;
+    }
+
+    let data = [];
+    let eligibleHours = 0;
+
+    const theTeam = JSON.parse(formData.employeeteamid);
+
+    if (theTeam) {
+      formData.hourstype.forEach((hourstype) => {
+        eligibleHours =
+          lineTicketData.joblines.reduce(
+            (acc, val) =>
+              acc + (hourstype === val.mod_lbr_ty ? val.mod_lb_hrs : 0),
+            0
+          ) * (formData.percent / 100 || 0);
+
+        theTeam.employee_team_members.forEach((e) => {
+          const newTicket = {
+            employeeid: e.employeeid,
+            bodyshopid: bodyshop.id,
+            date: moment().format("YYYY-MM-DD"),
+            jobid: formData.jobid,
+            rate: e.labor_rates[hourstype],
+            actualhrs: 0,
+            memo: typeof presetMemo === "string" ? presetMemo : "",
+            flat_rate: true,
+            ciecacode: hourstype,
+            cost_center:
+              bodyshop.md_responsibility_centers.defaults.costs[hourstype],
+            productivehrs:
+              Math.round(eligibleHours * 100 * (e.percentage / 100)) / 100,
+            pay: Dinero({
+              amount: Math.round((e.labor_rates[hourstype] || 0) * 100),
+            })
+              .multiply(
+                Math.round(eligibleHours * 100 * (e.percentage / 100)) / 100
+              )
+              .toFormat("$0.00"),
+          };
+          data.push(newTicket);
+        });
+      });
+
+      form.setFieldsValue({
+        timetickets: data.filter((d) => d.productivehrs > 0),
+      });
+      form.validateFields();
+    }
+  };
+
+  return (
+    <Modal
+      destroyOnClose
+      open={visible}
+      onCancel={() => {
+        toggleModalVisible();
+        form.resetFields();
+      }}
+      width="80%"
+      onOk={() => form.submit()}
+    >
+      <Form
+        autoComplete={"off"}
+        form={form}
+        layout="vertical"
+        onFinish={handleFinish}
+        initialValues={context}
+      >
+        <TimeTicketTaskModalComponent
+          form={form}
+          employeeAutoCompleteOptions={
+            EmployeeAutoCompleteData && EmployeeAutoCompleteData.employees
+          }
+          lineTicketData={lineTicketData}
+          lineTicketLoading={loading}
+          lineTicketCalled={called}
+          calculateTimeTickets={calculateTimeTickets}
+          queryJobInfo={queryJobInfo}
+        />
+      </Form>
+    </Modal>
+  );
+}

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

@@ -0,0 +1,30 @@
+import React from "react";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
+import { Button, Dropdown } from "antd";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TimeTicketTaskCollector);
+
+export function TimeTicketTaskCollector({ form, bodyshop }) {
+  const { t } = useTranslation();
+
+  const items = [];
+
+  return (
+    <Dropdown menu={{ items }}>
+      <Button>{t("timetickets.actions.tasks")}</Button>
+    </Dropdown>
+  );
+}

client/src/components/time-ticket-tasks-presets/time-ticket-tasks-presets.component.jsx

@@ -0,0 +1,72 @@
+import { Button, Dropdown } from "antd";
+import React from "react";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TimeTicketsTasksPresets);
+
+export function TimeTicketsTasksPresets({
+  bodyshop,
+  form,
+  calculateTimeTickets,
+}) {
+  const handleClick = (props) => {
+    const preset = bodyshop.md_tasks_presets?.presets?.find((p) => {
+      return p.name === props.key;
+    });
+
+    if (preset) {
+      form.setFieldsValue({
+        percent: preset.percent,
+        hourstype: preset.hourstype,
+      });
+
+      calculateTimeTickets(preset.memo);
+    }
+  };
+
+  return (
+    <Dropdown
+      trigger="click"
+      menu={{
+        items: bodyshop.md_tasks_presets?.presets
+          ? bodyshop.md_tasks_presets?.presets?.map((p) => ({
+              label: p.name,
+              key: p.name,
+            }))
+          : [],
+        onClick: handleClick,
+      }}
+    >
+      <Button>Presets</Button>
+    </Dropdown>
+  );
+}
+
+// const samplePresets = [
+//   {
+//     name: "Teardown",
+//     hourstype: ["LAB", "LAM"],
+//     percent: 10,
+//     memo: "Teardown Preset Task",
+//   },
+//   {
+//     name: "Disassembly",
+//     hourstype: ["LAB", "LAD"],
+//     percent: 20,
+//     memo: "Disassy Preset Claim",
+//   },
+//   { name: "Body", hourstype: ["LAB", "LAD"], percent: 20 },
+//   { name: "Prep", hourstype: ["LAR"], percent: 20 },
+// ];

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

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

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

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

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

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

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

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

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

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

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

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

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

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

client/src/graphql/bodyshop.queries.js

@@ -117,6 +117,7 @@ export const QUERY_BODYSHOP = gql`
       md_parts_scan
       enforce_conversion_category
       tt_enforce_hours_for_tech_console
+      md_tasks_presets
       use_paint_scale_data
       employees {
         user_email
@@ -233,6 +234,7 @@ export const UPDATE_SHOP = gql`
         md_parts_scan
         enforce_conversion_category
         tt_enforce_hours_for_tech_console
+        md_tasks_presets
         employees {
           id
           first_name

client/src/graphql/employee_teams.queries.js

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

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

@@ -51,6 +51,52 @@ export const GET_LINE_TICKET_BY_PK = gql`
       op_code_desc
       convertedtolbr
       convertedtolbr_data
+    
+    }
+    timetickets(where: { jobid: { _eq: $id } }) {
+      actualhrs
+      ciecacode
+      cost_center
+      date
+      id
+      jobid
+      employeeid
+      memo
+      flat_rate
+      clockon
+      clockoff
+      rate
+      committed_at
+      commited_by
+      employee {
+        id
+        first_name
+        last_name
+        employee_number
+      }
+      productivehrs
+    }
+  }
+`;
+
+export const GET_JOB_INFO_DRAW_CALCULATIONS = gql`
+  query GET_JOB_INFO_DRAW_CALCULATIONS($id: uuid!) {
+    jobs_by_pk(id: $id) {
+      id
+      lbr_adjustments
+      converted
+      rate_lab
+      rate_lad
+      rate_laa
+      rate_la1
+      rate_la2
+      rate_la3
+      rate_la4
+      rate_lau
+      rate_lar
+      rate_lag
+      rate_laf
+      rate_lam
     }
     timetickets(where: { jobid: { _eq: $id } }) {
       actualhrs
@@ -73,9 +119,25 @@ export const GET_LINE_TICKET_BY_PK = gql`
       }
       productivehrs
     }
+    joblines(where: { jobid: { _eq: $id }, removed: { _eq: false } }) {
+      id
+      line_desc
+      part_type
+      oem_partno
+      db_price
+      act_price
+      part_qty
+      mod_lbr_ty
+      db_hrs
+      mod_lb_hrs
+      lbr_op
+      lbr_amt
+      op_code_desc
+      convertedtolbr
+      convertedtolbr_data
+    }
   }
 `;
-
 export const UPDATE_JOB_LINE_STATUS = gql`
   mutation UPDATE_JOB_LINE_STATUS(
     $ids: [uuid!]!
@@ -275,3 +337,14 @@ export const UPDATE_JOB_LINES_IOU = gql`
     }
   }
 `;
+
+export const UPDATE_LINE_PPC = gql`
+  mutation UPDATE_LINE_PPC($id: uuid!, $jobline: joblines_set_input) {
+    update_joblines_by_pk(pk_columns: { id: $id }, _set: $jobline) {
+      jobid
+      id
+      act_price_before_ppc
+      act_price
+    }
+  }
+`;

client/src/graphql/jobs.queries.js

@@ -723,6 +723,7 @@ export const GET_JOB_BY_PK = gql`
         ioucreated
         convertedtolbr
         ah_detail_line
+        act_price_before_ppc
         critical
         billlines(limit: 1, order_by: { bill: { date: desc } }) {
           id
@@ -868,10 +869,40 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         count
         status
       }
-      joblines(where: { removed: { _eq: false } }) {
+
+      joblines(
+        where: {
+          removed: { _eq: false }
+          part_type: { _is_null: false, _nin: ["PAE", "PAS", "PASL"] }
+        }
+        order_by: { line_no: asc }
+      ) {
         id
+        alt_partm
+        line_no
+        unq_seq
+        line_ind
+        line_desc
+        line_ref
+        part_type
+        part_qty
         mod_lbr_ty
+        db_hrs
         mod_lb_hrs
+        lbr_op
+        lbr_amt
+        op_code_desc
+        status
+        notes
+        location
+        tax_part
+        db_ref
+        manual_line
+        prt_dsmk_p
+        prt_dsmk_m
+        ioucreated
+        convertedtolbr
+        critical
       }
       owner {
         id

client/src/graphql/payment_response.queries.js

@@ -0,0 +1,55 @@
+import { gql } from "@apollo/client";
+
+export const INSERT_PAYMENT_RESPONSE = gql`
+  mutation INSERT_PAYMENT_RESPONSE(
+    $paymentResponse: [payment_response_insert_input!]!
+  ) {
+    insert_payment_response(objects: $paymentResponse) {
+      returning {
+        id
+      }
+    }
+  }
+`;
+
+export const QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID = gql`
+  query QUERY_PAYMENT_RESPONSE_BY_PK($paymentid: uuid!) {
+    payment_response(where: { paymentid: { _eq: $paymentid } }) {
+      id
+      jobid
+      bodyshopid
+      paymentid
+      amount
+      declinereason
+      ext_paymentid
+      successful
+      response
+    }
+  }
+`;
+
+export const QUERY_RO_AND_OWNER_BY_JOB_PK = gql`
+  query QUERY_RO_AND_OWNER_BY_JOB_PK($jobid: uuid!) {
+    jobs_by_pk(id: $jobid) {
+      ro_number
+      owner {
+        ownr_fn
+        ownr_ln
+        ownr_ea
+        ownr_zip
+      }
+    }
+  }
+`;
+
+export const GET_REFUNDABLE_AMOUNT_BY_JOBID = gql`
+  query GET_REFUNDABLE_AMOUNT_BY_JOBID($jobid: uuid!) {
+    payment_response_aggregate(where: { jobid: { _eq: $jobid } }) {
+      aggregate {
+        sum {
+          amount
+        }
+      }
+    }
+  }
+`;

client/src/graphql/timetickets.queries.js

@@ -15,6 +15,8 @@ export const QUERY_TICKETS_BY_JOBID = gql`
       memo
       jobid
       flat_rate
+      commited_by
+      committed_at
       employee {
         employee_number
         first_name
@@ -44,6 +46,8 @@ export const QUERY_TIME_TICKETS_IN_RANGE = gql`
       memo
       jobid
       flat_rate
+      commited_by
+      committed_at
       job {
         id
         ro_number
@@ -86,6 +90,8 @@ export const QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE = gql`
       productivehrs
       memo
       jobid
+      commited_by
+      committed_at
       flat_rate
       job {
         id
@@ -119,6 +125,8 @@ export const QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE = gql`
       memo
       jobid
       flat_rate
+      commited_by
+      committed_at
       job {
         id
         ro_number
@@ -158,7 +166,11 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
       productivehrs
       memo
       jobid
+      committed_at
+      commited_by
       flat_rate
+      commited_by
+      committed_at
       job {
         id
         ro_number
@@ -219,6 +231,44 @@ export const INSERT_NEW_TIME_TICKET = gql`
         date
         memo
         flat_rate
+        commited_by
+        committed_at
+      }
+    }
+  }
+`;
+
+export const INSERT_TIME_TICKET_AND_APPROVE = gql`
+  mutation INSERT_TIME_TICKET_AND_APPROVE(
+    $timeTicketInput: [timetickets_insert_input!]!
+    $approvalIds: [uuid!]!
+    $approvalUpdate: tt_approval_queue_set_input
+  ) {
+    insert_timetickets(objects: $timeTicketInput) {
+      returning {
+        id
+        clockon
+        clockoff
+        employeeid
+        productivehrs
+        actualhrs
+        ciecacode
+        date
+        memo
+        flat_rate
+        commited_by
+        committed_at
+      }
+    }
+    update_tt_approval_queue(
+      where: { id: { _in: $approvalIds } }
+      _set: $approvalUpdate
+    ) {
+      returning {
+        id
+        approved_at
+        approved_at
+
       }
     }
   }
@@ -247,6 +297,38 @@ export const UPDATE_TIME_TICKET = gql`
         date
         flat_rate
         memo
+        committed_at
+        commited_by
+      }
+    }
+  }
+`;
+
+export const UPDATE_TIME_TICKETS = gql`
+  mutation UPDATE_TIME_TICKETS(
+    $timeticketIds: [uuid!]!
+    $timeticket: timetickets_set_input!
+  ) {
+    update_timetickets(
+      where: { id: { _in: $timeticketIds } }
+      _set: $timeticket
+    ) {
+      returning {
+        id
+        clockon
+        clockoff
+        employeeid
+        productivehrs
+        actualhrs
+        ciecacode
+        created_at
+        updated_at
+        jobid
+        date
+        flat_rate
+        memo
+        committed_at
+        commited_by
       }
     }
   }
@@ -271,6 +353,8 @@ export const QUERY_ACTIVE_TIME_TICKETS = gql`
       cost_center
       flat_rate
       jobid
+      commited_by
+      committed_at
       job {
         id
         ownr_fn

client/src/graphql/tt-approvals.queries.js

@@ -0,0 +1,98 @@
+import { gql } from "@apollo/client";
+
+export const QUERY_ALL_TT_APPROVALS_PAGINATED = gql`
+  query QUERY_ALL_TT_APPROVALS_PAGINATED(
+    $offset: Int
+    $limit: Int
+    $order: [tt_approval_queue_order_by!]!
+  ) {
+    tt_approval_queue(
+      offset: $offset
+      limit: $limit
+      order_by: $order
+      where: { approved_at: { _is_null: true } }
+    ) {
+      id
+      jobid
+      bodyshopid
+      employeeid
+      employee {
+        first_name
+        last_name
+        id
+      }
+      job {
+        ro_number
+        status
+        id
+      }
+      employeeid
+      actualhrs
+      productivehrs
+      ciecacode
+      cost_center
+      date
+      rate
+    }
+    tt_approval_queue_aggregate {
+      aggregate {
+        count(distinct: true)
+      }
+    }
+  }
+`;
+
+export const INSERT_NEW_TT_APPROVALS = gql`
+  mutation INSERT_NEW_TT_APPROVALS(
+    $timeTicketInput: [tt_approval_queue_insert_input!]!
+  ) {
+    insert_tt_approval_queue(objects: $timeTicketInput) {
+      returning {
+        id
+        employeeid
+        productivehrs
+        actualhrs
+        ciecacode
+        date
+        memo
+        flat_rate
+      }
+    }
+  }
+`;
+
+export const QUERY_TT_APPROVALS_BY_IDS = gql`
+  query QUERY_TT_APPROVALS_BY_IDS($ids: [uuid!]!) {
+    tt_approval_queue(where: { id: { _in: $ids } }) {
+      id
+      productivehrs
+      actualhrs
+      rate
+      memo
+      jobid
+      flat_rate
+      employeeid
+      date
+      ciecacode
+      bodyshopid
+      cost_center
+    }
+  }
+`;
+
+export const UPDATE_TT_BY_APPROVAL = gql`
+  mutation UPDATE_TT_BY_APPROVAL(
+    $ttApprovalUpdates: [tt_approval_queue_updates!]!
+  ) {
+    update_tt_approval_queue_many(updates: $ttApprovalUpdates) {
+      returning {
+        id
+        approved_at
+        approved_by
+        timeticket {
+          id
+        }
+      }
+    }
+  }
+`;

client/src/index.js

@@ -22,7 +22,7 @@ Dinero.globalRoundingMode = "HALF_EVEN";
 
 if (process.env.NODE_ENV !== "development") {
   Sentry.init({
-    dsn: "https://fd7e89369b6b4bdc9c6c4c9f22fa4ee4@o492140.ingest.sentry.io/5651027",
+    dsn: "https://a6acc91c073e414196014b8484627a61@o492140.ingest.sentry.io/4504561071161344",
     ignoreErrors: [
       "ResizeObserver loop",
       "Module specifier, 'fs' does not start",

client/src/landing/Banner0.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Button, Space } from "antd";
+import { Button, Card, Space } from "antd";
 import { DownOutlined } from "@ant-design/icons";
 import QueueAnim from "rc-queue-anim";
 import TweenOne from "rc-tween-one";
@@ -19,25 +19,27 @@ class Banner extends React.PureComponent {
           delay={200}
           {...dataSource.textWrapper}
         >
-          <div key="title" {...dataSource.title}>
-            {typeof dataSource.title.children === "string" &&
-            dataSource.title.children.match(isImg) ? (
-              <img src={dataSource.title.children} width="100%" alt="img" />
-            ) : (
-              dataSource.title.children
-            )}
-          </div>
-          <div key="content" {...dataSource.content}>
-            {dataSource.content.children}
-          </div>
-          <Space wrap>
-            <Button ghost key="button" {...dataSource.button}>
-              {dataSource.button.children}
-            </Button>
-            <Button type="primary" key="button2" {...dataSource.button2}>
-              {dataSource.button2.children}
-            </Button>
-          </Space>
+          <Card style={{ opacity: "80%", background: "#000" }}>
+            <div key="title" {...dataSource.title}>
+              {typeof dataSource.title.children === "string" &&
+              dataSource.title.children.match(isImg) ? (
+                <img src={dataSource.title.children} width="100%" alt="img" />
+              ) : (
+                dataSource.title.children
+              )}
+            </div>
+            <div key="content" {...dataSource.content}>
+              {dataSource.content.children}
+            </div>
+            <Space wrap>
+              <Button ghost key="button" {...dataSource.button}>
+                {dataSource.button.children}
+              </Button>
+              <Button type="primary" key="button2" {...dataSource.button2}>
+                {dataSource.button2.children}
+              </Button>
+            </Space>
+          </Card>
         </QueueAnim>
         <TweenOne
           animation={{

client/src/landing/data.source.js

@@ -1,9 +1,9 @@
 import React from "react";
-import i18n from "../translations/i18n";
 import ImexOnlineLogoLight from "../assets/ImEX Online Logo.png";
-import ImexOnlineLogoDark from "../assets/ImEX Online Logo - Dark.png";
-import ImexOnlineBannerLogo from "../assets/banner-logo.png";
+import i18n from "../translations/i18n";
+
 import TechnologySvg from "../assets/icons/technology.svg";
+import RomeLogo from "../assets/romelogo.png";
 export const Nav00DataSource = {
   wrapper: { className: "header0 home-page-wrapper" },
   page: { className: "home-page" },
@@ -113,18 +113,16 @@ export const Banner00DataSource = {
   textWrapper: { className: "banner0-text-wrapper" },
   title: {
     className: "banner0-title",
-    children: (
-      <img alt="" style={{ width: "100%" }} src={ImexOnlineBannerLogo} />
-    ),
+    children: <img alt="" style={{ width: "100%" }} src={RomeLogo} />,
   },
   content: {
     className: "banner0-content",
-    children: i18n.t("landing.hero.title"),
+    children: null, // i18n.t("landing.hero.title"),
   },
   button: {
     className: "banner0-button",
     children: i18n.t("landing.hero.button"),
-    href: "https://imexsystems.ca/products/imex-online",
+    href: "https://rometech.com",
   },
   button2: {
     className: "banner0-button2",
@@ -979,9 +977,7 @@ export const Footer10DataSource = {
         className: "block",
         title: {
           className: "logo",
-          children: (
-            <img alt="" style={{ width: "100%" }} src={ImexOnlineLogoDark} />
-          ),
+          children: <img alt="" style={{ width: "100%" }} src={RomeLogo} />,
         },
         childWrapper: {
           className: "slogan",
@@ -1038,7 +1034,7 @@ export const Footer10DataSource = {
         childWrapper: {
           children: [
             {
-              href: "https://imexsystems.ca/privacy",
+              href: "https://www.rometech.com/privacy-policy-2/",
               name: "link0",
               children: i18n.t("landing.footer.company.privacypolicy"),
             },
@@ -1048,12 +1044,12 @@ export const Footer10DataSource = {
             //   children: i18n.t("landing.footer.company.about"),
             // },
             {
-              href: "/disclaimer",
+              href: "https://www.rometech.com/end-user-privacy-statement/",
               name: "link2",
               children: i18n.t("landing.footer.company.disclaimers"),
             },
             {
-              href: "https://imexsystems.ca/schedule-a-demo/",
+              href: "https://www.rometech.com/learn-more-now/",
               name: "link3",
               children: i18n.t("landing.footer.company.contact"),
             },
@@ -1068,8 +1064,7 @@ export const Footer10DataSource = {
     className: "copyright",
     children: (
       <span>
-        ©2022 <a href="http://imexsystems.ca">ImEX Systems</a> used under
-        license.
+        ©2023 <a href="http://rometech.com">Rome Technologies</a>
       </span>
     ),
   },

client/src/pages/csi/csi.container.page.jsx

@@ -171,7 +171,7 @@ export function CsiContainerPage({ currentUser }) {
       )}
 
       <Layout.Footer>
-        {`Copyright ImEX.Online. Survey ID: ${surveyId}`}
+        {`Survey ID: ${surveyId}`}
       </Layout.Footer>
     </Layout>
   );

client/src/pages/disclaimer/disclaimer.page.jsx

@@ -6,10 +6,10 @@ export default function AboutPage() {
     <div style={{ textAlign: "center", margin: "1rem 0rem" }}>
       <Typography.Title
         level={2}
-      >{`ImEX Online V.${process.env.NODE_ENV}-${process.env.REACT_APP_GIT_SHA}`}</Typography.Title>
+      >{`Rome Online V.${process.env.NODE_ENV}-${process.env.REACT_APP_GIT_SHA}`}</Typography.Title>
       <Typography.Title level={4}>
-        &copy; 2019 - {new Date().getFullYear()} Snapt Software Inc. used under
-        license to ImEX Systems Inc.
+        &copy; 2019 - {new Date().getFullYear()} ImEX Systems Inc. used under
+        license to Rome Technologies
       </Typography.Title>
       <Typography.Title level={2}>Third Party Notices</Typography.Title>
       <a href="/3rdparty-app.txt">

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

@@ -16,7 +16,7 @@ import LoadingSpinner from "../../components/loading-spinner/loading-spinner.com
 import PartnerPingComponent from "../../components/partner-ping/partner-ping.component";
 import PrintCenterModalContainer from "../../components/print-center-modal/print-center-modal.container";
 import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component";
-import TestComponent from "../../components/_test/test.component";
+import TestComponent from "../../components/_test/test.page";
 import { requestForToken } from "../../firebase/firebase.utils";
 import {
   selectBodyshop,
@@ -32,6 +32,10 @@ const ManageRootPage = lazy(() =>
 );
 const JobsPage = lazy(() => import("../jobs/jobs.page"));
 
+const CardPaymentModalContainer = lazy(() =>
+  import("../../components/card-payment-modal/card-payment-modal.container.")
+);
+
 const JobsDetailPage = lazy(() =>
   import("../jobs-detail/jobs-detail.page.container")
 );
@@ -95,6 +99,11 @@ const BillEnterModalContainer = lazy(() =>
 const TimeTicketModalContainer = lazy(() =>
   import("../../components/time-ticket-modal/time-ticket-modal.container")
 );
+const TimeTicketModalTask = lazy(() =>
+  import(
+    "../../components/time-ticket-task-modal/time-ticket-task-modal.container"
+  )
+);
 const PaymentModalContainer = lazy(() =>
   import("../../components/payment-modal/payment-modal.container")
 );
@@ -166,6 +175,9 @@ const Dms = lazy(() => import("../dms/dms.container"));
 const DmsPayables = lazy(() =>
   import("../dms-payables/dms-payables.container")
 );
+const TtApprovals = lazy(() =>
+  import("../tt-approvals/tt-approvals.page.container")
+);
 
 const { Content, Footer } = Layout;
 
@@ -177,7 +189,7 @@ const mapStateToProps = createStructuredSelector({
 export function Manage({ match, conflict, bodyshop }) {
   const { t } = useTranslation();
   useEffect(() => {
-    const widgetId = "IABVNO4scRKY11XBQkNr";
+    const widgetId = "mQdqARMzkZRUVugJ6TdS";
     window.noticeable.render("widget", widgetId);
     try {
       requestForToken();
@@ -196,12 +208,15 @@ export function Manage({ match, conflict, bodyshop }) {
     >
       <PaymentModalContainer />
 
+      <CardPaymentModalContainer />
+
       <BreadCrumbs />
       <BillEnterModalContainer />
       <JobCostingModal />
       <ReportCenterModal />
       <EmailOverlayContainer />
       <TimeTicketModalContainer />
+      <TimeTicketModalTask />
       <PrintCenterModalContainer />
       <Route exact path={`${match.path}/_test`} component={TestComponent} />
       <Route exact path={`${match.path}`} component={ManageRootPage} />
@@ -365,6 +380,7 @@ export function Manage({ match, conflict, bodyshop }) {
         path={`${match.path}/accounting/exportlogs`}
         component={ExportLogs}
       />
+      <Route exact path={`${match.path}/ttapprovals`} component={TtApprovals} />
       <Route exact path={`${match.path}/partsqueue`} component={PartsQueue} />
       <Route exact path={`${match.path}/phonebook`} component={Phonebook} />
 
@@ -417,7 +433,7 @@ export function Manage({ match, conflict, bodyshop }) {
             >
               <div style={{ display: "flex" }}>
                 <div>
-                  {`ImEX Online ${
+                  {`${t("titles.app")} ${
                     process.env.REACT_APP_GIT_SHA
                   } - ${preval`module.exports = new Date().toLocaleString("en-US", {timeZone: "America/Los_Angeles"});`}`}
                 </div>

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

@@ -16,6 +16,8 @@ import {
 } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ShopInfoUsersComponent from "../../components/shop-users/shop-users.component";
+import ShopTeamsContainer from "../../components/shop-teams/shop-teams.container";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -56,6 +58,12 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
         <Tabs.TabPane tab={t("bodyshop.labels.employees")} key="employees">
           <ShopEmployeesContainer />
         </Tabs.TabPane>
+        {
+          bodyshop.md_tasks_presets.enable_tasks && 
+          <Tabs.TabPane tab={t("bodyshop.labels.employee_teams")} key="teams">
+            <ShopTeamsContainer />
+          </Tabs.TabPane>
+        }
         <Tabs.TabPane tab={t("bodyshop.labels.licensing")} key="licensing">
           <ShopInfoUsersComponent />
         </Tabs.TabPane>

client/src/pages/time-tickets/time-tickets.container.jsx

@@ -19,6 +19,7 @@ import {
   setBreadcrumbs,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
+import TimeTicketsCommit from "../../components/time-tickets-commit/time-tickets-commit.component";
 
 const mapStateToProps = createStructuredSelector({});
 
@@ -74,6 +75,7 @@ export function TimeTicketsContainer({
               <Space wrap>
                 <TimeTicketsAttendanceTable />
                 <TimeTicketsPayrollTable />
+                <TimeTicketsCommit timetickets={data ? data.timetickets : []} />
                 <TimeTicketsDatesSelector />
               </Space>
             }

client/src/pages/tt-approvals/tt-approvals.page.container.jsx

@@ -0,0 +1,42 @@
+import React, { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
+import TtApprovalsList from "../../components/tt-approvals-list/tt-approvals-list.container";
+import {
+  setBreadcrumbs,
+  setSelectedHeader,
+} from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
+  setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
+});
+
+export function TtApprovalsPage({ setBreadcrumbs, setSelectedHeader }) {
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    document.title = t("titles.ttapprovals");
+    setSelectedHeader("ttapprovals");
+    setBreadcrumbs([
+      {
+        link: "/manage/ttapprovals",
+        label: t("titles.bc.ttapprovals"),
+      },
+    ]);
+  }, [t, setBreadcrumbs, setSelectedHeader]);
+
+  return (
+    <RbacWrapper action="ttapprovals:view">
+      <TtApprovalsList />
+    </RbacWrapper>
+  );
+}
+export default connect(mapStateToProps, mapDispatchToProps)(TtApprovalsPage);

client/src/redux/email/email.reducer.js

@@ -3,7 +3,7 @@ import EmailActionTypes from "./email.types";
 const INITIAL_STATE = {
   emailConfig: {
     messageOptions: {
-      from: { name: "ShopName", address: "noreply@bodyshop.app" },
+      from: { name: "ShopName", address: "noreply@romeonline.io" },
       to: null,
       replyTo: null,
     },

client/src/redux/modals/modals.reducer.js

@@ -16,6 +16,7 @@ const INITIAL_STATE = {
   schedule: { ...baseModal },
   partsOrder: { ...baseModal },
   timeTicket: { ...baseModal },
+  timeTicketTask: { ...baseModal },
   printCenter: { ...baseModal },
   reconciliation: { ...baseModal },
   payment: { ...baseModal },
@@ -25,6 +26,7 @@ const INITIAL_STATE = {
   contractFinder: { ...baseModal },
   inventoryUpsert: { ...baseModal },
   ca_bc_eftTableConvert: { ...baseModal },
+  cardPayment: { ...baseModal },
 };
 
 const modalsReducer = (state = INITIAL_STATE, action) => {

client/src/redux/modals/modals.selectors.js

@@ -36,6 +36,10 @@ export const selectTimeTicket = createSelector(
   [selectModals],
   (modals) => modals.timeTicket
 );
+export const selectTimeTicketTasks = createSelector(
+  [selectModals],
+  (modals) => modals.timeTicketTask
+);
 
 export const selectPrintCenter = createSelector(
   [selectModals],
@@ -79,3 +83,8 @@ export const selectCaBcEtfTableConvert = createSelector(
   [selectModals],
   (modals) => modals.ca_bc_eftTableConvert
 );
+
+export const selectCardPayment = createSelector(
+  [selectModals],
+  (modals) => modals.cardPayment
+);

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

@@ -197,15 +197,11 @@ export function* signInSuccessSaga({ payload }) {
   LogRocket.identify(payload.email);
 
   try {
-    // window.$crisp.push(["set", "user:email", [payload.email]]);
+    window.$zoho.salesiq.visitor.name(payload.displayName);
+    window.$zoho.salesiq.visitor.email(payload.email);
+    window.$zoho.salesiq.visitor.id(payload.email);
 
-    window.$crisp.push([
-      "set",
-      "user:nickname",
-      [payload.displayName || payload.email],
-    ]);
-
-    window.$crisp.push(["set", "session:segments", [["user"]]]);
+    window.$zoho.salesiq.chat.waitime(60 * 30); //Wait up to 30 minutes for the chat response.
 
     Sentry.setUser({
       email: payload.email,
@@ -234,7 +230,7 @@ export function* onSendPasswordResetStart() {
 export function* sendPasswordResetEmailSaga({ payload }) {
   try {
     yield sendPasswordResetEmail(auth, payload, {
-      url: "https://imex.online/passwordreset",
+      url: "https://romeonline.io/passwordreset",
     });
 
     yield put(sendPasswordResetSuccess());
@@ -290,10 +286,9 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
       )
     );
     try {
-      window.$crisp.push(["set", "user:company", [payload.shopname]]);
-      if (authRecord[0] && authRecord[0].user.validemail) {
-        window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
-      }
+      window.$zoho.salesiq.visitor.info({
+        Shop: payload.shopname,
+      });
     } catch (error) {
       console.error("Couldnt find $crisp.");
     }

client/src/translations/en_us/common.json

@@ -63,7 +63,7 @@
 				"scheduledfor": "Scheduled appointment for: ",
 				"severalerrorsfound": "Several jobs have issues which may prevent accurate smart scheduling. Click to expand.",
 				"smartscheduling": "Smart Scheduling",
-				"smspaymentreminder": "",
+				"smspaymentreminder": "This is {{shopname}} reminding you about your remaining balance of {{amount}}. To pay for the said balance click the link {{payment_link}}.",
 				"suggesteddates": "Suggested Dates"
 			},
 			"successes": {
@@ -104,7 +104,7 @@
 				"admin_jobunvoid": "ADMIN: Job has been unvoided.",
 				"billposted": "Bill with invoice number {{invoice_number}} posted.",
 				"billupdated": "Bill with invoice number {{invoice_number}} updated.",
-				"failedpayment": "",
+				"failedpayment": "Failed payment attempt.",
 				"jobassignmentchange": "Employee {{name}} assigned to {{operation}}",
 				"jobassignmentremoved": "Employee assignment removed for {{operation}}",
 				"jobchecklist": "Checklist type \"{{type}}\" completed.  In production set to {{inproduction}}.  Status set to {{status}}.",
@@ -162,7 +162,7 @@
 				"deleting": "Error deleting bill. {{error}}",
 				"existinginventoryline": "This bill cannot be deleted as it is tied to items in inventory.",
 				"exporting": "Error exporting payable(s). {{error}}",
-				"exporting-partner": "Unable to connect to ImEX Partner. Please ensure it is running and logged in.",
+				"exporting-partner": "Unable to connect to Rome Partner. Please ensure it is running and logged in.",
 				"invalidro": "Not a valid RO.",
 				"invalidvendor": "Not a valid vendor.",
 				"validation": "Please ensure all fields are entered correctly. "
@@ -229,7 +229,7 @@
 		},
 		"bodyshop": {
 			"actions": {
-				"add_task_preset": "",
+				"add_task_preset": "Add Task Preset",
 				"addapptcolor": "Add Appointment Color",
 				"addbucket": "Add Definition",
 				"addpartslocation": "Add Parts Location",
@@ -343,10 +343,12 @@
 				"md_payment_types": "Payment Types",
 				"md_referral_sources": "Referral Sources",
 				"md_tasks_presets": {
-					"hourstype": "",
-					"memo": "",
-					"name": "",
-					"percent": ""
+					"enable_tasks": "Enable Task Claiming",
+					"hourstype": "Hour Types",
+					"memo": "Time Ticket Memo",
+					"name": "Preset Name",
+					"percent": "Percent",
+					"use_approvals": "Use Time Ticket Approval Queue"
 				},
 				"messaginglabel": "Messaging Preset Label",
 				"messagingtext": "Messaging Preset Text",
@@ -384,7 +386,7 @@
 						"page": "CSI -> Page"
 					},
 					"employee_teams": {
-						"page": ""
+						"page": "Employee Teams -> List"
 					},
 					"employees": {
 						"page": "Employees -> List"
@@ -445,14 +447,14 @@
 					},
 					"timetickets": {
 						"edit": "Time Tickets -> Edit",
-						"editcommitted": "",
+						"editcommitted": "Time Tickets -> Edit Committed",
 						"enter": "Time Tickets -> Enter",
 						"list": "Time Tickets -> List",
 						"shiftedit": "Time Tickets -> Shift Edit"
 					},
 					"ttapprovals": {
-						"approve": "",
-						"view": ""
+						"approve": "Time Ticket Approval -> Approve",
+						"view": "Time Ticket Approval -> View"
 					},
 					"users": {
 						"editaccess": "Users -> Edit access"
@@ -471,8 +473,8 @@
 					"federal_tax": "Federal Tax",
 					"federal_tax_itc": "Federal Tax Credit",
 					"gst_override": "GST Override Account #",
-					"invoiceexemptcode": "",
-					"itemexemptcode": "",
+					"invoiceexemptcode": "QuickBooks US - Invoice Tax Exempt Code",
+					"itemexemptcode": "QuickBooks US - Line Item Tax Exempt Code",
 					"la1": "LA1",
 					"la2": "LA2",
 					"la3": "LA3",
@@ -563,7 +565,7 @@
 				"timezone": "Timezone",
 				"tt_allow_post_to_invoiced": "Allow Time Tickets to be posted to Invoiced & Exported Jobs",
 				"tt_enforce_hours_for_tech_console": "Restrict Claimable hours from Tech Console",
-				"use_fippa": "Use FIPPA for Names on Generated Documents?",
+				"use_fippa": "Conceal Customer Information on Generated Documents?",
 				"use_paint_scale_data": "Use Paint Scale Data for Job Costing?",
 				"uselocalmediaserver": "Use Local Media Server?",
 				"website": "Website",
@@ -595,16 +597,16 @@
 					"title": "DMS"
 				},
 				"emaillater": "Email Later",
-				"employee_teams": "",
+				"employee_teams": "Employee Teams",
 				"employees": "Employees",
 				"estimators": "Estimators",
-				"filehandlers": "File Handlers",
+				"filehandlers": "Adjusters",
 				"insurancecos": "Insurance Companies",
 				"intakechecklist": "Intake Checklist",
 				"jobstatuses": "Job Statuses",
 				"laborrates": "Labor Rates",
 				"licensing": "Licensing",
-				"md_tasks_presets": "",
+				"md_tasks_presets": "Tasks Presets",
 				"md_to_emails": "Preset To Emails",
 				"md_to_emails_emails": "Emails",
 				"messagingpresets": "Messaging Presets",
@@ -631,7 +633,7 @@
 				"speedprint": "Speed Print Configuration",
 				"ssbuckets": "Job Size Definitions",
 				"systemsettings": "System Settings",
-				"task-presets": "",
+				"task-presets": "Task Presets",
 				"workingdays": "Working Days"
 			},
 			"successes": {
@@ -824,8 +826,8 @@
 				"created_at": "Created At"
 			},
 			"labels": {
-				"nologgedinuser": "Please log out of ImEX Online",
-				"nologgedinuser_sub": "Users of ImEX Online cannot complete CSI surveys while logged in. Please log out and try again.",
+				"nologgedinuser": "Please log out of $t(titles.app)",
+				"nologgedinuser_sub": "Users of $t(titles.app) cannot complete CSI surveys while logged in. Please log out and try again.",
 				"noneselected": "No response selected.",
 				"title": "Customer Satisfaction Survey"
 			},
@@ -933,14 +935,14 @@
 		},
 		"employee_teams": {
 			"actions": {
-				"new": "",
-				"newmember": ""
+				"new": "New Team",
+				"newmember": "New Team Member"
 			},
 			"fields": {
-				"active": "",
-				"employeeid": "",
-				"name": "",
-				"percentage": ""
+				"active": "Active",
+				"employeeid": "Employee",
+				"name": "Team Name",
+				"percentage": "Percent"
 			}
 		},
 		"employees": {
@@ -1118,14 +1120,14 @@
 			},
 			"messages": {
 				"exception": "$t(titles.app) has encountered an error. Please try again. If the problem persists, please submit a support ticket or contact us.",
-				"newversionmessage": "Click refresh to update to the latest available version of ImEX Online.  Please make sure all other tabs and windows are closed.",
-				"newversiontitle": "New version of ImEX Online Available",
+				"newversionmessage": "Click refresh below to update to the latest available version of $t(titles.app).  Please make sure all other tabs and windows are closed.",
+				"newversiontitle": "New version of $t(titles.app) Available",
 				"noacctfilepath": "There is no accounting file path set. You will not be able to export any items.",
-				"nofeatureaccess": "You do not have access to this feature of ImEX Online.  Please contact support to request a license for this feature.",
+				"nofeatureaccess": "You do not have access to this feature of $t(titles.app).  Please contact support to request a license for this feature.",
 				"noshop": "You do not have access to any shops. Please reach out to your shop manager or technical support. ",
 				"notfoundsub": "Please make sure that you have access to the data or that the link is correct.",
 				"notfoundtitle": "We couldn't find what you're looking for...",
-				"partnernotrunning": "ImEX Online has detected that the partner is not running. Please ensure it is running to enable full functionality.",
+				"partnernotrunning": "$t(titles.app) has detected that the partner is not running. Please ensure it is running to enable full functionality.",
 				"rbacunauth": "You are not authorized to view this content. Please reach out to your shop manager to change your access level.",
 				"unsavedchanges": "You have unsaved changes.",
 				"unsavedchangespopup": "You have unsaved changes. Are you sure you want to leave?"
@@ -1133,7 +1135,7 @@
 			"validation": {
 				"invalidemail": "Please enter a valid email.",
 				"invalidphone": "Please enter a valid phone number.",
-				"required": "{{label}} is required. "
+				"required": "{{label}} is required."
 			}
 		},
 		"help": {
@@ -1142,7 +1144,7 @@
 			},
 			"labels": {
 				"codeplacholder": "6 digit PIN code",
-				"rescuedesc": "Enter the 6 digit code provided by ImEX Online Support below and click connect.",
+				"rescuedesc": "Enter the 6 digit code provided by $t(titles.app) Support below and click connect.",
 				"rescuetitle": "Rescue Me!"
 			}
 		},
@@ -1184,26 +1186,26 @@
 		},
 		"job_payments": {
 			"buttons": {
-				"goback": "",
-				"proceedtopayment": "",
-				"refundpayment": ""
+				"goback": "Cancel",
+				"proceedtopayment": "Proceed to Payment",
+				"refundpayment": "Refund Payment"
 			},
 			"notifications": {
 				"error": {
-					"description": "",
-					"title": ""
+					"description": "Please try again. Make sure the refund amount does not exceeds the payment amount.",
+					"title": "Error Refunding Payment"
 				}
 			},
 			"titles": {
-				"amount": "",
-				"dateOfPayment": "",
-				"descriptions": "",
-				"payer": "",
-				"payername": "",
-				"paymentid": "",
-				"paymenttype": "",
-				"refundamount": "",
-				"transactionid": ""
+				"amount": "Amount",
+				"dateOfPayment": "Date",
+				"descriptions": "Description",
+				"payer": "Payer",
+				"payername": "Payer Name",
+				"paymentid": "Payment ID",
+				"paymenttype": "Type",
+				"refundamount": "Refund Amount",
+				"transactionid": "Transaction ID"
 			}
 		},
 		"joblines": {
@@ -1305,7 +1307,7 @@
 				"addtoscoreboard": "Add to Scoreboard",
 				"allocate": "Allocate",
 				"autoallocate": "Auto Allocate",
-				"changefilehandler": "Change File Handler",
+				"changefilehandler": "Change Adjuster",
 				"changelaborrate": "Change Labor Rate",
 				"changestatus": "Change Status",
 				"changestimator": "Change Estimator",
@@ -1316,7 +1318,7 @@
 					"addpayer": "Add Payer",
 					"createnewcustomer": "Create New Customer",
 					"findmakemodelcode": "Find Make/Model Code",
-					"getmakes": "",
+					"getmakes": "Get Makes",
 					"labels": {
 						"refreshallocations": "Refresh this component to see the DMS allocations."
 					},
@@ -1345,7 +1347,7 @@
 				"removefromproduction": "Remove from Production",
 				"schedule": "Schedule",
 				"sendcsi": "Send CSI",
-				"sendpartspricechange": "",
+				"sendpartspricechange": "Send Parts Price Change",
 				"sendtodms": "Send to DMS",
 				"sync": "Sync",
 				"uninvoice": "Uninvoice",
@@ -1360,7 +1362,7 @@
 				"creating": "Error encountered while creating job. {{error}}",
 				"deleted": "Error deleting job. {{error}}",
 				"exporting": "Error exporting job. {{error}}",
-				"exporting-partner": "Unable to connect to ImEX Partner. Please ensure it is running and logged in.",
+				"exporting-partner": "Unable to connect to Rome Partner. Please ensure it is running and logged in.",
 				"invoicing": "Error invoicing job. {{error}}",
 				"noaccess": "This job does not exist or you do not have access to it.",
 				"nodamage": "No damage points on estimate.",
@@ -1369,7 +1371,7 @@
 				"nojobselected": "No job is selected.",
 				"noowner": "No owner associated.",
 				"novehicle": "No vehicle associated.",
-				"partspricechange": "",
+				"partspricechange": "Error sending parts price change. {{error}}.",
 				"saving": "Error encountered while saving record.",
 				"scanimport": "Error importing job. {{message}}",
 				"totalscalc": "Error while calculating new job totals.",
@@ -1487,10 +1489,10 @@
 				"ins_co_id": "Insurance Co. ID",
 				"ins_co_nm": "Insurance Company Name",
 				"ins_co_nm_short": "Ins.  Co.",
-				"ins_ct_fn": "File Handler First Name",
-				"ins_ct_ln": "File Handler Last Name",
-				"ins_ea": "File Handler Email",
-				"ins_ph1": "File Handler Phone #",
+				"ins_ct_fn": "Adjuster First Name",
+				"ins_ct_ln": "Adjuster Last Name",
+				"ins_ea": "Adjuster Email",
+				"ins_ph1": "Adjuster Phone #",
 				"intake": {
 					"label": "Label",
 					"max": "Maximum",
@@ -1638,7 +1640,7 @@
 				"scheddates": "Schedule Dates"
 			},
 			"labels": {
-				"act_price_ppc": "",
+				"act_price_ppc": "New Part Price",
 				"actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).",
 				"actual_delivery_inferred": "$t(jobs.fields.actual_delivery) inferred using $t(jobs.fields.scheduled_delivery).",
 				"actual_in_inferred": "$t(jobs.fields.actual_in) inferred using $t(jobs.fields.scheduled_in).",
@@ -1668,7 +1670,7 @@
 					"dates": "Dates",
 					"documents": "Recent Documents",
 					"estimator": "Estimator",
-					"filehandler": "File Handler",
+					"filehandler": "Adjuster",
 					"insurance": "Insurance Details",
 					"notes": "Notes",
 					"parts": "Parts",
@@ -1775,8 +1777,8 @@
 					"partstotal": "This is the total of all parts and sublet amounts on the vehicle (some of these may require an in-house invoice).<br/>\nItems such as shop and paint materials, labor online lines, etc. are not included in this total.",
 					"totalreturns": "The total <b>retail</b> amount of returns created for this job."
 				},
-				"ppc": "",
-				"profileadjustments": "",
+				"ppc": "This line contains a part price change.",
+				"profileadjustments": "Profile Disc./Mkup (Already included above)",
 				"prt_dsmk_total": "Line Item Adjustment",
 				"rates": "Rates",
 				"rates_subtotal": "All Rates Subtotal",
@@ -1846,7 +1848,7 @@
 		},
 		"landing": {
 			"bigfeature": {
-				"subtitle": "ImEX Online is built using world class technology by experts in the collision repair industry.  This translates to software that is tailor made for the unique challenges faced by repair facilities with no compromises. ",
+				"subtitle": "Rome Online is built using world class technology by experts in the collision repair industry.  This translates to software that is tailor made for the unique challenges faced by repair facilities with no compromises. ",
 				"title": "Bringing the latest technology to the automotive repair industry. "
 			},
 			"footer": {
@@ -1859,10 +1861,10 @@
 				},
 				"io": {
 					"help": "Help",
-					"name": "ImEX Online",
+					"name": "Rome Online",
 					"status": "System Status"
 				},
-				"slogan": "ImEX Systems Inc. is a technology leader in the collision repair industry. We specialize in creating collision repair management systems and bodyshop management systems that lower cycle times and promote efficiency."
+				"slogan": "Rome Technologies. is a technology leader in the collision repair industry. We specialize in creating collision repair management systems and bodyshop management systems that lower cycle times and promote efficiency."
 			},
 			"hero": {
 				"button": "Learn More",
@@ -1916,7 +1918,7 @@
 				"customers": "Customers",
 				"dashboard": "Dashboard",
 				"enterbills": "Enter Bills",
-				"entercardpayment": "",
+				"entercardpayment": "Enter Card Payments",
 				"enterpayment": "Enter Payments",
 				"entertimeticket": "Enter Time Tickets",
 				"export": "Export",
@@ -1928,7 +1930,7 @@
 				"newjob": "Create New Job",
 				"owners": "Owners",
 				"parts-queue": "Parts Queue",
-				"paymentremindersms": "",
+				"paymentremindersms": "Send Payment Reminder via SMS",
 				"phonebook": "Phonebook",
 				"productionboard": "Production Board - Visual",
 				"productionlist": "Production Board - List",
@@ -1954,7 +1956,7 @@
 				"shop_vendors": "Vendors",
 				"temporarydocs": "Temporary Documents",
 				"timetickets": "Time Tickets",
-				"ttapprovals": "",
+				"ttapprovals": "Time Ticket Approvals",
 				"vehicles": "Vehicles"
 			},
 			"jobsactions": {
@@ -2694,11 +2696,14 @@
 		},
 		"timetickets": {
 			"actions": {
-				"claimtasks": "",
+				"claimtasks": "Claim Tasks",
 				"clockin": "Clock In",
 				"clockout": "Clock Out",
+				"commit": "Commit Tickets ({{count}})",
+				"commitone": "Commit",
 				"enter": "Enter New Time Ticket",
-				"printemployee": "Print Time Tickets"
+				"printemployee": "Print Time Tickets",
+				"uncommit": "Uncommit"
 			},
 			"errors": {
 				"clockingin": "Error while clocking in. {{message}}",
@@ -2715,12 +2720,12 @@
 				"clockhours": "Clock Hours",
 				"clockoff": "Clock Off",
 				"clockon": "Clocked In",
-				"committed": "",
+				"committed": "Committed",
 				"cost_center": "Cost Center",
 				"date": "Ticket Date",
 				"efficiency": "Efficiency",
 				"employee": "Employee",
-				"employee_team": "",
+				"employee_team": "Employee Team",
 				"flat_rate": "Flat Rate?",
 				"memo": "Memo",
 				"productivehrs": "Productive Hours",
@@ -2750,6 +2755,7 @@
 			"successes": {
 				"clockedin": "Clocked in successfully.",
 				"clockedout": "Clocked out successfully.",
+				"committed": "Time Tickets Committed Successfully",
 				"created": "Time ticket entered successfully.",
 				"deleted": "Time ticket deleted successfully."
 			},
@@ -2763,7 +2769,7 @@
 			"accounting-payables": "Payables | $t(titles.app)",
 			"accounting-payments": "Payments | $t(titles.app)",
 			"accounting-receivables": "Receivables | $t(titles.app)",
-			"app": "ImEX Online",
+			"app": "Rome Online",
 			"bc": {
 				"accounting-payables": "Payables",
 				"accounting-payments": "Payments",
@@ -2807,7 +2813,7 @@
 				"shop-vendors": "Vendors",
 				"temporarydocs": "Temporary Documents",
 				"timetickets": "Time Tickets",
-				"ttapprovals": "",
+				"ttapprovals": "Time Ticket Approvals",
 				"vehicle-details": "Vehicle: {{vehicle}}",
 				"vehicles": "Vehicles"
 			},
@@ -2853,13 +2859,17 @@
 			"shop_vendors": "Vendors | $t(titles.app)",
 			"temporarydocs": "Temporary Documents | $t(titles.app)",
 			"timetickets": "Time Tickets | $t(titles.app)",
-			"ttapprovals": "",
+			"ttapprovals": "Time Ticket Approvals | $t(titles.app)",
 			"vehicledetail": "Vehicle Details {{vehicle}} | $t(titles.app)",
 			"vehicles": "All Vehicles | $t(titles.app)"
 		},
 		"tt_approvals": {
 			"actions": {
-				"approveselected": ""
+				"approveselected": "Approve Selected"
+			},
+			"labels": {
+				"approval_queue_in_use": "Time tickets will be added to the approval queue.",
+				"calculate": "Calculate"
 			}
 		},
 		"user": {

client/src/translations/es/common.json

@@ -343,10 +343,12 @@
 				"md_payment_types": "",
 				"md_referral_sources": "",
 				"md_tasks_presets": {
+					"enable_tasks": "",
 					"hourstype": "",
 					"memo": "",
 					"name": "",
-					"percent": ""
+					"percent": "",
+					"use_approvals": ""
 				},
 				"messaginglabel": "",
 				"messagingtext": "",
@@ -2693,8 +2695,11 @@
 				"claimtasks": "",
 				"clockin": "",
 				"clockout": "",
+				"commit": "",
+				"commitone": "",
 				"enter": "",
-				"printemployee": ""
+				"printemployee": "",
+				"uncommit": ""
 			},
 			"errors": {
 				"clockingin": "",
@@ -2746,6 +2751,7 @@
 			"successes": {
 				"clockedin": "",
 				"clockedout": "",
+				"committed": "",
 				"created": "",
 				"deleted": ""
 			},
@@ -2759,7 +2765,7 @@
 			"accounting-payables": "",
 			"accounting-payments": "",
 			"accounting-receivables": "",
-			"app": "ImEX Online",
+			"app": "Rome Online",
 			"bc": {
 				"accounting-payables": "",
 				"accounting-payments": "",
@@ -2856,6 +2862,10 @@
 		"tt_approvals": {
 			"actions": {
 				"approveselected": ""
+			},
+			"labels": {
+				"approval_queue_in_use": "",
+				"calculate": ""
 			}
 		},
 		"user": {

client/src/translations/fr/common.json

@@ -343,10 +343,12 @@
 				"md_payment_types": "",
 				"md_referral_sources": "",
 				"md_tasks_presets": {
+					"enable_tasks": "",
 					"hourstype": "",
 					"memo": "",
 					"name": "",
-					"percent": ""
+					"percent": "",
+					"use_approvals": ""
 				},
 				"messaginglabel": "",
 				"messagingtext": "",
@@ -2693,8 +2695,11 @@
 				"claimtasks": "",
 				"clockin": "",
 				"clockout": "",
+				"commit": "",
+				"commitone": "",
 				"enter": "",
-				"printemployee": ""
+				"printemployee": "",
+				"uncommit": ""
 			},
 			"errors": {
 				"clockingin": "",
@@ -2746,6 +2751,7 @@
 			"successes": {
 				"clockedin": "",
 				"clockedout": "",
+				"committed": "",
 				"created": "",
 				"deleted": ""
 			},
@@ -2759,7 +2765,7 @@
 			"accounting-payables": "",
 			"accounting-payments": "",
 			"accounting-receivables": "",
-			"app": "ImEX Online",
+			"app": "Rome Online",
 			"bc": {
 				"accounting-payables": "",
 				"accounting-payments": "",
@@ -2856,6 +2862,10 @@
 		"tt_approvals": {
 			"actions": {
 				"approveselected": ""
+			},
+			"labels": {
+				"approval_queue_in_use": "",
+				"calculate": ""
 			}
 		},
 		"user": {

client/src/utils/AuditTrailMappings.js

@@ -40,7 +40,7 @@ const AuditTrailMapping = {
     i18n.t("audit_trail.messages.admin_jobmarkforreexport"),
   admin_jobmarkexported: () =>
     i18n.t("audit_trail.messages.admin_jobmarkexported"),
-
+  failedpayment: () => i18n.t("audit_trail.messages.failedpayment"),
 };
 
 export default AuditTrailMapping;

client/src/utils/RegisterSw.js

@@ -12,7 +12,7 @@ const onServiceWorkerUpdate = (registration) => {
     <Space flex>
       <Button
         onClick={async () => {
-          window.open("https://imex-online.noticeable.news/", "_blank");
+          window.open("https://rome-online.noticeable.news/", "_blank");
         }}
       >
         {i18n.t("general.actions.viewreleasenotes")}

client/src/utils/TemplateConstants.js

@@ -1,8 +1,8 @@
 import i18n from "i18next";
 //import { store } from "../redux/store";
 export const EmailSettings = {
-  fromNameDefault: "ImEX Online",
-  fromAddress: "noreply@imex.online",
+  fromNameDefault: "Rome Online",
+  fromAddress: "noreply@romeonline.io",
 };
 
 export const TemplateList = (type, context) => {

firebase/firebase.json

@@ -1,7 +1,7 @@
 {
   "functions": {
     "predeploy": [
-      "npm --prefix \"$RESOURCE_DIR\" run lint"
+     
     ]
   }
 }

firebase/functions/index.js

@@ -28,16 +28,4 @@ exports.processSignUp = functions.auth.user().onCreate((user) => {
   // Set custom user claims on this newly created user.
   return admin.auth().setCustomUserClaims(user.uid, customClaims);
 
-  //exports.test = functions.auth.
-
-  // .then(() => {
-  //   // Update real-time database to notify client to force refresh.
-  //   const metadataRef = admin.database().ref("metadata/" + user.uid);
-  //   // Set the refresh time to the current UTC timestamp.
-  //   // This will be captured on the client to force a token refresh.
-  //   return metadataRef.set({ refreshTime: new Date().getTime() });
-  // })
-  // .catch(error => {
-  //   console.log(error);
-  // });
 });

firebase/functions/package-lock.json

@@ -4,6 +4,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "functions",
       "dependencies": {
         "firebase-admin": "^9.5.0",
         "firebase-functions": "^3.13.2"

job-totals-testing-util.js

@@ -0,0 +1,117 @@
+const path = require("path");
+const Dinero = require("dinero.js");
+const { gql } = require("graphql-request");
+const queries = require("./server/graphql-client/queries");
+const GraphQLClient = require("graphql-request").GraphQLClient;
+const logger = require("./server/utils/logger");
+const AxiosLib = require("axios").default;
+const axios = AxiosLib.create();
+
+// Dinero.defaultCurrency = "USD";
+// Dinero.globalLocale = "en-CA";
+Dinero.globalRoundingMode = "HALF_EVEN";
+const client = require("./server/graphql-client/graphql-client").client;
+require("dotenv").config({
+  path: path.resolve(
+    process.cwd(),
+    `.env.${process.env.NODE_ENV || "development"}`
+  ),
+});
+
+async function RunTheTest() {
+  const bodyshopids = ["6c63a820-542c-497e-8c82-0cc38fb2bbca"];
+  const bearerToken = `Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6Ijk3OWVkMTU1OTdhYjM1Zjc4MjljZTc0NDMwN2I3OTNiN2ViZWIyZjAiLCJ0eXAiOiJKV1QifQ.eyJodHRwczovL2hhc3VyYS5pby9qd3QvY2xhaW1zIjp7IngtaGFzdXJhLWRlZmF1bHQtcm9sZSI6InVzZXIiLCJ4LWhhc3VyYS1hbGxvd2VkLXJvbGVzIjpbInVzZXIiXSwieC1oYXN1cmEtdXNlci1pZCI6InQ2WW0xTkRsQ0RPUFpyM0Y5Ymd1V0g0TGhTWDIifSwiaXNzIjoiaHR0cHM6Ly9zZWN1cmV0b2tlbi5nb29nbGUuY29tL3JvbWUtcHJvZC0xIiwiYXVkIjoicm9tZS1wcm9kLTEiLCJhdXRoX3RpbWUiOjE2NzkzNDc4NzAsInVzZXJfaWQiOiJ0NlltMU5EbENET1BacjNGOWJndVdINExoU1gyIiwic3ViIjoidDZZbTFORGxDRE9QWnIzRjliZ3VXSDRMaFNYMiIsImlhdCI6MTY3OTk1NDk3MiwiZXhwIjoxNjc5OTU4NTcyLCJlbWFpbCI6InBhdHJpY2tAcm9tZS5kZXYiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsicGF0cmlja0Byb21lLmRldiJdfSwic2lnbl9pbl9wcm92aWRlciI6InBhc3N3b3JkIn19.Dnq_xo5tffFf-LK0qD_iieUa_UYe4cJqOxcuJnRGH0aqirMMeQLRR4B_Z3pOsD3T20ML3qZMQNUKx-Ivz1mfyK_aA7_4GKtHRKOpIrAyssw_l5aXuCAEmC8iLQHDGvKi7Vp8LsTMPKqjJSjtaW2zuFqcIGrqncWkBMYSnCKjCFsKjryp35hQiIynAN1W0ajgjmFZHCy7hG1h4wFtLKNXEAGxWA0tE7m7ZZBZk3W7J3nMbYiMuGZfw0y2yYeILQGw3UW6sb9B2Jx2bAR3x-GWhPzQHNZEPolE-andm900cFgdph1z7eBE5P2udc2rp8JsAPdUdovt8ZImhCUeE5wD6g`;
+  const { jobs } = await client.request(
+    gql`
+      query GET_JOBS($bodyshopids: [uuid!]!) {
+        jobs(
+          where: { shopid: { _in: $bodyshopids } }
+          order_by: { created_at: desc }
+        ) {
+          id
+          ro_number
+          job_totals
+          cieca_ttl
+        }
+      }
+    `,
+    {
+      bodyshopids,
+    }
+  );
+
+  const results = [];
+
+  for (const job of jobs) {
+    try {
+      await axios.post(
+        `http://localhost:4000/job/totalsssu`,
+        { id: job.id },
+        { headers: { Authorization: bearerToken } }
+      );
+      const { jobs_by_pk: newjob } = await client.request(
+        gql`
+          query GET_JOBS($id: uuid!) {
+            jobs_by_pk(id: $id) {
+              id
+              ro_number
+              cieca_ttl
+              job_totals
+              ownr_fn
+              ownr_ln
+              ownr_co_nm
+              ins_co_nm
+            }
+          }
+        `,
+        {
+          id: job.id,
+        }
+      );
+
+      const result = {
+        id: newjob.id,
+        owner: `${newjob.ownr_fn} ${newjob.ownr_ln} ${job.ownr_co_nm || ""}`,
+        ins_co: newjob.ins_co_nm,
+      };
+
+      const calcTotal = newjob.job_totals.totals.total_repairs.amount;
+      const ttlTotal = newjob.cieca_ttl.data.g_ttl_amt * 100;
+      result.difference = (calcTotal - ttlTotal) / 100;
+
+      if (Math.abs(calcTotal - ttlTotal) > 5) {
+        //Diff is greater than 5 cents. Fail it.
+        result.result = "***FAIL***";
+      } else {
+        result.result = "PASS";
+      }
+      console.log(`${result.result} => RO ${job.ro_number}`);
+
+      results.push(result);
+    } catch (error) {
+      results.push({
+        ro_number: job.ro_number,
+        id: job.id,
+        result: "**503 FAILURE**",
+      });
+    }
+  }
+
+  console.table(results);
+  const summary = results.reduce(
+    (acc, val) => {
+      if (val.result === "PASS") {
+        return { ...acc, pass: acc.pass + 1 };
+      } else {
+        return { ...acc, fail: acc.fail + 1 };
+      }
+    },
+    { pass: 0, fail: 0 }
+  );
+  console.log(
+    "Pass Rate: ",
+    ((summary.pass / (summary.fail + summary.pass)) * 100).toFixed(1)
+  );
+}
+
+RunTheTest();

server.js

@@ -34,6 +34,8 @@ const io = new Server(server, {
       "http://localhost:3000",
       "https://imex.online",
       "https://www.imex.online",
+      "https://romeonline.io",
+      "https://www.romeonline.io",
     ],
     methods: ["GET", "POST"],
     credentials: true,
@@ -139,6 +141,10 @@ app.post(
 app.post("/job/totalsssu", fb.validateFirebaseIdToken, job.totalsSsu);
 app.post("/job/costing", fb.validateFirebaseIdToken, job.costing);
 app.post("/job/costingmulti", fb.validateFirebaseIdToken, job.costingmulti);
+
+var ppc = require("./server/ccc/partspricechange");
+app.post("/job/ppc", fb.validateFirebaseIdToken, ppc.generatePpc);
+
 var partsScan = require("./server/parts-scan/parts-scan");
 app.post("/job/partsscan", fb.validateFirebaseIdToken, partsScan.partsScan);
 //Scheduling
@@ -230,6 +236,31 @@ app.post(
   mixdataUpload.mixdataUpload
 );
 
+var intellipay = require("./server/intellipay/intellipay");
+app.post(
+  "/intellipay/lightbox_credentials",
+  fb.validateFirebaseIdToken,
+  intellipay.lightbox_credentials
+);
+
+app.post(
+  "/intellipay/payment_refund",
+  fb.validateFirebaseIdToken,
+  intellipay.payment_refund
+);
+
+app.post(
+  "/intellipay/generate_payment_url",
+  fb.validateFirebaseIdToken,
+  intellipay.generate_payment_url
+);
+
+app.post(
+  "/intellipay/postback",
+  // fb.validateFirebaseIdToken,
+  intellipay.postback
+);
+
 var ioevent = require("./server/ioevent/ioevent");
 app.post("/ioevent", ioevent.default);
 // app.post("/newlog", (req, res) => {

server/accounting/pbs/pbs-job-export.js

@@ -656,7 +656,7 @@ async function InsertAccountPostingData(socket) {
             .toISOString(), //"0001-01-01T00:00:00.0000000Z",
           Description: socket.txEnvelope.story,
           //AdditionalInfo: "String",
-          Source: "ImEX Online",
+          Source: "Rome Online",
           Lines: wips,
         },
       },

server/accounting/qb-receivables-lines.js

@@ -78,7 +78,7 @@ exports.default = function ({
         const taxAccountCode = findTaxCode(
           {
             local: false,
-            federal: true,
+            federal: process.env.COUNTRY === "USA" ? false : true,
             state:
               jobs_by_pk.state_tax_rate === 0
                 ? false
@@ -93,7 +93,14 @@ exports.default = function ({
           bodyshop.md_responsibility_centers.sales_tax_codes
         );
 
-        const QboTaxId = taxCodes[taxAccountCode];
+        const QboTaxId =
+          process.env.COUNTRY === "USA"
+            ? CheckQBOUSATaxID({
+                jobline: jobline,
+                type: "part",
+                job: jobs_by_pk,
+              })
+            : taxCodes[taxAccountCode];
         if (!invoiceLineHash[account.name]) invoiceLineHash[account.name] = {};
         if (!invoiceLineHash[account.name][QboTaxId]) {
           invoiceLineHash[account.name][QboTaxId] = {
@@ -124,7 +131,9 @@ exports.default = function ({
             Quantity: 1, //jobline.part_qty,
             Amount: DineroAmount, //.toFormat(DineroQbFormat),
             SalesTaxCodeRef: {
-              FullName: "E",
+              FullName:
+                bodyshop.md_responsibility_centers.taxes.itemexemptcode ||
+                "NON",
             },
           };
         } else {
@@ -156,13 +165,16 @@ exports.default = function ({
         const taxAccountCode = findTaxCode(
           {
             local: false,
-            federal: true,
+            federal: process.env.COUNTRY === "USA" ? false : true,
             state: jobs_by_pk.state_tax_rate === 0 ? false : true,
           },
           bodyshop.md_responsibility_centers.sales_tax_codes
         );
 
-        const QboTaxId = taxCodes[taxAccountCode];
+        const QboTaxId =
+          process.env.COUNTRY === "USA"
+            ? CheckQBOUSATaxID({ jobline: jobline, type: "labor" })
+            : taxCodes[taxAccountCode];
         if (!invoiceLineHash[account.name]) invoiceLineHash[account.name] = {};
         if (!invoiceLineHash[account.name][QboTaxId]) {
           invoiceLineHash[account.name][QboTaxId] = {
@@ -194,7 +206,9 @@ exports.default = function ({
             Amount: DineroAmount,
             //Amount: DineroAmount.toFormat(DineroQbFormat),
             SalesTaxCodeRef: {
-              FullName: "E",
+              FullName:
+                bodyshop.md_responsibility_centers.taxes.itemexemptcode ||
+                "NON",
             },
           };
         } else {
@@ -221,13 +235,20 @@ exports.default = function ({
         const taxAccountCode = findTaxCode(
           {
             local: false,
-            federal: true,
+            federal: process.env.COUNTRY === "USA" ? false : true,
             state: jobs_by_pk.state_tax_rate === 0 ? false : true,
           },
           bodyshop.md_responsibility_centers.sales_tax_codes
         );
 
-        const QboTaxId = taxCodes[taxAccountCode];
+        const QboTaxId =
+          process.env.COUNTRY === "USA"
+            ? CheckQBOUSATaxID({
+                // jobline: jobline,
+                job: jobs_by_pk,
+                type: "materials",
+              })
+            : taxCodes[taxAccountCode];
         if (!invoiceLineHash[mapaAccount.name])
           invoiceLineHash[mapaAccount.name] = {};
         if (!invoiceLineHash[mapaAccount.name][QboTaxId]) {
@@ -263,7 +284,8 @@ exports.default = function ({
             DineroQbFormat
           ),
           SalesTaxCodeRef: {
-            FullName: "E",
+            FullName:
+              bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON",
           },
         });
       }
@@ -287,13 +309,20 @@ exports.default = function ({
         const taxAccountCode = findTaxCode(
           {
             local: false,
-            federal: true,
+            federal: process.env.COUNTRY === "USA" ? false : true,
             state: jobs_by_pk.state_tax_rate === 0 ? false : true,
           },
           bodyshop.md_responsibility_centers.sales_tax_codes
         );
 
-        const QboTaxId = taxCodes[taxAccountCode];
+        const QboTaxId =
+          process.env.COUNTRY === "USA"
+            ? CheckQBOUSATaxID({
+                //   jobline: jobline,
+                job: jobs_by_pk,
+                type: "materials",
+              })
+            : taxCodes[taxAccountCode];
         if (!invoiceLineHash[mashAccount.name])
           invoiceLineHash[mashAccount.name] = {};
         if (!invoiceLineHash[mashAccount.name][QboTaxId]) {
@@ -329,7 +358,8 @@ exports.default = function ({
             DineroQbFormat
           ),
           SalesTaxCodeRef: {
-            FullName: "E",
+            FullName:
+              bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON",
           },
         });
       }
@@ -369,7 +399,7 @@ exports.default = function ({
       const taxAccountCode = findTaxCode(
         {
           local: false,
-          federal: true,
+          federal: process.env.COUNTRY === "USA" ? false : true,
           state: jobs_by_pk.state_tax_rate === 0 ? false : true,
         },
         bodyshop.md_responsibility_centers.sales_tax_codes
@@ -377,7 +407,14 @@ exports.default = function ({
       const account = responsibilityCenters.profits.find(
         (c) => c.name === responsibilityCenters.defaults.profits["TOW"]
       );
-      const QboTaxId = taxCodes[taxAccountCode];
+      const QboTaxId =
+        process.env.COUNTRY === "USA"
+          ? CheckQBOUSATaxID({
+              //  jobline: jobline,
+              job: jobs_by_pk,
+              type: "towing",
+            })
+          : taxCodes[taxAccountCode];
       InvoiceLineAdd.push({
         DetailType: "SalesItemLineDetail",
         Amount: Dinero({
@@ -409,7 +446,8 @@ exports.default = function ({
           amount: Math.round((jobs_by_pk.towing_payable || 0) * 100),
         }).toFormat(DineroQbFormat),
         SalesTaxCodeRef: {
-          FullName: "E",
+          FullName:
+            bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON",
         },
       });
     }
@@ -420,7 +458,7 @@ exports.default = function ({
       const taxAccountCode = findTaxCode(
         {
           local: false,
-          federal: true,
+          federal: process.env.COUNTRY === "USA" ? false : true,
           state: jobs_by_pk.state_tax_rate === 0 ? false : true,
         },
         bodyshop.md_responsibility_centers.sales_tax_codes
@@ -428,7 +466,14 @@ exports.default = function ({
       const account = responsibilityCenters.profits.find(
         (c) => c.name === responsibilityCenters.defaults.profits["TOW"]
       );
-      const QboTaxId = taxCodes[taxAccountCode];
+      const QboTaxId =
+        process.env.COUNTRY === "USA"
+          ? CheckQBOUSATaxID({
+              //    jobline: jobline,
+              job: jobs_by_pk,
+              type: "storage",
+            })
+          : taxCodes[taxAccountCode];
       InvoiceLineAdd.push({
         DetailType: "SalesItemLineDetail",
         Amount: Dinero({
@@ -460,7 +505,8 @@ exports.default = function ({
           amount: Math.round((jobs_by_pk.storage_payable || 0) * 100),
         }).toFormat(DineroQbFormat),
         SalesTaxCodeRef: {
-          FullName: "E",
+          FullName:
+            bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON",
         },
       });
     }
@@ -474,13 +520,20 @@ exports.default = function ({
       const taxAccountCode = findTaxCode(
         {
           local: false,
-          federal: true,
+          federal: process.env.COUNTRY === "USA" ? false : true,
           state: jobs_by_pk.state_tax_rate === 0 ? false : true,
         },
         bodyshop.md_responsibility_centers.sales_tax_codes
       );
 
-      const QboTaxId = taxCodes[taxAccountCode];
+      const QboTaxId =
+        process.env.COUNTRY === "USA"
+          ? CheckQBOUSATaxID({
+              // jobline: jobline,
+              type: "adjustment",
+              job: jobs_by_pk,
+            })
+          : taxCodes[taxAccountCode];
       InvoiceLineAdd.push({
         DetailType: "SalesItemLineDetail",
         Amount: Dinero({
@@ -510,7 +563,8 @@ exports.default = function ({
           amount: Math.round((jobs_by_pk.adjustment_bottom_line || 0) * 100),
         }).toFormat(DineroQbFormat),
         SalesTaxCodeRef: {
-          FullName: "E",
+          FullName:
+            bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON",
         },
       });
     }
@@ -589,7 +643,7 @@ exports.default = function ({
                 findTaxCode(
                   {
                     local: false,
-                    federal: true,
+                    federal: process.env.COUNTRY === "USA" ? false : true,
                     state: false,
                   },
                   bodyshop.md_responsibility_centers.sales_tax_codes
@@ -613,29 +667,29 @@ exports.default = function ({
 
   //QB USA with GST
   //This was required for the No. 1 Collision Group.
-  if (
-    bodyshop.accountingconfig &&
-    bodyshop.accountingconfig.qbo &&
-    bodyshop.accountingconfig.qbo_usa &&
-    bodyshop.region_config.includes("CA_")
-  ) {
-    InvoiceLineAdd.push({
-      DetailType: "SalesItemLineDetail",
-      Amount: Dinero(jobs_by_pk.job_totals.totals.federal_tax).toFormat(
-        DineroQbFormat
-      ),
-      SalesItemLineDetail: {
-        ...(jobs_by_pk.class
-          ? { ClassRef: { value: classes[jobs_by_pk.class] } }
-          : {}),
-        ItemRef: {
-          value:
-            items[bodyshop.md_responsibility_centers.taxes.federal.accountitem],
-        },
-        Qty: 1,
-      },
-    });
-  }
+  // if (
+  //   bodyshop.accountingconfig &&
+  //   bodyshop.accountingconfig.qbo &&
+  //   bodyshop.accountingconfig.qbo_usa &&
+  //   bodyshop.region_config.includes("CA_")
+  // ) {
+  //   InvoiceLineAdd.push({
+  //     DetailType: "SalesItemLineDetail",
+  //     Amount: Dinero(jobs_by_pk.job_totals.totals.federal_tax).toFormat(
+  //       DineroQbFormat
+  //     ),
+  //     SalesItemLineDetail: {
+  //       ...(jobs_by_pk.class
+  //         ? { ClassRef: { value: classes[jobs_by_pk.class] } }
+  //         : {}),
+  //       ItemRef: {
+  //         value:
+  //           items[bodyshop.md_responsibility_centers.taxes.federal.accountitem],
+  //       },
+  //       Qty: 1,
+  //     },
+  //   });
+  // }
 
   if (!qbo && InvoiceLineAdd.length === 0) {
     //Handle the scenario where there is a $0 sale invoice.
@@ -768,10 +822,27 @@ exports.createMultiQbPayerLines = function ({
         amount: Math.round((payer.amount || 0) * 100),
       }).toFormat(DineroQbFormat),
       SalesTaxCodeRef: {
-        FullName: "E",
+        FullName:
+          bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON",
       },
     });
   }
 
   return InvoiceLineAdd;
 };
+
+function CheckQBOUSATaxID({ jobline, job, type }) {
+  if (type === "labor") {
+    return jobline.lbr_tax ? "TAX" : "NON";
+  } else if (type === "part") {
+    return jobline.tax_part ? "TAX" : "NON";
+  } else if (type === "materials") {
+    return job.tax_paint_mat_rt > 0 ? "TAX" : "NON";
+  } else if (type === " towing") {
+    return true ? "TAX" : "NON";
+  } else if (type === "adjustment") {
+    return false ? "TAX" : "NON";
+  } else {
+    throw new Error(`Unknown type to calculate tax id: ${type} `);
+  }
+}

server/accounting/qbo/qbo-receivables.js

@@ -18,7 +18,6 @@ const {
 const OAuthClient = require("intuit-oauth");
 const CreateInvoiceLines = require("../qb-receivables-lines").default;
 const moment = require("moment-timezone");
-
 const GraphQLClient = require("graphql-request").GraphQLClient;
 const { generateOwnerTier } = require("../qbxml/qbxml-utils");
 const { createMultiQbPayerLines } = require("../qb-receivables-lines");
@@ -635,8 +634,7 @@ async function InsertInvoice(
     ],
     ...(bodyshop.accountingconfig &&
       bodyshop.accountingconfig.qbo &&
-      bodyshop.accountingconfig.qbo_usa &&
-      bodyshop.region_config.includes("CA_") && {
+      bodyshop.accountingconfig.qbo_usa && {
         TxnTaxDetail: {
           TxnTaxCodeRef: {
             value: