IO-2793 Change Additional Costs tax item

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

client/public/firebase-messaging-sw.js

@@ -0,0 +1,56 @@
+// Scripts for firebase and firebase messaging
+importScripts("https://www.gstatic.com/firebasejs/8.2.0/firebase-app.js");
+importScripts("https://www.gstatic.com/firebasejs/8.2.0/firebase-messaging.js");
+
+// Initialize the Firebase app in the service worker by passing the generated config
+let firebaseConfig;
+switch (this.location.hostname) {
+  case "localhost":
+    firebaseConfig = {
+      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",
+    };
+    break;
+  case "test.imex.online":
+    firebaseConfig = {
+      apiKey: "AIzaSyBw7_GTy7GtQyfkIRPVrWHEGKfcqeyXw0c",
+      authDomain: "imex-test.firebaseapp.com",
+      projectId: "imex-test",
+      storageBucket: "imex-test.appspot.com",
+      messagingSenderId: "991923618608",
+      appId: "1:991923618608:web:633437569cdad78299bef5",
+      // measurementId: "${config.measurementId}",
+    };
+    break;
+  case "imex.online":
+  default:
+    firebaseConfig = {
+      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",
+    };
+}
+
+firebase.initializeApp(firebaseConfig);
+
+// Retrieve firebase messaging
+const messaging = firebase.messaging();
+
+messaging.onBackgroundMessage(function (payload) {
+  // Customize notification here
+  const channel = new BroadcastChannel("imex-sw-messages");
+  channel.postMessage(payload);
+
+  //self.registration.showNotification(notificationTitle, notificationOptions);
+});

client/src/App/App.jsx

@@ -150,7 +150,7 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
       <ProductFruits
         workspaceCode={InstanceRenderMgr({
           imex: null,
-          rome: null,
+          rome: "9BkbEseqNqxw8jUH",
           promanager: "aoJoEifvezYI0Z0P"
         })}
         debug

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

@@ -3,14 +3,13 @@ import axios from "axios";
 import _ from "lodash";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Link, useNavigate } from "react-router-dom";
+import { Link } from "react-router-dom";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 
 export default function GlobalSearchOs() {
   const { t } = useTranslation();
-  const history = useNavigate();
   const [loading, setLoading] = useState(false);
   const [data, setData] = useState(false);
 
@@ -178,15 +177,7 @@ export default function GlobalSearchOs() {
   };
 
   return (
-    <AutoComplete
-      options={data}
-      onSearch={handleSearch}
-      defaultActiveFirstOption
-      onSelect={(val, opt) => {
-        history(opt.label.props.to);
-      }}
-      onClear={() => setData([])}
-    >
+    <AutoComplete options={data} onSearch={handleSearch} defaultActiveFirstOption onClear={() => setData([])}>
       <Input.Search
         size="large"
         placeholder={t("general.labels.globalsearch")}

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

@@ -3,7 +3,7 @@ import { AutoComplete, Divider, Input, Space } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { Link, useNavigate } from "react-router-dom";
+import { Link } from "react-router-dom";
 import { GLOBAL_SEARCH_QUERY } from "../../graphql/search.queries";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import AlertComponent from "../alert/alert.component";
@@ -12,7 +12,6 @@ import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.compon
 
 export default function GlobalSearch() {
   const { t } = useTranslation();
-  const history = useNavigate();
   const [callSearch, { loading, error, data }] = useLazyQuery(GLOBAL_SEARCH_QUERY);
 
   const executeSearch = (v) => {
@@ -157,14 +156,7 @@ export default function GlobalSearch() {
   if (error) return <AlertComponent message={error.message} type="error" />;
 
   return (
-    <AutoComplete
-      options={options}
-      onSearch={handleSearch}
-      defaultActiveFirstOption
-      onSelect={(val, opt) => {
-        history(opt.label.props.to);
-      }}
-    >
+    <AutoComplete options={options} onSearch={handleSearch} defaultActiveFirstOption>
       <Input.Search
         size="large"
         placeholder={t("general.labels.globalsearch")}

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

@@ -32,6 +32,7 @@ import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { BsKanban } from "react-icons/bs";
 import { FaCalendarAlt, FaCarCrash, FaCreditCard, FaFileInvoiceDollar, FaTasks } from "react-icons/fa";
+import { FiLogOut } from "react-icons/fi";
 import { GiPayMoney, GiPlayerTime, GiSettingsKnobs } from "react-icons/gi";
 import { IoBusinessOutline } from "react-icons/io5";
 import { RiSurveyLine } from "react-icons/ri";
@@ -42,7 +43,6 @@ import { selectRecentItems, selectSelectedHeader } from "../../redux/application
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { signOutStart } from "../../redux/user/user.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import { FiLogOut } from "react-icons/fi";
 import { checkBeta, handleBeta, setBeta } from "../../utils/betaHandler";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
@@ -604,14 +604,22 @@ function Header({
             );
           }
         },
-        // {
-        //     key: 'rescue',
-        //     icon: <Icon component={CarFilled}/>,
-        //     label: t("menus.header.rescueme"),
-        //     onClick: () => {
-        //         window.open("https://imexrescue.com/", "_blank");
-        //     }
-        // },
+        ...(InstanceRenderManager({
+          imex: true,
+          rome: false,
+          promanager: false
+        })
+          ? [
+              {
+                key: "rescue",
+                icon: <Icon component={CarFilled} />,
+                label: t("menus.header.rescueme"),
+                onClick: () => {
+                  window.open("https://imexrescue.com/", "_blank");
+                }
+              }
+            ]
+          : []),
 
         ...(InstanceRenderManager({
           imex: true,

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

@@ -18,8 +18,6 @@ import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import { setJoyRideSteps } from "../../redux/application/application.actions";
 import { OwnerNameDisplayFunction } from "./../owner-name-display/owner-name-display.component";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
-
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });

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

@@ -30,227 +30,219 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
   return (
     <RbacWrapper action="shop:rbac">
       <LayoutFormRow>
-        {HasFeatureAccess({ featureName: "export", bodyshop }) && (
-          <>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.accounting.exportlog")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "accounting:exportlog"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.accounting.payables")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "accounting:payables"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.accounting.payments")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "accounting:payments"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.accounting.receivables")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "accounting:receivables"]}
-            >
-              <InputNumber />
-            </Form.Item>
-          </>
-        )}
-        {HasFeatureAccess({ featureName: "bills", bodyshop }) && (
-          <>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.bills.delete")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "bills:delete"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.bills.enter")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "bills:enter"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.bills.list")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "bills:list"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.bills.reexport")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "bills:reexport"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.bills.view")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "bills:view"]}
-            >
-              <InputNumber />
-            </Form.Item>
-          </>
-        )}
+        {...HasFeatureAccess({ featureName: "export", bodyshop }) ? [
+          <Form.Item
+            label={t("bodyshop.fields.rbac.accounting.exportlog")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "accounting:exportlog"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.accounting.payables")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "accounting:payables"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.accounting.payments")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "accounting:payments"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.accounting.receivables")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "accounting:receivables"]}
+          >
+            <InputNumber />
+          </Form.Item>
+        ]:[]}
+        {...HasFeatureAccess({ featureName: "bills", bodyshop }) ? [
+          <Form.Item
+            label={t("bodyshop.fields.rbac.bills.delete")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "bills:delete"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.bills.enter")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "bills:enter"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.bills.list")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "bills:list"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.bills.reexport")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "bills:reexport"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.bills.view")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "bills:view"]}
+          >
+            <InputNumber />
+          </Form.Item>
+        ]:[]}
 
-        {HasFeatureAccess({ featureName: "courtesycars", bodyshop }) && (
-          <>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.contracts.create")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "contracts:create"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.contracts.detail")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "contracts:detail"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.contracts.list")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "contracts:list"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.courtesycar.create")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "courtesycar:create"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.courtesycar.detail")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "courtesycar:detail"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.courtesycar.list")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "courtesycar:list"]}
-            >
-              <InputNumber />
-            </Form.Item>
-          </>
-        )}
-        {HasFeatureAccess({ featureName: "csi", bodyshop }) && (
-          <>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.csi.export")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "csi:export"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.csi.page")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "csi:page"]}
-            >
-              <InputNumber />
-            </Form.Item>
-          </>
-        )}
+        {...HasFeatureAccess({ featureName: "courtesycars", bodyshop }) ? [
+          <Form.Item
+            label={t("bodyshop.fields.rbac.contracts.create")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "contracts:create"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.contracts.detail")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "contracts:detail"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.contracts.list")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "contracts:list"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.courtesycar.create")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "courtesycar:create"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.courtesycar.detail")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "courtesycar:detail"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.courtesycar.list")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "courtesycar:list"]}
+          >
+            <InputNumber />
+          </Form.Item>
+        ]:[]}
+        {...HasFeatureAccess({ featureName: "csi", bodyshop }) ? [
+          <Form.Item
+            label={t("bodyshop.fields.rbac.csi.export")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "csi:export"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.csi.page")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "csi:page"]}
+          >
+            <InputNumber />
+          </Form.Item>
+        ]:[]}
         <Form.Item
           label={t("bodyshop.fields.rbac.employees.page")}
           rules={[
@@ -569,130 +561,128 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
             <InputNumber />
           </Form.Item>
         )}
-        {HasFeatureAccess({ featureName: "timetickets", bodyshop }) && (
-          <>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.shiftclock.view")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "shiftclock:view"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.shop.config")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "shop:config"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.timetickets.edit")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "timetickets:edit"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "timetickets:shiftedit"]}
-            >
-              <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.timetickets.enter")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "timetickets:enter"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.timetickets.list")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "timetickets:list"]}
-            >
-              <InputNumber />
-            </Form.Item>
-            <Form.Item
-              label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-              name={["md_rbac", "timetickets:shiftedit"]}
-            >
-              <InputNumber />
-            </Form.Item>
-          </>
-        )}
+        {...HasFeatureAccess({ featureName: "timetickets", bodyshop }) ? [
+          <Form.Item
+            label={t("bodyshop.fields.rbac.shiftclock.view")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "shiftclock:view"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.shop.config")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "shop:config"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.timetickets.edit")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "timetickets:edit"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "timetickets:shiftedit"]}
+          >
+            <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.timetickets.enter")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "timetickets:enter"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.timetickets.list")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "timetickets:list"]}
+          >
+            <InputNumber />
+          </Form.Item>,
+          <Form.Item
+            label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+            name={["md_rbac", "timetickets:shiftedit"]}
+          >
+            <InputNumber />
+          </Form.Item>
+        ]:[]}
         <Form.Item
           label={t("bodyshop.fields.rbac.shop.vendors")}
           rules={[

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

@@ -312,7 +312,14 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
 
     const user = yield select((state) => state.user.currentUser);
     if (payload.features.singleDeviceOnly) {
-      if (!(user.email.includes("@imex.") || user.email.includes("@rome.") || user.email.includes("@promanager.")))
+      if (
+        !(
+          user.email.includes("@imex.") ||
+          user.email.includes("@rome.") ||
+          user.email.includes("@rometech.") ||
+          user.email.includes("@promanager.")
+        )
+      )
         yield put(setInstanceId(user.uid));
     }
 
@@ -324,11 +331,17 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
         rome: () => {
           if (
             payload.imexshopid.toLowerCase().startsWith("pm_") &&
-            !(user.email.includes("@imex.") || user.email.includes("@rome.") || user.email.includes("@promanager."))
+            !(
+              user.email.includes("@imex.") ||
+              user.email.includes("@rome.") ||
+              user.email.includes("@rometech.") ||
+              user.email.includes("@promanager.")
+            )
           ) {
             throw new Error("You are not authorized to use this application.");
           }
-        }
+        },
+        promanager: () => {}
       });
     } catch (error) {
       yield put(setInstanceConflict());

client/src/utils/fcm-handler.js

@@ -1,4 +1,5 @@
 export default async function FcmHandler({ client, payload }) {
+  console.log("FCM", payload);
   switch (payload.type) {
     case "messaging-inbound":
       client.cache.modify({

server/accounting/qb-receivables-lines.js

@@ -71,16 +71,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
           {
             local: false,
             federal: InstanceManager({ imex: true, rome: false }),
-            state:
-              jobs_by_pk.state_tax_rate === 0
-                ? false
-                : jobline.db_ref === "900511" ||
-                    jobline.db_ref === "900510" ||
-                    (jobline.mod_lb_hrs === 0 && //Extending IO-1375 as a part of IO-2023
-                      jobline.act_price > 0 &&
-                      jobline.lbr_op === "OP14")
-                  ? true
-                  : jobline.tax_part
+            state: checkStateTax(jobline, jobs_by_pk)
           },
           bodyshop.md_responsibility_centers.sales_tax_codes
         );
@@ -156,7 +147,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
           {
             local: false,
             federal: InstanceManager({ imex: true, rome: false }),
-            state: jobs_by_pk.state_tax_rate === 0 ? false : true
+            state: jobs_by_pk.tax_lbr_rt === 0 ? false : true
           },
           bodyshop.md_responsibility_centers.sales_tax_codes
         );
@@ -224,7 +215,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
           {
             local: false,
             federal: InstanceManager({ imex: true, rome: false }),
-            state: jobs_by_pk.state_tax_rate === 0 ? false : true
+            state: jobs_by_pk.tax_paint_mat_rt === 0 ? false : true
           },
           bodyshop.md_responsibility_centers.sales_tax_codes
         );
@@ -293,7 +284,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
           {
             local: false,
             federal: InstanceManager({ imex: true, rome: false }),
-            state: jobs_by_pk.state_tax_rate === 0 ? false : true
+            state: jobs_by_pk.tax_shop_mat_rt === 0 ? false : true
           },
           bodyshop.md_responsibility_centers.sales_tax_codes
         );
@@ -379,7 +370,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
         {
           local: false,
           federal: InstanceManager({ imex: true, rome: false }),
-          state: jobs_by_pk.state_tax_rate === 0 ? false : true
+          state: jobs_by_pk.tax_tow_rt === 0 ? false : true
         },
         bodyshop.md_responsibility_centers.sales_tax_codes
       );
@@ -439,7 +430,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
         {
           local: false,
           federal: InstanceManager({ imex: true, rome: false }),
-          state: jobs_by_pk.state_tax_rate === 0 ? false : true
+          state: jobs_by_pk.tax_str_rt === 0 ? false : true
         },
         bodyshop.md_responsibility_centers.sales_tax_codes
       );
@@ -499,7 +490,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
         {
           local: false,
           federal: InstanceManager({ imex: true, rome: false }),
-          state: jobs_by_pk.state_tax_rate === 0 ? false : true
+          state: jobs_by_pk.tax_lbr_rt === 0 ? false : true
         },
         bodyshop.md_responsibility_centers.sales_tax_codes
       );
@@ -879,6 +870,63 @@ exports.createMultiQbPayerLines = function ({ bodyshop, jobs_by_pk, qbo = false,
   return InvoiceLineAdd;
 };
 
+function checkStateTax(jobline, jobs_by_pk) {
+  const isPaintOrShopMat = jobline.db_ref === "936008" || jobline.db_ref === "936007";
+
+  if (isPaintOrShopMat) {
+    if (jobline.db_ref === "936008") {
+      if (jobs_by_pk.tax_paint_mat_rt === 0) {
+        return false;
+      } else {
+        return true;
+      }
+    }
+    if (jobline.db_ref === "936007") {
+      if (jobs_by_pk.tax_shop_mat_rt === 0) {
+        return false;
+      } else {
+        return true;
+      }
+    }
+  }
+
+  const isAdditionalCost =
+    (jobline.lbr_op === "OP13" ||
+      (jobline.lbr_op === "OP14" && jobline.act_price > 0 && jobline.mod_lb_hrs === 0) ||
+      (jobline.db_ref && jobline.db_ref.startsWith("9360")) ||
+      (jobline.db_ref && jobline.db_ref.startsWith("90051"))) &&
+    !isPaintOrShopMat;
+
+    if (!jobline.part_type && isAdditionalCost) {
+      if (jobs_by_pk.tax_lbr_rt === 0) {
+        return false;
+      } else {
+        return true;
+      }
+    }
+
+  if (jobline.tax_part === false) {
+    return false;
+  } else {
+    if (jobline.part_type) {
+      if (
+        jobs_by_pk.parts_tax_rates[`${jobline.part_type.toUpperCase()}`].prt_tax_in === false ||
+        jobs_by_pk.parts_tax_rates[`${jobline.part_type.toUpperCase()}`].prt_tax_rt === 0
+      ) {
+        return false;
+      } else {
+        return true;
+      }
+    } else {
+      if (jobs_by_pk.tax_lbr_rt === 0) {
+        return false;
+      } else {
+        return true;
+      }
+    }
+  }
+}
+
 function CheckQBOUSATaxID({ jobline, job, type }) {
   //Replacing this to be all non-taxable items with the refactor of parts tax rates.
   return "NON";

server/graphql-client/queries.js

@@ -206,8 +206,13 @@ query QUERY_JOBS_FOR_RECEIVABLES_EXPORT($ids: [uuid!]!) {
     adjustment_bottom_line
     state_tax_rate
     qb_multiple_payers
+    parts_tax_rates
     tax_paint_mat_rt
     tax_lbr_rt
+    tax_shop_mat_rt
+    tax_sub_rt
+    tax_tow_rt
+    tax_str_rt
     owner {
       accountingid
     }

server/intellipay/intellipay.js

@@ -6,6 +6,7 @@ const qs = require("query-string");
 const axios = require("axios");
 const moment = require("moment");
 const logger = require("../utils/logger");
+const InstanceManager = require("../utils/instanceMgr").default;
 
 require("dotenv").config({
   path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
@@ -16,7 +17,10 @@ const domain = process.env.NODE_ENV ? "secure" : "test";
 const { SecretsManagerClient, GetSecretValueCommand } = require("@aws-sdk/client-secrets-manager");
 
 const client = new SecretsManagerClient({
-  region: "ca-central-1" //TODO-AIO: instance manager required when merged to master-AIO
+  region: InstanceManager({
+    imex: "ca-central-1",
+    rome: "us-east-2"
+  })
 });
 
 const gqlClient = require("../graphql-client/graphql-client").client;
@@ -145,19 +149,19 @@ exports.generate_payment_url = async (req, res) => {
 };
 
 exports.postback = async (req, res) => {
-  logger.log("intellipay-postback", "DEBUG", req.user?.email, null, req.body);
-  const { body: values } = req;
-
-  const comment = Buffer.from(values?.comment, "base64").toString();
-
-  if ((!values.invoice || values.invoice === "") && !comment) {
-    //invoice is specified through the pay link. Comment by IO.
-    logger.log("intellipay-postback-ignored", "DEBUG", req.user?.email, null, req.body);
-    res.sendStatus(200);
-    return;
-  }
-
   try {
+    logger.log("intellipay-postback", "DEBUG", req.user?.email, null, req.body);
+    const { body: values } = req;
+
+    const comment = Buffer.from(values?.comment, "base64").toString();
+
+    if ((!values.invoice || values.invoice === "") && !comment) {
+      //invoice is specified through the pay link. Comment by IO.
+      logger.log("intellipay-postback-ignored", "DEBUG", req.user?.email, null, req.body);
+      res.sendStatus(200);
+      return;
+    }
+
     if (values.invoice) {
       //This is a link email that's been sent out.
       const job = await gqlClient.request(queries.GET_JOB_BY_PK, {

server/job/job-totals-USA.js

@@ -718,6 +718,7 @@ function CalculateTaxesTotals(job, otherTotals) {
 
   const taxableAmounts = {
     PAA: Dinero(),
+    PAE: Dinero(),
     PAN: Dinero(),
     PAL: Dinero(),
     PAR: Dinero(),