IO-2950 Resolve reversed split.

Signed-off-by: Dave Richer <dave@imexsystems.ca>

.circleci/config.yml

@@ -5,6 +5,7 @@ orbs:
   aws-s3: circleci/aws-s3@4.0.0
   aws-cli: circleci/aws-cli@4.0
   eb: circleci/aws-elastic-beanstalk@2.0.1
+  jira: circleci/jira@2.1.0
 jobs:
   imex-api-deploy:
     docker:
@@ -18,6 +19,12 @@ jobs:
             eb status --verbose
             eb deploy
             eb status
+      - jira/notify:
+          environment: Production (ImEX) - API
+          environment_type: production
+          job_type: deployment
+          pipeline_id: << pipeline.id >>
+          pipeline_number: << pipeline.number >>
 
   imex-hasura-migrate:
     docker:
@@ -33,11 +40,16 @@ jobs:
       - run:
           name: Execute migration
           command: |
-            npm install hasura-cli -g
+            curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash
             hasura migrate apply --endpoint https://db.imex.online/ --admin-secret << parameters.secret >>
             hasura metadata apply --endpoint https://db.imex.online/ --admin-secret << parameters.secret >>
             hasura metadata reload --endpoint https://db.imex.online/ --admin-secret << parameters.secret >>
-
+      - jira/notify:
+          environment: Production (ImEX) - Hasura
+          environment_type: production
+          pipeline_id: << pipeline.id >>
+          job_type: deployment
+          pipeline_number: << pipeline.number >>
   imex-app-build:
     docker:
       - image: cimg/node:18.18.2
@@ -62,6 +74,7 @@ jobs:
           to: "s3://imex-online-production/"
           arguments: "--exclude '*.map'"
 
+
   imex-app-beta-build:
     docker:
       - image: cimg/node:18.18.2
@@ -86,6 +99,12 @@ jobs:
           from: dist
           to: "s3://imex-online-beta/"
           arguments: "--exclude '*.map'"
+      - jira/notify:
+          environment: Production (ImEX) - Front End
+          environment_type: production
+          pipeline_id: << pipeline.id >>
+          job_type: deployment
+          pipeline_number: << pipeline.number >>
 
   rome-api-deploy:
     docker:
@@ -99,7 +118,12 @@ jobs:
             eb status --verbose
             eb deploy
             eb status
-
+      - jira/notify:
+          environment: Production (Rome) - API
+          environment_type: production
+          pipeline_id: << pipeline.id >>
+          job_type: deployment
+          pipeline_number: << pipeline.number >>
   rome-hasura-migrate:
     docker:
       - image: cimg/node:18.18.2
@@ -114,11 +138,16 @@ jobs:
       - run:
           name: Execute migration
           command: |
-            npm install hasura-cli -g
+            curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash
             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 >>
-
+      - jira/notify:
+          environment: Production (Rome) - Hasura
+          environment_type: production
+          pipeline_id: << pipeline.id >>
+          job_type: deployment
+          pipeline_number: << pipeline.number >>
   rome-app-build:
     docker:
       - image: cimg/node:18.18.2
@@ -143,6 +172,12 @@ jobs:
           from: dist
           to: "s3://rome-online-production/"
           arguments: "--exclude '*.map'"
+      - jira/notify:
+          environment: Production (Rome) - Front End
+          environment_type: production
+          pipeline_id: << pipeline.id >>
+          job_type: deployment
+          pipeline_number: << pipeline.number >>
 
   promanager-app-build:
     docker:
@@ -168,6 +203,12 @@ jobs:
           from: dist
           to: "s3://promanager-production/"
           arguments: "--exclude '*.map'"
+      - jira/notify:
+          environment: Production (ProManager) - Front End
+          environment_type: production
+          pipeline_id: << pipeline.id >>
+          job_type: deployment
+          pipeline_number: << pipeline.number >>
 
   test-rome-hasura-migrate:
     docker:
@@ -183,10 +224,18 @@ jobs:
       - run:
           name: Execute migration
           command: |
-            npm install hasura-cli -g
+            curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash
             hasura migrate apply --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
+            sleep 5
             hasura metadata apply --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
+            sleep 10
             hasura metadata reload --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
+      - jira/notify:
+          environment: Test (Rome) - Hasura
+          environment_type: testing
+          pipeline_id: << pipeline.id >>
+          job_type: deployment
+          pipeline_number: << pipeline.number >>
 
   test-rome-app-build:
     docker:
@@ -212,6 +261,12 @@ jobs:
           from: dist
           to: "s3://rome-online-test/"
           arguments: "--exclude '*.map'"
+      - jira/notify:
+          environment: Test (Rome) - Front End
+          environment_type: testing
+          pipeline_id: << pipeline.id >>
+          job_type: deployment
+          pipeline_number: << pipeline.number >>
 
   test-promanager-app-build:
     docker:
@@ -237,6 +292,12 @@ jobs:
           from: dist
           to: "s3://promanager-testing/"
           arguments: "--exclude '*.map'"
+      - jira/notify:
+          environment: Test (ProManager) - Front End
+          environment_type: testing
+          pipeline_id: << pipeline.id >>
+          job_type: deployment
+          pipeline_number: << pipeline.number >>
 
   test-hasura-migrate:
     docker:
@@ -252,10 +313,18 @@ jobs:
       - run:
           name: Execute migration
           command: |
-            npm install hasura-cli -g
+            curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash
             hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
+            sleep 15
             hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
+            sleep 30
             hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
+      - jira/notify:
+          environment: Test (ImEX) - Hasura
+          environment_type: testing
+          pipeline_id: << pipeline.id >>
+          job_type: deployment
+          pipeline_number: << pipeline.number >>
 
   imex-test-app-build:
     docker:
@@ -302,7 +371,12 @@ jobs:
           from: dist
           to: "s3://imex-online-test-beta/"
           arguments: "--exclude '*.map'"
-
+      - jira/notify:
+          environment: Test (ImEX) - Front End
+          environment_type: testing
+          pipeline_id: << pipeline.id >>
+          job_type: deployment
+          pipeline_number: << pipeline.number >>
 
   admin-app-build:
     docker:
@@ -353,7 +427,7 @@ workflows:
           secret: ${HASURA_PROD_SECRET}
           filters:
             branches:
-              only: master
+              only: master-AIO
       - rome-api-deploy:
           filters:
             branches:
@@ -363,7 +437,7 @@ workflows:
             branches:
               only: master-AIO
       - rome-hasura-migrate:
-          secret: ${HASURA_PROD_SECRET}
+          secret: ${HASURA_ROME_PROD_SECRET}
           filters:
             branches:
               only: master-AIO

client/.env.development.imex

@@ -1,5 +1,5 @@
-VITE_APP_GRAPHQL_ENDPOINT=https://db.dev.bodyshop.app/v1/graphql
+VITE_APP_GRAPHQL_ENDPOINT=https://db.dev.imex.online/v1/graphql
-VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.bodyshop.app/v1/graphql
+VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.imex.online/v1/graphql
 VITE_APP_GA_CODE=231099835
 VITE_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"}
 VITE_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/io-test

client/.env.development.promanager

@@ -1,5 +1,5 @@
-VITE_APP_GRAPHQL_ENDPOINT=https://db.dev.bodyshop.app/v1/graphql
+VITE_APP_GRAPHQL_ENDPOINT=https://db.dev.imex.online/v1/graphql
-VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.bodyshop.app/v1/graphql
+VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.imex.online/v1/graphql
 VITE_APP_GA_CODE=231099835
 VITE_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"}
 VITE_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/io-test

client/.env.development.rome

@@ -1,7 +1,8 @@
-VITE_APP_GRAPHQL_ENDPOINT=https://db.dev.bodyshop.app/v1/graphql
+VITE_APP_GRAPHQL_ENDPOINT=https://db.dev.imex.online/v1/graphql
-VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.bodyshop.app/v1/graphql
+VITE_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.imex.online/v1/graphql
 VITE_APP_GA_CODE=231099835
-VITE_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"}
+# VITE_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"}
+VITE_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"}
 VITE_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/io-test
 VITE_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/io-test
 VITE_APP_CLOUDINARY_API_KEY=957865933348715

client/index.html

@@ -2,6 +2,9 @@
 <html lang="en">
 <head>
   <meta charset="utf-8"/>
+  <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
+  <meta http-equiv="Pragma" content="no-cache">
+  <meta http-equiv="Expires" content="0">
   <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
   <link rel="icon" href="/favicon.png"/>
   <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>

client/package-lock.json

@@ -109,7 +109,8 @@
         "vite-plugin-legacy": "^2.1.0",
         "vite-plugin-node-polyfills": "^0.22.0",
         "vite-plugin-pwa": "^0.20.1",
-        "vite-plugin-style-import": "^2.0.0"
+        "vite-plugin-style-import": "^2.0.0",
+        "workbox-window": "^7.1.0"
       },
       "engines": {
         "node": ">=18.18.2"
@@ -18429,6 +18430,7 @@
       "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-7.1.0.tgz",
       "integrity": "sha512-ZHeROyqR+AS5UPzholQRDttLFqGMwP0Np8MKWAdyxsDETxq3qOAyXvqessc3GniohG6e0mAqSQyKOHmT8zPF7g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/trusted-types": "^2.0.2",
         "workbox-core": "7.1.0"

client/package.json

@@ -153,6 +153,7 @@
     "vite-plugin-legacy": "^2.1.0",
     "vite-plugin-node-polyfills": "^0.22.0",
     "vite-plugin-pwa": "^0.20.1",
-    "vite-plugin-style-import": "^2.0.0"
+    "vite-plugin-style-import": "^2.0.0",
+    "workbox-window": "^7.1.0"
   }
 }

client/src/App/App.jsx

@@ -18,7 +18,6 @@ import { checkUserSession } from "../redux/user/user.actions";
 import { selectBodyshop, selectCurrentEula, selectCurrentUser } from "../redux/user/user.selectors";
 import PrivateRoute from "../components/PrivateRoute";
 import "./App.styles.scss";
-import handleBeta from "../utils/handleBeta";
 import Eula from "../components/eula/eula.component";
 import InstanceRenderMgr from "../utils/instanceRenderMgr";
 import ProductFruitsWrapper from "./ProductFruitsWrapper.jsx";
@@ -108,8 +107,6 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
     return <LoadingSpinner message={t("general.labels.loggingin")} />;
   }
 
-  handleBeta();
-
   if (!online) {
     return (
       <Result

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

@@ -98,7 +98,7 @@ export function BillDetailEditcontainer({ setPartsOrderContext, insertAuditTrail
     });
 
     billlines.forEach((billline) => {
-      const { deductedfromlbr, inventories, jobline, ...il } = billline;
+      const { deductedfromlbr, inventories, jobline, original_actual_price, create_ppc, ...il } = billline;
       delete il.__typename;
 
       if (il.id) {

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

@@ -13,7 +13,6 @@ import Icon, {
   FileFilled,
   HomeFilled,
   ImportOutlined,
-  InfoCircleOutlined,
   LineChartOutlined,
   PaperClipOutlined,
   PhoneOutlined,
@@ -27,8 +26,8 @@ import Icon, {
   UserOutlined
 } from "@ant-design/icons";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Layout, Menu, Switch, Tooltip } from "antd";
+import { Layout, Menu } from "antd";
-import React, { useEffect, useState } from "react";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { BsKanban } from "react-icons/bs";
 import { FaCalendarAlt, FaCarCrash, FaCreditCard, FaFileInvoiceDollar, FaTasks } from "react-icons/fa";
@@ -43,7 +42,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 { checkBeta, handleBeta, setBeta } from "../../utils/handleBeta";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 
@@ -115,20 +113,22 @@ function Header({
     names: ["ImEXPay", "DmsAp", "Simple_Inventory"],
     splitKey: bodyshop && bodyshop.imexshopid
   });
-  const [betaSwitch, setBetaSwitch] = useState(false);
+
   const { t } = useTranslation();
 
-  useEffect(() => {
+  const deleteBetaCookie = () => {
-    const isBeta = checkBeta();
+    const cookieExists = document.cookie.split("; ").some((row) => row.startsWith(`betaSwitchImex=`));
-    setBetaSwitch(isBeta);
+    if (cookieExists) {
-  }, []);
+      const domain = window.location.hostname.split(".").slice(-2).join(".");
-
+      document.cookie = `betaSwitchImex=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=.${domain}`;
-  const betaSwitchChange = (checked) => {
+      console.log(`betaSwitchImex cookie deleted`);
-    setBeta(checked);
+    } else {
-    setBetaSwitch(checked);
+      console.log(`betaSwitchImex cookie does not exist`);
-    handleBeta();
+    }
   };
 
+  deleteBetaCookie();
+
   const accountingChildren = [];
 
   if (
@@ -695,31 +695,6 @@ function Header({
     }
   ];
 
-  InstanceRenderManager({
-    executeFunction: true,
-    args: [],
-    imex: () => {
-      menuItems.push({
-        key: "beta-switch",
-        id: "header-beta-switch",
-        style: { marginLeft: "auto" },
-        label: (
-          <Tooltip
-            title={`A more modern ${InstanceRenderManager({
-              imex: t("titles.imexonline"),
-              rome: t("titles.romeonline"),
-              promanager: t("titles.promanager")
-            })} is ready for you to try! You can switch back at any time.`}
-          >
-            <InfoCircleOutlined />
-            <span style={{ marginRight: 8 }}>Try the new app</span>
-            <Switch checked={betaSwitch} onChange={betaSwitchChange} />
-          </Tooltip>
-        )
-      });
-    }
-  });
-
   return (
     <Layout.Header>
       <Menu

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

@@ -141,10 +141,14 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
         key: t("jobs.fields.ded_amt"),
         total: job.job_totals.totals.custPayable.deductible
       },
-      // {
+      ...(InstanceRenderManager({
-      //   key: t("jobs.fields.federal_tax_payable"),
+        imex: [{
-      //   total: job.job_totals.totals.custPayable.federal_tax,
+          key: t("jobs.fields.federal_tax_payable"),
-      // },
+          total: job.job_totals.totals.custPayable.federal_tax
+        }],
+        rome: [],
+        promanager: "USE_ROME"
+      })),
       {
         key: t("jobs.fields.other_amount_payable"),
         total: job.job_totals.totals.custPayable.other_customer_amount

client/src/components/parts-order-modal/parts-order-modal-price-change.component.jsx

@@ -27,6 +27,10 @@ export default function PartsOrderModalPriceChange({ form, field }) {
         key: "25",
         label: t("parts_orders.labels.discount", { percent: "25%" })
       },
+      {
+        key: "40",
+        label: t("parts_orders.labels.discount", { percent: "40%" })
+      },
       {
         key: "custom",
         label: (

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

@@ -6,11 +6,11 @@ import {
   PauseCircleOutlined
 } from "@ant-design/icons";
 import { Card, Col, Row, Space, Tooltip } from "antd";
+import Dinero from "dinero.js";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
-import Dinero from "dinero.js";
 
 import ProductionAlert from "../production-list-columns/production-list-columns.alert.component";
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
@@ -18,8 +18,8 @@ import ProductionSubletsManageComponent from "../production-sublets-manage/produ
 
 import dayjs from "../../utils/day";
 
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 const cardColor = (ssbuckets, totalHrs) => {
   const bucket = ssbuckets.find((bucket) => bucket.gte <= totalHrs && (!bucket.lt || bucket.lt > totalHrs));
@@ -213,21 +213,13 @@ const EstimatorToolTip = ({ metadata, cardSettings }) => {
 };
 
 const SubtotalTooltip = ({ metadata, cardSettings, t }) => {
-  const amount = metadata?.job_totals?.totals?.subtotal?.amount;
+  const dineroAmount = Dinero(metadata?.job_totals?.totals?.subtotal ?? Dinero()).toFormat();
-  const dineroAmount = amount ? Dinero({ amount: parseInt(amount * 100) }).toFormat("0,0.00") : null;
 
   return (
     cardSettings?.subtotal && (
       <Col span={cardSettings.compact ? 24 : 12}>
-        <EllipsesToolTip
+        <EllipsesToolTip title={`${dineroAmount}`} kiosk={cardSettings.kiosk}>
-          title={!!amount ? `${t("production.statistics.currency_symbol")}${dineroAmount}` : null}
+          {dineroAmount}
-          kiosk={cardSettings.kiosk}
-        >
-          {!!amount ? (
-            <span>{`${t("production.statistics.currency_symbol")}${dineroAmount}`}</span>
-          ) : (
-            <span>&nbsp;</span>
-          )}
         </EllipsesToolTip>
       </Col>
     )

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

@@ -1,8 +1,12 @@
-import React, { useEffect, useMemo } from "react";
+import React, { useEffect, useMemo, useRef } from "react";
 import { useQuery, useSubscription } from "@apollo/client";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { QUERY_JOBS_IN_PRODUCTION, SUBSCRIPTION_JOBS_IN_PRODUCTION } from "../../graphql/jobs.queries";
+import {
+  QUERY_JOBS_IN_PRODUCTION,
+  SUBSCRIPTION_JOBS_IN_PRODUCTION,
+  SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW
+} from "../../graphql/jobs.queries";
 import { QUERY_KANBAN_SETTINGS } from "../../graphql/user.queries";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import ProductionBoardKanbanComponent from "./production-board-kanban.component";
@@ -12,7 +16,9 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser
 });
 
-function ProductionBoardKanbanContainer({ bodyshop, currentUser }) {
+function ProductionBoardKanbanContainer({ bodyshop, currentUser, subscriptionType = "direct" }) {
+  const fired = useRef(false); // useRef to keep track of whether the subscription fired
+
   const combinedStatuses = useMemo(
     () => [
       ...bodyshop.md_ro_statuses.production_statuses,
@@ -28,9 +34,12 @@ function ProductionBoardKanbanContainer({ bodyshop, currentUser }) {
     onError: (error) => console.error(`Error fetching jobs in production: ${error.message}`)
   });
 
-  const { data: updatedJobs } = useSubscription(SUBSCRIPTION_JOBS_IN_PRODUCTION, {
+  const { data: updatedJobs } = useSubscription(
-    onError: (error) => console.error(`Error subscribing to jobs in production: ${error.message}`)
+    subscriptionType === "view" ? SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW : SUBSCRIPTION_JOBS_IN_PRODUCTION,
-  });
+    {
+      onError: (error) => console.error(`Error subscribing to jobs in production: ${error.message}`)
+    }
+  );
 
   const { loading: associationSettingsLoading, data: associationSettings } = useQuery(QUERY_KANBAN_SETTINGS, {
     variables: { email: currentUser.email },
@@ -40,10 +49,15 @@ function ProductionBoardKanbanContainer({ bodyshop, currentUser }) {
   // const currentReducerData = useSelector((state) => (state.trello.lanes ? state.trello : {}));
 
   useEffect(() => {
-    if (updatedJobs && data) {
+    if (!updatedJobs) {
-      refetch().catch((err) => console.error(`Error re-fetching jobs in production: ${err.message}`));
+      return;
     }
-  }, [updatedJobs, data, refetch]);
+    if (!fired.current) {
+      fired.current = true;
+      return;
+    }
+    refetch().catch((err) => console.error(`Error re-fetching jobs in production: ${err.message}`));
+  }, [updatedJobs, refetch]);
 
   const filteredAssociationSettings = useMemo(() => {
     return associationSettings?.associations[0] || null;

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

@@ -3,6 +3,7 @@ import { Card, Statistic } from "antd";
 import { useTranslation } from "react-i18next";
 import PropTypes from "prop-types";
 import { defaultKanbanSettings, statisticsItems } from "./settings/defaultKanbanSettings.js";
+import Dinero from "dinero.js";
 
 export const StatisticType = {
   HOURS: "hours",
@@ -32,7 +33,21 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
   };
 
   const calculateTotalAmount = (items, key) => {
-    return items.reduce((acc, item) => acc + (item[key]?.totals?.subtotal?.amount || 0), 0);
+    return items.reduce((acc, item) => acc.add(Dinero(item[key]?.totals?.subtotal ?? Dinero())), Dinero({ amount: 0 }));
+  };
+
+  const calculateReducerTotalAmount = (lanes, key) => {
+    return lanes.reduce(
+      (acc, lane) => {
+        return acc.add(
+          lane.cards.reduce(
+            (laneAcc, card) => laneAcc.add(Dinero(card.metadata[key]?.totals?.subtotal ?? Dinero())),
+            Dinero({ amount: 0 })
+          )
+        );
+      },
+      Dinero({ amount: 0 })
+    );
   };
 
   const calculateReducerTotal = (lanes, key, subKey) => {
@@ -43,14 +58,6 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
     }, 0);
   };
 
-  const calculateReducerTotalAmount = (lanes, key) => {
-    return lanes.reduce((acc, lane) => {
-      return (
-        acc + lane.cards.reduce((laneAcc, card) => laneAcc + (card.metadata[key]?.totals?.subtotal?.amount || 0), 0)
-      );
-    }, 0);
-  };
-
   const formatValue = (value, type) => {
     if (type === StatisticType.JOBS) {
       return value.toFixed(0);
@@ -87,9 +94,15 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
   const totalAmountInProduction = useMemo(() => {
     if (!cardSettings.totalAmountInProduction) return null;
     const total = calculateTotalAmount(data, "job_totals");
-    return parseFloat(total.toFixed(2));
+    return total.toFormat("$0,0.00");
   }, [data, cardSettings.totalAmountInProduction]);
 
+  const totalAmountOnBoard = useMemo(() => {
+    if (!reducerData || !cardSettings.totalAmountOnBoard) return null;
+    const total = calculateReducerTotalAmount(reducerData.lanes, "job_totals");
+    return total.toFormat("$0,0.00");
+  }, [reducerData, cardSettings.totalAmountOnBoard]);
+
   const totalHrsOnBoard = useMemo(() => {
     if (!reducerData || !cardSettings.totalHrsOnBoard) return null;
     const total =
@@ -118,12 +131,6 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
     [reducerData, cardSettings.jobsOnBoard]
   );
 
-  const totalAmountOnBoard = useMemo(() => {
-    if (!reducerData || !cardSettings.totalAmountOnBoard) return null;
-    const total = calculateReducerTotalAmount(reducerData.lanes, "job_totals");
-    return parseFloat(total.toFixed(2));
-  }, [reducerData, cardSettings.totalAmountOnBoard]);
-
   const tasksInProduction = useMemo(() => {
     if (!data || !cardSettings.tasksInProduction) return null;
     return data.reduce((acc, item) => acc + (item.tasks_aggregate?.aggregate?.count || 0), 0);
@@ -191,7 +198,6 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
           <Statistic
             title={t(`production.statistics.${stat.label}`)}
             value={formatValue(stat.value, stat.type)}
-            prefix={stat.type === StatisticType.AMOUNT ? t("production.statistics.currency_symbol") : undefined}
             suffix={
               stat.type === StatisticType.HOURS
                 ? t("production.statistics.hours")

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

@@ -1,23 +1,23 @@
-import React, { useEffect, useMemo, useRef, useState } from "react";
+import { SyncOutlined } from "@ant-design/icons";
-import { Button, Dropdown, Input, Space, Statistic, Table } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+import { Button, Dropdown, Input, Space, Statistic, Table } from "antd";
+import _ from "lodash";
+import React, { useEffect, useMemo, useRef, useState } from "react";
 import ReactDragListView from "react-drag-listview";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import Prompt from "../../utils/prompt.js";
+import AlertComponent from "../alert/alert.component.jsx";
 import ProductionListColumnsAdd from "../production-list-columns/production-list-columns.add.component";
 import ProductionListColumns from "../production-list-columns/production-list-columns.data";
 import ProductionListDetail from "../production-list-detail/production-list-detail.component";
+import { ProductionListConfigManager } from "./production-list-config-manager.component.jsx";
 import ProductionListPrint from "./production-list-print.component";
 import ResizeableTitle from "./production-list-table.resizeable.component";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { SyncOutlined } from "@ant-design/icons";
-import Prompt from "../../utils/prompt.js";
-import _ from "lodash";
-import AlertComponent from "../alert/alert.component.jsx";
-import { ProductionListConfigManager } from "./production-list-config-manager.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -43,7 +43,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
   const initialStateRef = useRef(
     (bodyshop.production_config &&
       bodyshop.production_config.find((p) => p.name === defaultView)?.columns.tableState) ||
-      bodyshop.production_config[0]?.columns.tableState || {
+      (bodyshop.production_config && bodyshop.production_config[0]?.columns.tableState) || {
         sortedInfo: {},
         filteredInfo: { text: "" }
       }

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

@@ -4,12 +4,13 @@ import {
   QUERY_EXACT_JOB_IN_PRODUCTION,
   QUERY_EXACT_JOBS_IN_PRODUCTION,
   QUERY_JOBS_IN_PRODUCTION,
-  SUBSCRIPTION_JOBS_IN_PRODUCTION
+  SUBSCRIPTION_JOBS_IN_PRODUCTION,
+  SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW
 } from "../../graphql/jobs.queries";
 import ProductionListTable from "./production-list-table.component";
 import _ from "lodash";
 
-export default function ProductionListTableContainer() {
+export default function ProductionListTableContainer({ subscriptionType = "direct" }) {
   const { refetch, loading, data } = useQuery(QUERY_JOBS_IN_PRODUCTION, {
     pollInterval: 3600000,
     fetchPolicy: "network-only",
@@ -17,7 +18,9 @@ export default function ProductionListTableContainer() {
   });
   const client = useApolloClient();
   const [joblist, setJoblist] = useState([]);
-  const { data: updatedJobs } = useSubscription(SUBSCRIPTION_JOBS_IN_PRODUCTION);
+  const { data: updatedJobs } = useSubscription(
+    subscriptionType === "view" ? SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW : SUBSCRIPTION_JOBS_IN_PRODUCTION
+  );
 
   useEffect(() => {
     if (!(data && data.jobs)) return;

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

@@ -34,28 +34,34 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
   const [form] = Form.useForm();
   const [search, setSearch] = useState("");
   const {
-    treatments: { Enhanced_Payroll }
+    treatments: { Enhanced_Payroll, ADPPayroll }
   } = useSplitTreatments({
     attributes: {},
-    names: ["Enhanced_Payroll"],
+    names: ["Enhanced_Payroll", "ADPPayroll"],
     splitKey: bodyshop.imexshopid
   });
 
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const Templates = TemplateList("report_center");
-  const ReportsList =
+  const ReportsList = Object.keys(Templates)
-    Enhanced_Payroll.treatment === "on"
+    .map((key) => Templates[key])
-      ? Object.keys(Templates)
+    .filter((temp) => {
-          .map((key) => {
+      const enhancedPayrollOn = Enhanced_Payroll.treatment === "on";
-            return Templates[key];
+      const adpPayrollOn = ADPPayroll.treatment === "on";
-          })
+
-          .filter((temp) => temp.enhanced_payroll === undefined || temp.enhanced_payroll === true)
+      if (enhancedPayrollOn && adpPayrollOn) {
-      : Object.keys(Templates)
+        return temp.enhanced_payroll !== false || temp.adp_payroll !== false;
-          .map((key) => {
+      }
-            return Templates[key];
+      if (enhancedPayrollOn) {
-          })
+        return temp.enhanced_payroll !== false && temp.adp_payroll !== true;
-          .filter((temp) => temp.enhanced_payroll === undefined || temp.enhanced_payroll === false);
+      }
+      if (adpPayrollOn) {
+        return temp.adp_payroll !== false && temp.enhanced_payroll !== true;
+      }
+
+      return temp.enhanced_payroll !== true && temp.adp_payroll !== true;
+    });
 
   const { open } = reportCenterModal;
 
@@ -104,7 +110,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
         to: values.to,
         subject: Templates[values.key]?.subject
       },
-      values.sendbyexcel === "excel" ? "x" : values.sendby === "email" ? "e" : "p",
+      values.sendbytext === "text" ? values.sendbytext : values.sendbyexcel === "excel" ? "x" : values.sendby === "email" ? "e" : "p",
       id
     );
     setLoading(false);
@@ -291,7 +297,15 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                   </Radio.Group>
                 </Form.Item>
               );
-            if (reporttype !== "excel")
+            if (reporttype === "text")
+              return (
+                <Form.Item label={t("general.labels.sendby")} name="sendbytext" initialValue="text">
+                  <Radio.Group>
+                    <Radio value="text">{t("general.labels.text")}</Radio>
+                  </Radio.Group>
+                </Form.Item>
+              );
+            if (reporttype !== "excel" || reporttype !== "text")
               return (
                 <Form.Item label={t("general.labels.sendby")} name="sendby" initialValue="print">
                   <Radio.Group>

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

@@ -7,13 +7,13 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import DatePickerRanges from "../../utils/DatePickerRanges";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import FeatureWrapper, { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import PhoneFormItem, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-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 InstanceRenderManager from "../../utils/instanceRenderMgr";
-import FeatureWrapper, { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 // TODO: Client Update, this might break
 const timeZonesList = Intl.supportedValuesOf("timeZone");
 const mapStateToProps = createStructuredSelector({
@@ -28,10 +28,10 @@ export function ShopInfoGeneral({ form, bodyshop }) {
   const { t } = useTranslation();
 
   const {
-    treatments: { ClosingPeriod }
+    treatments: { ClosingPeriod, ADPPayroll }
   } = useSplitTreatments({
     attributes: {},
-    names: ["ClosingPeriod"],
+    names: ["ClosingPeriod", "ADPPayroll"],
     splitKey: bodyshop && bodyshop.imexshopid
   });
 
@@ -98,7 +98,6 @@ export function ShopInfoGeneral({ form, bodyshop }) {
         <Form.Item label={t("bodyshop.fields.email")} name="email">
           <Input />
         </Form.Item>
-
         <Form.Item
           label={t("bodyshop.fields.phone")}
           name="phone"
@@ -356,14 +355,22 @@ export function ShopInfoGeneral({ form, bodyshop }) {
             <Select mode="tags" />
           </Form.Item>
           {ClosingPeriod.treatment === "on" && (
-            <>
+            <Form.Item
-              <Form.Item
+              name={["accountingconfig", "ClosingPeriod"]}
-                name={["accountingconfig", "ClosingPeriod"]}
+              label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
-                label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
+            >
-              >
+              <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
-                <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
+            </Form.Item>
-              </Form.Item>
+          )}
-            </>
+          {ADPPayroll.treatment === "on" && (
+            <Form.Item name={["accountingconfig", "companyCode"]} label={t("bodyshop.fields.companycode")}>
+              <Input />
+            </Form.Item>
+          )}
+          {ADPPayroll.treatment === "on" && (
+            <Form.Item name={["accountingconfig", "batchID"]} label={t("bodyshop.fields.batchid")}>
+              <Input />
+            </Form.Item>
           )}
         </LayoutFormRow>
       </FeatureWrapper>

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

@@ -30,219 +30,226 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
   return (
     <RbacWrapper action="shop:rbac">
       <LayoutFormRow>
-        {...HasFeatureAccess({ featureName: "export", bodyshop }) ? [
+        {...HasFeatureAccess({ featureName: "export", bodyshop })
-          <Form.Item
+          ? [
-            label={t("bodyshop.fields.rbac.accounting.exportlog")}
+              <Form.Item
-            rules={[
+                label={t("bodyshop.fields.rbac.accounting.exportlog")}
-              {
+                rules={[
-                required: true
+                  {
-                //message: t("general.validation.required"),
+                    required: true
-              }
+                    //message: t("general.validation.required"),
-            ]}
+                  }
-            name={["md_rbac", "accounting:exportlog"]}
+                ]}
-          >
+                name={["md_rbac", "accounting:exportlog"]}
-            <InputNumber />
+              >
-          </Form.Item>,
+                <InputNumber />
-          <Form.Item
+              </Form.Item>,
-            label={t("bodyshop.fields.rbac.accounting.payables")}
+              <Form.Item
-            rules={[
+                label={t("bodyshop.fields.rbac.accounting.payables")}
-              {
+                rules={[
-                required: true
+                  {
-                //message: t("general.validation.required"),
+                    required: true
-              }
+                    //message: t("general.validation.required"),
-            ]}
+                  }
-            name={["md_rbac", "accounting:payables"]}
+                ]}
-          >
+                name={["md_rbac", "accounting:payables"]}
-            <InputNumber />
+              >
-          </Form.Item>,
+                <InputNumber />
-          <Form.Item
+              </Form.Item>,
-            label={t("bodyshop.fields.rbac.accounting.payments")}
+              <Form.Item
-            rules={[
+                label={t("bodyshop.fields.rbac.accounting.payments")}
-              {
+                rules={[
-                required: true
+                  {
-                //message: t("general.validation.required"),
+                    required: true
-              }
+                    //message: t("general.validation.required"),
-            ]}
+                  }
-            name={["md_rbac", "accounting:payments"]}
+                ]}
-          >
+                name={["md_rbac", "accounting:payments"]}
-            <InputNumber />
+              >
-          </Form.Item>,
+                <InputNumber />
-          <Form.Item
+              </Form.Item>,
-            label={t("bodyshop.fields.rbac.accounting.receivables")}
+              <Form.Item
-            rules={[
+                label={t("bodyshop.fields.rbac.accounting.receivables")}
-              {
+                rules={[
-                required: true
+                  {
-                //message: t("general.validation.required"),
+                    required: true
-              }
+                    //message: t("general.validation.required"),
-            ]}
+                  }
-            name={["md_rbac", "accounting:receivables"]}
+                ]}
-          >
+                name={["md_rbac", "accounting:receivables"]}
-            <InputNumber />
+              >
-          </Form.Item>
+                <InputNumber />
-        ]:[]}
+              </Form.Item>
-        {...HasFeatureAccess({ featureName: "bills", bodyshop }) ? [
+            ]
-          <Form.Item
+          : []}
-            label={t("bodyshop.fields.rbac.bills.delete")}
+        {...HasFeatureAccess({ featureName: "bills", bodyshop })
-            rules={[
+          ? [
-              {
+              <Form.Item
-                required: true
+                label={t("bodyshop.fields.rbac.bills.delete")}
-                //message: t("general.validation.required"),
+                rules={[
-              }
+                  {
-            ]}
+                    required: true
-            name={["md_rbac", "bills:delete"]}
+                    //message: t("general.validation.required"),
-          >
+                  }
-            <InputNumber />
+                ]}
-          </Form.Item>,
+                name={["md_rbac", "bills:delete"]}
-          <Form.Item
+              >
-            label={t("bodyshop.fields.rbac.bills.enter")}
+                <InputNumber />
-            rules={[
+              </Form.Item>,
-              {
+              <Form.Item
-                required: true
+                label={t("bodyshop.fields.rbac.bills.enter")}
-                //message: t("general.validation.required"),
+                rules={[
-              }
+                  {
-            ]}
+                    required: true
-            name={["md_rbac", "bills:enter"]}
+                    //message: t("general.validation.required"),
-          >
+                  }
-            <InputNumber />
+                ]}
-          </Form.Item>,
+                name={["md_rbac", "bills:enter"]}
-          <Form.Item
+              >
-            label={t("bodyshop.fields.rbac.bills.list")}
+                <InputNumber />
-            rules={[
+              </Form.Item>,
-              {
+              <Form.Item
-                required: true
+                label={t("bodyshop.fields.rbac.bills.list")}
-                //message: t("general.validation.required"),
+                rules={[
-              }
+                  {
-            ]}
+                    required: true
-            name={["md_rbac", "bills:list"]}
+                    //message: t("general.validation.required"),
-          >
+                  }
-            <InputNumber />
+                ]}
-          </Form.Item>,
+                name={["md_rbac", "bills:list"]}
-          <Form.Item
+              >
-            label={t("bodyshop.fields.rbac.bills.reexport")}
+                <InputNumber />
-            rules={[
+              </Form.Item>,
-              {
+              <Form.Item
-                required: true
+                label={t("bodyshop.fields.rbac.bills.reexport")}
-                //message: t("general.validation.required"),
+                rules={[
-              }
+                  {
-            ]}
+                    required: true
-            name={["md_rbac", "bills:reexport"]}
+                    //message: t("general.validation.required"),
-          >
+                  }
-            <InputNumber />
+                ]}
-          </Form.Item>,
+                name={["md_rbac", "bills:reexport"]}
-          <Form.Item
+              >
-            label={t("bodyshop.fields.rbac.bills.view")}
+                <InputNumber />
-            rules={[
+              </Form.Item>,
-              {
+              <Form.Item
-                required: true
+                label={t("bodyshop.fields.rbac.bills.view")}
-                //message: t("general.validation.required"),
+                rules={[
-              }
+                  {
-            ]}
+                    required: true
-            name={["md_rbac", "bills:view"]}
+                    //message: t("general.validation.required"),
-          >
+                  }
-            <InputNumber />
+                ]}
-          </Form.Item>
+                name={["md_rbac", "bills:view"]}
-        ]:[]}
+              >
-
+                <InputNumber />
-        {...HasFeatureAccess({ featureName: "courtesycars", bodyshop }) ? [
+              </Form.Item>
-          <Form.Item
+            ]
-            label={t("bodyshop.fields.rbac.contracts.create")}
+          : []}
-            rules={[
+        {...HasFeatureAccess({ featureName: "courtesycars", bodyshop })
-              {
+          ? [
-                required: true
+              <Form.Item
-                //message: t("general.validation.required"),
+                label={t("bodyshop.fields.rbac.contracts.create")}
-              }
+                rules={[
-            ]}
+                  {
-            name={["md_rbac", "contracts:create"]}
+                    required: true
-          >
+                    //message: t("general.validation.required"),
-            <InputNumber />
+                  }
-          </Form.Item>,
+                ]}
-          <Form.Item
+                name={["md_rbac", "contracts:create"]}
-            label={t("bodyshop.fields.rbac.contracts.detail")}
+              >
-            rules={[
+                <InputNumber />
-              {
+              </Form.Item>,
-                required: true
+              <Form.Item
-                //message: t("general.validation.required"),
+                label={t("bodyshop.fields.rbac.contracts.detail")}
-              }
+                rules={[
-            ]}
+                  {
-            name={["md_rbac", "contracts:detail"]}
+                    required: true
-          >
+                    //message: t("general.validation.required"),
-            <InputNumber />
+                  }
-          </Form.Item>,
+                ]}
-          <Form.Item
+                name={["md_rbac", "contracts:detail"]}
-            label={t("bodyshop.fields.rbac.contracts.list")}
+              >
-            rules={[
+                <InputNumber />
-              {
+              </Form.Item>,
-                required: true
+              <Form.Item
-                //message: t("general.validation.required"),
+                label={t("bodyshop.fields.rbac.contracts.list")}
-              }
+                rules={[
-            ]}
+                  {
-            name={["md_rbac", "contracts:list"]}
+                    required: true
-          >
+                    //message: t("general.validation.required"),
-            <InputNumber />
+                  }
-          </Form.Item>,
+                ]}
-          <Form.Item
+                name={["md_rbac", "contracts:list"]}
-            label={t("bodyshop.fields.rbac.courtesycar.create")}
+              >
-            rules={[
+                <InputNumber />
-              {
+              </Form.Item>,
-                required: true
+              <Form.Item
-                //message: t("general.validation.required"),
+                label={t("bodyshop.fields.rbac.courtesycar.create")}
-              }
+                rules={[
-            ]}
+                  {
-            name={["md_rbac", "courtesycar:create"]}
+                    required: true
-          >
+                    //message: t("general.validation.required"),
-            <InputNumber />
+                  }
-          </Form.Item>,
+                ]}
-          <Form.Item
+                name={["md_rbac", "courtesycar:create"]}
-            label={t("bodyshop.fields.rbac.courtesycar.detail")}
+              >
-            rules={[
+                <InputNumber />
-              {
+              </Form.Item>,
-                required: true
+              <Form.Item
-                //message: t("general.validation.required"),
+                label={t("bodyshop.fields.rbac.courtesycar.detail")}
-              }
+                rules={[
-            ]}
+                  {
-            name={["md_rbac", "courtesycar:detail"]}
+                    required: true
-          >
+                    //message: t("general.validation.required"),
-            <InputNumber />
+                  }
-          </Form.Item>,
+                ]}
-          <Form.Item
+                name={["md_rbac", "courtesycar:detail"]}
-            label={t("bodyshop.fields.rbac.courtesycar.list")}
+              >
-            rules={[
+                <InputNumber />
-              {
+              </Form.Item>,
-                required: true
+              <Form.Item
-                //message: t("general.validation.required"),
+                label={t("bodyshop.fields.rbac.courtesycar.list")}
-              }
+                rules={[
-            ]}
+                  {
-            name={["md_rbac", "courtesycar:list"]}
+                    required: true
-          >
+                    //message: t("general.validation.required"),
-            <InputNumber />
+                  }
-          </Form.Item>
+                ]}
-        ]:[]}
+                name={["md_rbac", "courtesycar:list"]}
-        {...HasFeatureAccess({ featureName: "csi", bodyshop }) ? [
+              >
-          <Form.Item
+                <InputNumber />
-            label={t("bodyshop.fields.rbac.csi.export")}
+              </Form.Item>
-            rules={[
+            ]
-              {
+          : []}
-                required: true
+        {...HasFeatureAccess({ featureName: "csi", bodyshop })
-                //message: t("general.validation.required"),
+          ? [
-              }
+              <Form.Item
-            ]}
+                label={t("bodyshop.fields.rbac.csi.export")}
-            name={["md_rbac", "csi:export"]}
+                rules={[
-          >
+                  {
-            <InputNumber />
+                    required: true
-          </Form.Item>,
+                    //message: t("general.validation.required"),
-          <Form.Item
+                  }
-            label={t("bodyshop.fields.rbac.csi.page")}
+                ]}
-            rules={[
+                name={["md_rbac", "csi:export"]}
-              {
+              >
-                required: true
+                <InputNumber />
-                //message: t("general.validation.required"),
+              </Form.Item>,
-              }
+              <Form.Item
-            ]}
+                label={t("bodyshop.fields.rbac.csi.page")}
-            name={["md_rbac", "csi:page"]}
+                rules={[
-          >
+                  {
-            <InputNumber />
+                    required: true
-          </Form.Item>
+                    //message: t("general.validation.required"),
-        ]:[]}
+                  }
+                ]}
+                name={["md_rbac", "csi:page"]}
+              >
+                <InputNumber />
+              </Form.Item>
+            ]
+          : []}
         <Form.Item
           label={t("bodyshop.fields.rbac.employees.page")}
           rules={[
@@ -255,6 +262,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.jobs.admin")}
           rules={[
@@ -435,31 +454,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.employees.page")}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
-          name={["md_rbac", "employees:page"]}
-        >
-          <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.payments.enter")}
           rules={[
@@ -522,7 +516,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
             <InputNumber />
           </Form.Item>
         )}
-
         <Form.Item
           label={t("bodyshop.fields.rbac.production.list")}
           rules={[
@@ -561,128 +554,118 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
             <InputNumber />
           </Form.Item>
         )}
-        {...HasFeatureAccess({ featureName: "timetickets", bodyshop }) ? [
+        {...HasFeatureAccess({ featureName: "timetickets", bodyshop })
-          <Form.Item
+          ? [
-            label={t("bodyshop.fields.rbac.shiftclock.view")}
+              <Form.Item
-            rules={[
+                label={t("bodyshop.fields.rbac.shiftclock.view")}
-              {
+                rules={[
-                required: true
+                  {
-                //message: t("general.validation.required"),
+                    required: true
-              }
+                    //message: t("general.validation.required"),
-            ]}
+                  }
-            name={["md_rbac", "shiftclock:view"]}
+                ]}
-          >
+                name={["md_rbac", "shiftclock:view"]}
-            <InputNumber />
+              >
-          </Form.Item>,
+                <InputNumber />
-          <Form.Item
+              </Form.Item>,
-            label={t("bodyshop.fields.rbac.shop.config")}
+              <Form.Item
-            rules={[
+                label={t("bodyshop.fields.rbac.shop.config")}
-              {
+                rules={[
-                required: true
+                  {
-                //message: t("general.validation.required"),
+                    required: true
-              }
+                    //message: t("general.validation.required"),
-            ]}
+                  }
-            name={["md_rbac", "shop:config"]}
+                ]}
-          >
+                name={["md_rbac", "shop:config"]}
-            <InputNumber />
+              >
-          </Form.Item>,
+                <InputNumber />
-          <Form.Item
+              </Form.Item>,
-            label={t("bodyshop.fields.rbac.timetickets.edit")}
+              <Form.Item
-            rules={[
+                label={t("bodyshop.fields.rbac.timetickets.edit")}
-              {
+                rules={[
-                required: true
+                  {
-                //message: t("general.validation.required"),
+                    required: true
-              }
+                    //message: t("general.validation.required"),
-            ]}
+                  }
-            name={["md_rbac", "timetickets:edit"]}
+                ]}
-          >
+                name={["md_rbac", "timetickets:edit"]}
-            <InputNumber />
+              >
-          </Form.Item>,
+                <InputNumber />
-          <Form.Item
+              </Form.Item>,
-            label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
+              <Form.Item
-            rules={[
+                label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
-              {
+                rules={[
-                required: true
+                  {
-                //message: t("general.validation.required"),
+                    required: true
-              }
+                    //message: t("general.validation.required"),
-            ]}
+                  }
-            name={["md_rbac", "timetickets:shiftedit"]}
+                ]}
-          >
+                name={["md_rbac", "timetickets:shiftedit"]}
-            <InputNumber />
+              >
-          </Form.Item>,
+                <InputNumber />
-          <Form.Item
+              </Form.Item>,
-            label={t("bodyshop.fields.rbac.timetickets.editcommitted")}
+              <Form.Item
-            rules={[
+                label={t("bodyshop.fields.rbac.timetickets.editcommitted")}
-              {
+                rules={[
-                required: true
+                  {
-                //message: t("general.validation.required"),
+                    required: true
-              }
+                    //message: t("general.validation.required"),
-            ]}
+                  }
-            name={["md_rbac", "timetickets:editcommitted"]}
+                ]}
-          >
+                name={["md_rbac", "timetickets:editcommitted"]}
-            <InputNumber />
+              >
-          </Form.Item>,
+                <InputNumber />
-          <Form.Item
+              </Form.Item>,
-            label={t("bodyshop.fields.rbac.ttapprovals.view")}
+              <Form.Item
-            rules={[
+                label={t("bodyshop.fields.rbac.ttapprovals.view")}
-              {
+                rules={[
-                required: true
+                  {
-                //message: t("general.validation.required"),
+                    required: true
-              }
+                    //message: t("general.validation.required"),
-            ]}
+                  }
-            name={["md_rbac", "ttapprovals:view"]}
+                ]}
-          >
+                name={["md_rbac", "ttapprovals:view"]}
-            <InputNumber />
+              >
-          </Form.Item>,
+                <InputNumber />
-          <Form.Item
+              </Form.Item>,
-            label={t("bodyshop.fields.rbac.ttapprovals.approve")}
+              <Form.Item
-            rules={[
+                label={t("bodyshop.fields.rbac.ttapprovals.approve")}
-              {
+                rules={[
-                required: true
+                  {
-                //message: t("general.validation.required"),
+                    required: true
-              }
+                    //message: t("general.validation.required"),
-            ]}
+                  }
-            name={["md_rbac", "ttapprovals:approve"]}
+                ]}
-          >
+                name={["md_rbac", "ttapprovals:approve"]}
-            <InputNumber />
+              >
-          </Form.Item>,
+                <InputNumber />
-          <Form.Item
+              </Form.Item>,
-            label={t("bodyshop.fields.rbac.timetickets.enter")}
+              <Form.Item
-            rules={[
+                label={t("bodyshop.fields.rbac.timetickets.enter")}
-              {
+                rules={[
-                required: true
+                  {
-                //message: t("general.validation.required"),
+                    required: true
-              }
+                    //message: t("general.validation.required"),
-            ]}
+                  }
-            name={["md_rbac", "timetickets:enter"]}
+                ]}
-          >
+                name={["md_rbac", "timetickets:enter"]}
-            <InputNumber />
+              >
-          </Form.Item>,
+                <InputNumber />
-          <Form.Item
+              </Form.Item>,
-            label={t("bodyshop.fields.rbac.timetickets.list")}
+              <Form.Item
-            rules={[
+                label={t("bodyshop.fields.rbac.timetickets.list")}
-              {
+                rules={[
-                required: true
+                  {
-                //message: t("general.validation.required"),
+                    required: true
-              }
+                    //message: t("general.validation.required"),
-            ]}
+                  }
-            name={["md_rbac", "timetickets:list"]}
+                ]}
-          >
+                name={["md_rbac", "timetickets:list"]}
-            <InputNumber />
+              >
-          </Form.Item>,
+                <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={[
@@ -757,7 +740,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
             <InputNumber />
           </Form.Item>
         )}
-
         <Form.Item
           label={t("bodyshop.fields.rbac.users.editaccess")}
           rules={[

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

@@ -12,7 +12,7 @@ import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
 import { onlyUnique } from "../../utils/arrayHelper";
 import dayjs from "../../utils/day";
 import { alphaSort, dateSort } from "../../utils/sorters";
-import RbacWrapper, { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
+import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketEnterButton from "../time-ticket-enter-button/time-ticket-enter-button.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -52,6 +52,10 @@ export function TimeTicketList({
     splitKey: bodyshop.imexshopid
   });
 
+  const canEditCommittedTimeTickets = HasRbacAccess({ bodyshop, authLevel, action: "timetickets:editcommitted" });
+  const canEditTimeTickets = HasRbacAccess({ bodyshop, authLevel, action: "timetickets:edit" });
+  const canEditShiftTickets = HasRbacAccess({ bodyshop, authLevel, action: "timetickets:shiftedit" });
+
   const totals = useMemo(() => {
     if (timetickets)
       return timetickets.reduce(
@@ -65,6 +69,18 @@ export function TimeTicketList({
     return { productivehrs: 0, actualhrs: 0 };
   }, [timetickets]);
 
+  const isDisabled = (record) => {
+    if (disabled === true || !record.id) return true;
+
+    const isShiftTicket = !record.ciecacode;
+    const isCommitted = record.committed_at;
+    if (isShiftTicket) {
+      return !(canEditShiftTickets && (!isCommitted || canEditCommittedTimeTickets));
+    }
+    
+    return !(canEditTimeTickets && (!isCommitted || canEditCommittedTimeTickets));
+  };
+
   const columns = [
     ...(Enhanced_Payroll.treatment === "on"
       ? [
@@ -206,76 +222,55 @@ export function TimeTicketList({
                 return null;
               }
             }
-          },
+          }
-  
         ]),
-        {
+    {
-          title: t("timetickets.fields.created_by"),
+      title: t("timetickets.fields.created_by"),
-          dataIndex: "created_by",
+      dataIndex: "created_by",
-          key: "created_by",
+      key: "created_by",
-          sorter: (a, b) => alphaSort(a.created_by, b.created_by),
+      sorter: (a, b) => alphaSort(a.created_by, b.created_by),
-          sortOrder: state.sortedInfo.columnKey === "created_by" && state.sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "created_by" && state.sortedInfo.order,
-          render: (text, record) => record.created_by
+      render: (text, record) => record.created_by
-        },
+    },
-        // {
+    // {
-        //   title: "Pay",
+    //   title: "Pay",
-        //   dataIndex: "pay",
+    //   dataIndex: "pay",
-        //   key: "pay",
+    //   key: "pay",
-        //   render: (text, record) =>
+    //   render: (text, record) =>
-        //     Dinero({ amount: Math.round(record.rate * 100) })
+    //     Dinero({ amount: Math.round(record.rate * 100) })
-        //       .multiply(record.flat_rate ? record.productivehrs : record.actualhrs)
+    //       .multiply(record.flat_rate ? record.productivehrs : record.actualhrs)
-        //       .toFormat("$0.00"),
+    //       .toFormat("$0.00"),
-        // },
+    // },
-        {
+    {
-          title: t("general.labels.actions"),
+      title: t("general.labels.actions"),
-          dataIndex: "actions",
+      dataIndex: "actions",
-          key: "actions",
+      key: "actions",
-          render: (text, record) => (
+      render: (text, record) => (
-            <Space wrap>
+        <Space wrap>
-              {techConsole && (
+          {techConsole && (
-                <TimeTicketEnterButton
+            <TimeTicketEnterButton
-                  actions={{ refetch }}
+              actions={{ refetch }}
-                  context={{ id: record.id, timeticket: record }}
+              context={{ id: record.id, timeticket: record }}
-                  disabled={!record.job || disabled}
+              disabled={!record.job || disabled}
-                >
+            >
-                  <EditFilled />
+              <EditFilled />
-                </TimeTicketEnterButton>
+            </TimeTicketEnterButton>
-              )}
+          )}
-              {!techConsole && (
+          {!techConsole && (
-                <RbacWrapper
+            <TimeTicketEnterButton
-                  action="timetickets:edit"
+              actions={{ refetch }}
-                  noauth={() => {
+              context={{
-                    return <div />;
+                id: record.id,
-                  }}
+                timeticket: record
-                >
+              }}
-                  <TimeTicketEnterButton
+              disabled={isDisabled(record)}
-                    actions={{ refetch }}
+            >
-                    context={{
+              <EditFilled />
-                      id: record.id,
+            </TimeTicketEnterButton>
-                      timeticket: record
+          )}
-                    }}
+        </Space>
-                    disabled={
+      )
-                      HasRbacAccess({
+    }
-                        bodyshop,
-                        authLevel: authLevel,
-                        action: "timetickets:editcommitted"
-                      }) &&
-                      HasRbacAccess({
-                        bodyshop,
-                        authLevel: authLevel,
-                        action: "timetickets:shiftedit"
-                      })
-                        ? disabled
-                        : !record.jobid
-                    }
-                  >
-                    <EditFilled />
-                  </TimeTicketEnterButton>
-                </RbacWrapper>
-              )}
-            </Space>
-          )
-        }
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {

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

@@ -329,7 +329,9 @@ export function LaborAllocationContainer({ jobid, loading, lineTicketData, hideT
         timetickets={lineTicketData.timetickets}
         adjustments={lineTicketData.jobs_by_pk.lbr_adjustments}
       />
-      {!hideTimeTickets && <TimeTicketList loading={loading} timetickets={lineTicketData.timetickets} techConsole />}
+      {!hideTimeTickets && (
+        <TimeTicketList loading={loading} timetickets={jobid ? lineTicketData.timetickets : []} techConsole />
+      )}
     </div>
   );
 }

client/src/components/update-alert/update-alert.component.jsx

@@ -1,13 +1,14 @@
 import { AlertOutlined } from "@ant-design/icons";
-import { Alert, Button, Col, Row, Space } from "antd";
+import { Alert, Button, Col, notification, Row, Space } from "antd";
 import i18n from "i18next";
-import React, { useEffect } from "react";
+import React, { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectUpdateAvailable } from "../../redux/application/application.selectors";
 import { useRegisterSW } from "virtual:pwa-register/react";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import useCountDown from "../../utils/countdownHook";
 
 const mapStateToProps = createStructuredSelector({
   updateAvailable: selectUpdateAvailable
@@ -19,6 +20,15 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function UpdateAlert({ updateAvailable }) {
   const { t } = useTranslation();
+  const [timerStarted, setTimerStarted] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [
+    timeLeft,
+    {
+      start //pause, resume, reset
+    }
+  ] = useCountDown(180000, 1000);
+
   const {
     offlineReady: [offlineReady],
     needRefresh: [needRefresh],
@@ -31,7 +41,7 @@ export function UpdateAlert({ updateAvailable }) {
           () => {
             r.update();
           },
-          10 * 60 * 1000
+          30 * 60 * 1000
         );
       }
     },
@@ -40,11 +50,43 @@ export function UpdateAlert({ updateAvailable }) {
     }
   });
 
+  const ReloadNewVersion = useCallback(() => {
+    setLoading(true);
+    updateServiceWorker(true);
+    setTimeout(() => {
+      window.location.reload(true);
+    }, 5000);
+  }, [updateServiceWorker]);
+
   useEffect(() => {
-    if (import.meta.env.DEV) {
+    if (needRefresh) {
-      console.log(`SW Status => Refresh? ${needRefresh} - offlineReady? ${offlineReady}`);
+      start();
+      setTimerStarted(true);
     }
-  }, [needRefresh, offlineReady]);
+  }, [start, needRefresh, offlineReady]);
+
+  useEffect(() => {
+    if (needRefresh && timerStarted && timeLeft < 60000) {
+      notification.open({
+        type: "warning",
+        closable: false,
+        duration: 65000,
+        key: "autoupdate",
+        message: t("general.actions.autoupdate", {
+          time: (timeLeft / 1000).toFixed(0),
+          app: InstanceRenderManager({
+            imex: "$t(titles.imexonline)",
+            rome: "$t(titles.romeonline)",
+            promanager: "$t(titles.promanager)"
+          })
+        }),
+        placement: "bottomRight"
+      });
+    }
+    if (needRefresh && timerStarted && timeLeft <= 0) {
+      ReloadNewVersion();
+    }
+  }, [timeLeft, t, needRefresh, ReloadNewVersion, timerStarted]);
 
   if (!needRefresh) return null;
 
@@ -75,9 +117,10 @@ export function UpdateAlert({ updateAvailable }) {
               <Button onClick={() => window.open("https://imex-online.noticeable.news/", "_blank")}>
                 {i18n.t("general.actions.viewreleasenotes")}
               </Button>
-              <Button type="primary" onClick={() => updateServiceWorker(true)}>
+              <Button loading={loading} type="primary" onClick={() => ReloadNewVersion()}>
-                {i18n.t("general.actions.refresh")}
+                {i18n.t("general.actions.refresh")} {`(${(timeLeft / 1000).toFixed(0)} s)`}
               </Button>
+              <Button onClick={() => start(300000)}>{i18n.t("general.actions.delay")}</Button>
             </Space>
           </Col>
         </Row>

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

@@ -5,7 +5,7 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 
 const { Option } = Select;
 
-//To be used as a form element only.
+// To be used as a form element only.
 
 const VendorSearchSelect = ({ value, onChange, options, onSelect, disabled, preferredMake, showPhone }, ref) => {
   const [option, setOption] = useState(value);
@@ -33,9 +33,25 @@ const VendorSearchSelect = ({ value, onChange, options, onSelect, disabled, pref
         if (!value || !options) return label;
         const discount = options?.find((o) => o.id === value)?.discount;
         return (
-          <div className="imex-flex-row" style={{ width: "100%" }}>
+          <div
-            <div style={{ flex: 1 }}>{label}</div>
+            style={{
-
+              display: "flex",
+              alignItems: "center",
+              flexWrap: "nowrap",
+              width: "100%"
+            }}
+          >
+            <div
+              style={{
+                flex: 1,
+                minWidth: 0,
+                overflow: "hidden",
+                textOverflow: "ellipsis",
+                whiteSpace: "nowrap"
+              }}
+            >
+              {label}
+            </div>
             {discount && discount !== 0 ? <Tag color="green">{`${discount * 100}%`}</Tag> : null}
           </div>
         );
@@ -45,36 +61,67 @@ const VendorSearchSelect = ({ value, onChange, options, onSelect, disabled, pref
       optionFilterProp="name"
       onSelect={onSelect}
       disabled={disabled || false}
-      optionLabelProp={"name"}
+      optionLabelProp="name"
     >
-      {favorites
+      {favorites &&
-        ? favorites.map((o) => (
+        favorites.map((o) => (
-            <Option key={`favorite-${o.id}`} value={o.id} name={o.name} discount={o.discount}>
+          <Option key={`favorite-${o.id}`} value={o.id} name={o.name} discount={o.discount}>
-              <div className="imex-flex-row">
+            <div
-                <div style={{ flex: 1 }}>{o.name}</div>
+              style={{
-                <Space style={{ marginLeft: "1rem" }}>
+                display: "flex",
-                  <HeartOutlined style={{ color: "red" }} />
+                alignItems: "center",
-                  {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
+                flexWrap: "nowrap",
-                  {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
+                width: "100%"
-                </Space>
+              }}
+            >
+              <div
+                style={{
+                  flex: 1,
+                  minWidth: 0,
+                  overflow: "hidden",
+                  textOverflow: "ellipsis",
+                  whiteSpace: "nowrap"
+                }}
+              >
+                {o.name}
               </div>
-            </Option>
+              <Space style={{ marginLeft: "1rem" }}>
-          ))
+                <HeartOutlined style={{ color: "red" }} />
-        : null}
+                {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
-      {options
+                {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
-        ? options.map((o) => (
+              </Space>
-            <Option key={o.id} value={o.id} name={o.name} discount={o.discount}>
+            </div>
-              <div className="imex-flex-row" style={{ width: "100%" }}>
+          </Option>
-                <div style={{ flex: 1 }}>{o.name}</div>
+        ))}
-
+      {options &&
-                <Space style={{ marginLeft: "1rem" }}>
+        options.map((o) => (
-                  {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
+          <Option key={o.id} value={o.id} name={o.name} discount={o.discount}>
-                  {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
+            <div
-                </Space>
+              style={{
+                display: "flex",
+                alignItems: "center",
+                flexWrap: "nowrap",
+                width: "100%"
+              }}
+            >
+              <div
+                style={{
+                  flex: 1,
+                  minWidth: 0,
+                  overflow: "hidden",
+                  textOverflow: "ellipsis",
+                  whiteSpace: "nowrap"
+                }}
+              >
+                {o.name}
               </div>
-            </Option>
+              <Space style={{ marginLeft: "1rem" }}>
-          ))
+                {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
-        : null}
+                {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
+              </Space>
+            </div>
+          </Option>
+        ))}
     </Select>
   );
 };

client/src/firebase/firebase.utils.js

@@ -5,7 +5,6 @@ import { getFirestore } from "firebase/firestore";
 import { getMessaging, getToken, onMessage } from "firebase/messaging";
 import { store } from "../redux/store";
 import axios from "axios";
-import { checkBeta } from "../utils/handleBeta";
 
 const config = JSON.parse(import.meta.env.VITE_APP_FIREBASE_CONFIG);
 initializeApp(config);
@@ -88,7 +87,7 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
     operationName: eventName,
     variables: additionalParams,
     dbevent: false,
-    env: checkBeta() ? "beta" : "master"
+    env: "master"
   });
   // console.log(
   //   "%c[Analytics]",

client/src/graphql/jobs.queries.js

@@ -2461,6 +2461,14 @@ export const SUBSCRIPTION_JOBS_IN_PRODUCTION = gql`
     }
   }
 `;
+export const SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW = gql`
+  subscription SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW {
+    jobs: jobs_inproduction {
+      id
+      updated_at
+    }
+  }
+`;
 
 export const QUERY_JOBS_IN_PRODUCTION = gql`
   query QUERY_JOBS_IN_PRODUCTION {

client/src/pages/production-board/production-board.component.jsx

@@ -1,6 +1,26 @@
 import React from "react";
 import ProductionBoardKanbanContainer from "../../components/production-board-kanban/production-board-kanban.container";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(ProductionBoardComponent);
 
-export default function ProductionBoardComponent() {
+export function ProductionBoardComponent({ bodyshop }) {
-  return <ProductionBoardKanbanContainer />;
+  const {
+    treatments: { Production_Use_View }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["Production_Use_View"],
+    splitKey: bodyshop && bodyshop.imexshopid
+  });
+
+  return <ProductionBoardKanbanContainer subscriptionType={Production_Use_View.treatment} />;
 }

client/src/pages/production-list/production-list.component.jsx

@@ -2,11 +2,31 @@ import React from "react";
 import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";
 import ProductionListTable from "../../components/production-list-table/production-list-table.container";
 
-export default function ProductionListComponent() {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(ProductionListComponent);
+
+export function ProductionListComponent({ bodyshop }) {
+  const {
+    treatments: { Production_Use_View }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["Production_Use_View"],
+    splitKey: bodyshop && bodyshop.imexshopid
+  });
+
   return (
     <>
       <NoteUpsertModal />
-      <ProductionListTable />
+      <ProductionListTable subscriptionType={Production_Use_View.treatment} />
     </>
   );
 }

client/src/pages/tech-lookup/tech-lookup.container.jsx

@@ -3,6 +3,7 @@ import { useTranslation } from "react-i18next";
 import RbacWrapperComponent from "../../components/rbac-wrapper/rbac-wrapper.component";
 import TechLookupJobsList from "../../components/tech-lookup-jobs-list/tech-lookup-jobs-list.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import TechLookupJobsDrawer from "../../components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component";
 
 export default function TechLookupContainer() {
   const { t } = useTranslation();
@@ -20,6 +21,7 @@ export default function TechLookupContainer() {
   return (
     <div>
       <RbacWrapperComponent action="jobs:list-active">
+        <TechLookupJobsDrawer />
         <TechLookupJobsList />
       </RbacWrapperComponent>
     </div>

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

@@ -9,7 +9,6 @@ import ErrorBoundary from "../../components/error-boundary/error-boundary.compon
 import FeatureWrapper from "../../components/feature-wrapper/feature-wrapper.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import TechHeader from "../../components/tech-header/tech-header.component";
-import TechLookupJobsDrawer from "../../components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component";
 import TechSider from "../../components/tech-sider/tech-sider.component";
 import UpdateAlert from "../../components/update-alert/update-alert.component";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
@@ -68,7 +67,7 @@ export function TechPage({ technician }) {
       <Layout>
         <UpdateAlert />
         <TechHeader />
-        <TechLookupJobsDrawer />
+
         <TaskUpsertModalContainer />
         <Content className="tech-content-container">
           <ErrorBoundary>

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

@@ -10,7 +10,7 @@ import {
   signInWithEmailAndPassword,
   signOut
 } from "firebase/auth";
-import { doc, getDoc, setDoc } from "firebase/firestore";
+import { arrayUnion, doc, getDoc, setDoc, updateDoc } from "firebase/firestore";
 import { getToken } from "firebase/messaging";
 import i18next from "i18next";
 import LogRocket from "logrocket";
@@ -48,6 +48,7 @@ import {
   validatePasswordResetSuccess
 } from "./user.actions";
 import UserActionTypes from "./user.types";
+import cleanAxios from "../../utils/CleanAxios";
 
 const fpPromise = FingerprintJS.load();
 
@@ -177,10 +178,24 @@ export function* setInstanceIdSaga({ payload: uid }) {
     // Get the visitor identifier when you need it.
     const fp = yield fpPromise;
     const result = yield fp.get();
-    yield setDoc(userInstanceRef, {
+    const res = yield cleanAxios.get("https://api.ipify.org/?format=json");
-      timestamp: new Date(),
+    const udoc = yield getDoc(userInstanceRef);
-      fingerprint: result.visitorId
+
-    });
+    if (!udoc.data()) {
+      yield setDoc(userInstanceRef, {
+        timestamp: new Date(),
+        fingerprint: result.visitorId,
+        //totalFingerprint: result,
+        ip: [res.data.ip]
+      });
+    } else {
+      yield updateDoc(userInstanceRef, {
+        timestamp: new Date(),
+        fingerprint: result.visitorId,
+        //totalFingerprint: result,
+        ip: arrayUnion(res.data.ip)
+      });
+    }
 
     yield put(setLocalFingerprint(result.visitorId));
     yield delay(5 * 60 * 1000);

client/src/translations/en_us/common.json

@@ -230,7 +230,7 @@
         "markexported": "Mark Exported",
         "markforreexport": "Mark for Re-export",
         "new": "New Bill",
-        "nobilllines": "This part has not yet been recieved.",
+        "nobilllines": "",
         "noneselected": "No bill selected.",
         "onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced, exported, or voided.",
         "printlabels": "Print Labels",
@@ -270,9 +270,9 @@
         "testrender": "Test Render"
       },
       "errors": {
+        "creatingdefaultview": "Error creating default view.",
         "loading": "Unable to load shop details. Please call technical support.",
-        "saving": "Error encountered while saving. {{message}}",
+        "saving": "Error encountered while saving. {{message}}"
-        "creatingdefaultview": "Error creating default view."
       },
       "fields": {
         "ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
@@ -285,19 +285,21 @@
         },
         "appt_length": "Default Appointment Length",
         "attach_pdf_to_email": "Attach PDF copy to sent emails?",
+        "batchid": "ADP Batch ID",
         "bill_allow_post_to_closed": "Allow Bills to be posted to Closed Jobs",
         "bill_federal_tax_rate": "Bills - Federal Tax Rate %",
         "bill_local_tax_rate": "Bill - Local Tax Rate %",
         "bill_state_tax_rate": "Bill - Provincial/State Tax Rate %",
         "city": "City",
         "closingperiod": "Closing Period",
+        "companycode": "ADP Company Code",
         "country": "Country",
         "dailybodytarget": "Scoreboard - Daily Body Target",
         "dailypainttarget": "Scoreboard - Daily Paint Target",
         "default_adjustment_rate": "Default Labor Deduction Adjustment Rate",
         "deliver": {
-          "templates": "Delivery Templates",
+          "require_actual_delivery_date": "Require Actual Delivery",
-          "require_actual_delivery_date": "Require Actual Delivery"
+          "templates": "Delivery Templates"
         },
         "dms": {
           "apcontrol": "AP Control Number",
@@ -700,10 +702,10 @@
         "workingdays": "Working Days"
       },
       "successes": {
-        "save": "Shop configuration saved successfully. ",
-        "unsavedchanges": "Unsaved changes will be lost. Are you sure you want to continue?",
         "areyousure": "Are you sure you want to continue?",
-        "defaultviewcreated": "Default view created successfully."
+        "defaultviewcreated": "Default view created successfully.",
+        "save": "Shop configuration saved successfully. ",
+        "unsavedchanges": "Unsaved changes will be lost. Are you sure you want to continue?"
       },
       "validation": {
         "centermustexist": "The chosen responsibility center does not exist.",
@@ -1133,8 +1135,8 @@
     },
     "general": {
       "actions": {
-        "defaults": "Defaults",
         "add": "Add",
+        "autoupdate": "{{app}} will automatically update in {{time}} seconds. Please save all changes.",
         "calculate": "Calculate",
         "cancel": "Cancel",
         "clear": "Clear",
@@ -1142,6 +1144,8 @@
         "copied": "Copied!",
         "copylink": "Copy Link",
         "create": "Create",
+        "defaults": "Defaults",
+        "delay": "Delay Update (5 mins)",
         "delete": "Delete",
         "deleteall": "Delete All",
         "deselectall": "Deselect All",
@@ -1153,10 +1157,12 @@
         "print": "Print",
         "refresh": "Refresh",
         "remove": "Remove",
+        "remove_alert": "Are you sure you want to dismiss the alert?",
         "reset": "Reset your changes.",
         "resetpassword": "Reset Password",
         "save": "Save",
         "saveandnew": "Save and New",
+        "saveas": "Save As",
         "selectall": "Select All",
         "send": "Send",
         "sendbysms": "Send by SMS",
@@ -1164,9 +1170,7 @@
         "submit": "Submit",
         "tryagain": "Try Again",
         "view": "View",
-        "viewreleasenotes": "See What's Changed",
+        "viewreleasenotes": "See What's Changed"
-        "remove_alert": "Are you sure you want to dismiss the alert?",
-        "saveas": "Save As"
       },
       "errors": {
         "fcm": "You must allow notification permissions to have real time messaging.  Click to try again.",
@@ -1181,7 +1185,6 @@
         "vehicle": "Vehicle"
       },
       "labels": {
-        "unsavedchanges": "Unsaved changes.",
         "actions": "Actions",
         "areyousure": "Are you sure?",
         "barcode": "Barcode",
@@ -1250,6 +1253,7 @@
         "tuesday": "Tuesday",
         "tvmode": "TV Mode",
         "unknown": "Unknown",
+        "unsavedchanges": "Unsaved changes.",
         "username": "Username",
         "view": "View",
         "wednesday": "Wednesday",
@@ -2739,41 +2743,6 @@
       }
     },
     "production": {
-      "constants": {
-        "main_profile": "Default"
-      },
-      "options": {
-        "small": "Small",
-        "medium": "Medium",
-        "large": "Large",
-        "vertical": "Vertical",
-        "horizontal": "Horizontal"
-      },
-      "settings": {
-        "layout": "Layout",
-        "information": "Information",
-        "statistics_title": "Statistics",
-        "board_settings": "Board Settings",
-        "filters_title": "Filters",
-        "filters": {
-          "md_ins_cos": "Insurance Companies",
-          "md_estimators": "Estimators"
-        },
-        "statistics": {
-          "total_hours_in_production": "Hours in Production",
-          "total_lab_in_production": "Body Hours in Production",
-          "total_lar_in_production": "Refinish Hours in Production",
-          "total_amount_in_production": "Dollars in Production",
-          "jobs_in_production": "Jobs in Production",
-          "total_hours_on_board": "Hours on Board",
-          "total_lab_on_board": "Body Hours on Board",
-          "total_lar_on_board": "Refinish Hours on Board",
-          "total_amount_on_board": "Dollars on Board",
-          "total_jobs_on_board": "Jobs on Board",
-          "tasks_in_production": "Tasks in Production",
-          "tasks_on_board": "Tasks on Board"
-        }
-      },
       "actions": {
         "addcolumns": "Add Columns",
         "bodypriority-clear": "Clear Body Priority",
@@ -2788,29 +2757,23 @@
         "suspend": "Suspend",
         "unsuspend": "Unsuspend"
       },
+      "constants": {
+        "main_profile": "Default"
+      },
       "errors": {
         "boardupdate": "Error encountered updating Job. {{message}}",
-        "removing": "Error removing from production board. {{error}}",
-        "settings": "Error saving board settings: {{error}}",
         "name_exists": "A Profile with this name already exists. Please choose a different name.",
-        "name_required": "Profile name is required."
+        "name_required": "Profile name is required.",
+        "removing": "Error removing from production board. {{error}}",
+        "settings": "Error saving board settings: {{error}}"
       },
       "labels": {
-        "kiosk_mode": "Kiosk Mode",
-        "on": "On",
-        "off": "Off",
-        "wide": "Wide",
-        "tall": "Tall",
-        "vertical": "Vertical",
-        "horizontal": "Horizontal",
-        "orientation": "Board Orientation",
-        "card_size": "Card Size",
-        "model_info": "Vehicle Info",
         "actual_in": "Actual In",
+        "addnewprofile": "Add New Profile",
         "alert": "Alert",
-        "tasks": "Tasks",
         "alertoff": "Remove alert from Job",
         "alerton": "Add alert to Job",
+        "alerts": "Alerts",
         "ats": "Alternative Transportation",
         "bodyhours": "B",
         "bodypriority": "B/P",
@@ -2820,6 +2783,7 @@
             "qbo_usa": "QBO USA"
           }
         },
+        "card_size": "Card Size",
         "cardcolor": "Colored Cards",
         "cardsettings": "Card Settings",
         "clm_no": "Claim Number",
@@ -2828,48 +2792,88 @@
         "detailpriority": "D/P",
         "employeeassignments": "Employee Assignments",
         "employeesearch": "Employee Search",
+        "estimator": "Estimator",
+        "horizontal": "Horizontal",
         "ins_co_nm": "Insurance Company Name",
         "jobdetail": "Job Details",
+        "kiosk_mode": "Kiosk Mode",
         "laborhrs": "Labor Hours",
         "legend": "Legend:",
+        "model_info": "Vehicle Info",
         "note": "Production Note",
+        "off": "Off",
+        "on": "On",
+        "orientation": "Board Orientation",
         "ownr_nm": "Customer Name",
         "paintpriority": "P/P",
         "partsstatus": "Parts Status",
-        "estimator": "Estimator",
-        "subtotal": "Subtotal",
         "production_note": "Production Note",
         "refinishhours": "R",
         "scheduled_completion": "Scheduled Completion",
         "selectview": "Select a View",
         "stickyheader": "Sticky Header (BETA)",
         "sublets": "Sublets",
+        "subtotal": "Subtotal",
+        "tall": "Tall",
+        "tasks": "Tasks",
         "totalhours": "Total Hrs ",
         "touchtime": "T/T",
+        "vertical": "Vertical",
         "viewname": "View Name",
-        "alerts": "Alerts",
+        "wide": "Wide"
-        "addnewprofile": "Add New Profile"
+      },
+      "options": {
+        "horizontal": "Horizontal",
+        "large": "Large",
+        "medium": "Medium",
+        "small": "Small",
+        "vertical": "Vertical"
+      },
+      "settings": {
+        "board_settings": "Board Settings",
+        "filters": {
+          "md_estimators": "Estimators",
+          "md_ins_cos": "Insurance Companies"
+        },
+        "filters_title": "Filters",
+        "information": "Information",
+        "layout": "Layout",
+        "statistics": {
+          "jobs_in_production": "Jobs in Production",
+          "tasks_in_production": "Tasks in Production",
+          "tasks_on_board": "Tasks on Board",
+          "total_amount_in_production": "Dollars in Production",
+          "total_amount_on_board": "Dollars on Board",
+          "total_hours_in_production": "Hours in Production",
+          "total_hours_on_board": "Hours on Board",
+          "total_jobs_on_board": "Jobs on Board",
+          "total_lab_in_production": "Body Hours in Production",
+          "total_lab_on_board": "Body Hours on Board",
+          "total_lar_in_production": "Refinish Hours in Production",
+          "total_lar_on_board": "Refinish Hours on Board"
+        },
+        "statistics_title": "Statistics"
+      },
+      "statistics": {
+        "currency_symbol": "$",
+        "hours": "Hours",
+        "jobs": "Jobs",
+        "jobs_in_production": "Jobs in Production",
+        "tasks": "Tasks",
+        "tasks_in_production": "Tasks in Production",
+        "tasks_on_board": "Tasks on Board",
+        "total_amount_in_production": "Dollars in Production",
+        "total_amount_on_board": "Dollars on Board",
+        "total_hours_in_production": "Hours in Production",
+        "total_hours_on_board": "Hours on Board",
+        "total_jobs_on_board": "Jobs on Board",
+        "total_lab_in_production": "Body Hours in Production",
+        "total_lab_on_board": "Body Hours on Board",
+        "total_lar_in_production": "Refinish Hours in Production",
+        "total_lar_on_board": "Refinish Hours on Board"
       },
       "successes": {
         "removed": "Job removed from production."
-      },
-      "statistics": {
-        "total_hours_in_production": "Hours in Production",
-        "total_lab_in_production": "Body Hours in Production",
-        "total_lar_in_production": "Refinish Hours in Production",
-        "total_amount_in_production": "Dollars in Production",
-        "jobs_in_production": "Jobs in Production",
-        "total_hours_on_board": "Hours on Board",
-        "total_lab_on_board": "Body Hours on Board",
-        "total_lar_on_board": "Refinish Hours on Board",
-        "total_amount_on_board": "Dollars on Board",
-        "total_jobs_on_board": "Jobs on Board",
-        "tasks_in_production": "Tasks in Production",
-        "tasks_on_board": "Tasks on Board",
-        "tasks": "Tasks",
-        "hours": "Hours",
-        "currency_symbol": "$",
-        "jobs": "Jobs"
       }
     },
     "profile": {
@@ -2927,6 +2931,8 @@
         "vendor": "Vendor"
       },
       "templates": {
+        "adp_payroll_flat": "ADP Payroll - Flat Rate",
+        "adp_payroll_straight": "ADP Payroll - Straight Time",
         "anticipated_revenue": "Anticipated Revenue",
         "ar_aging": "AR Aging",
         "attendance_detail": "Attendance (All Employees)",
@@ -3418,6 +3424,18 @@
       "vehicledetail": "Vehicle Details {{vehicle}} | {{app}}",
       "vehicles": "All Vehicles | {{app}}"
     },
+    "trello": {
+      "labels": {
+        "add_card": "Add Card",
+        "add_lane": "Add Lane",
+        "cancel": "Cancel",
+        "delete_lane": "Delete Lane",
+        "description": "Description",
+        "label": "Label",
+        "lane_actions": "Lane Actions",
+        "title": "Title"
+      }
+    },
     "tt_approvals": {
       "actions": {
         "approveselected": "Approve Selected"
@@ -3556,18 +3574,6 @@
       "validation": {
         "unique_vendor_name": "You must enter a unique vendor name."
       }
-    },
-    "trello": {
-      "labels": {
-        "add_card": "Add Card",
-        "add_lane": "Add Lane",
-        "delete_lane": "Delete Lane",
-        "lane_actions": "Lane Actions",
-        "title": "Title",
-        "description": "Description",
-        "label": "Label",
-        "cancel": "Cancel"
-      }
     }
   }
 }

client/src/translations/es/common.json

@@ -270,9 +270,9 @@
         "testrender": ""
       },
       "errors": {
+        "creatingdefaultview": "",
         "loading": "No se pueden cargar los detalles de la tienda. Por favor llame al soporte técnico.",
-        "saving": "",
+        "saving": ""
-        "creatingdefaultview": ""
       },
       "fields": {
         "ReceivableCustomField": "",
@@ -285,19 +285,21 @@
         },
         "appt_length": "",
         "attach_pdf_to_email": "",
+        "batchid": "",
         "bill_allow_post_to_closed": "",
         "bill_federal_tax_rate": "",
         "bill_local_tax_rate": "",
         "bill_state_tax_rate": "",
         "city": "",
         "closingperiod": "",
+        "companycode": "",
         "country": "",
         "dailybodytarget": "",
         "dailypainttarget": "",
         "default_adjustment_rate": "",
         "deliver": {
-          "templates": "",
+          "require_actual_delivery_date": "",
-          "require_actual_delivery_date": ""
+          "templates": ""
         },
         "dms": {
           "apcontrol": "",
@@ -700,10 +702,10 @@
         "workingdays": ""
       },
       "successes": {
-        "save": "",
-        "unsavedchanges": "",
         "areyousure": "",
-        "defaultviewcreated": ""
+        "defaultviewcreated": "",
+        "save": "",
+        "unsavedchanges": ""
       },
       "validation": {
         "centermustexist": "",
@@ -1133,8 +1135,8 @@
     },
     "general": {
       "actions": {
-        "defaults": "defaults",
         "add": "",
+        "autoupdate": "",
         "calculate": "",
         "cancel": "",
         "clear": "",
@@ -1142,6 +1144,8 @@
         "copied": "",
         "copylink": "",
         "create": "",
+        "defaults": "defaults",
+        "delay": "",
         "delete": "Borrar",
         "deleteall": "",
         "deselectall": "",
@@ -1153,10 +1157,12 @@
         "print": "",
         "refresh": "",
         "remove": "",
+        "remove_alert": "",
         "reset": " Restablecer a original.",
         "resetpassword": "",
         "save": "Salvar",
         "saveandnew": "",
+        "saveas": "",
         "selectall": "",
         "send": "",
         "sendbysms": "",
@@ -1164,9 +1170,7 @@
         "submit": "",
         "tryagain": "",
         "view": "",
-        "viewreleasenotes": "",
+        "viewreleasenotes": ""
-        "remove_alert": "",
-        "saveas": ""
       },
       "errors": {
         "fcm": "",
@@ -1181,7 +1185,6 @@
         "vehicle": ""
       },
       "labels": {
-        "unsavedchanges": "",
         "actions": "Comportamiento",
         "areyousure": "",
         "barcode": "código de barras",
@@ -1250,6 +1253,7 @@
         "tuesday": "",
         "tvmode": "",
         "unknown": "Desconocido",
+        "unsavedchanges": "",
         "username": "",
         "view": "",
         "wednesday": "",
@@ -2739,41 +2743,6 @@
       }
     },
     "production": {
-      "constants": {
-        "main_profile": ""
-      },
-      "options": {
-        "small": "",
-        "medium": "",
-        "large": "",
-        "vertical": "",
-        "horizontal": ""
-      },
-      "settings": {
-        "layout": "",
-        "information": "",
-        "statistics_title": "",
-        "board_settings": "",
-        "filters_title": "",
-        "filters": {
-          "md_ins_cos": "",
-          "md_estimators": ""
-        },
-        "statistics": {
-          "total_hours_in_production": "",
-          "total_lab_in_production": "",
-          "total_lar_in_production": "",
-          "total_amount_in_production": "",
-          "jobs_in_production": "",
-          "total_hours_on_board": "",
-          "total_lab_on_board": "",
-          "total_lar_on_board": "",
-          "total_amount_on_board": "",
-          "total_jobs_on_board": "",
-          "tasks_in_production": "",
-          "tasks_on_board": ""
-        }
-      },
       "actions": {
         "addcolumns": "",
         "bodypriority-clear": "",
@@ -2788,29 +2757,23 @@
         "suspend": "",
         "unsuspend": ""
       },
+      "constants": {
+        "main_profile": ""
+      },
       "errors": {
         "boardupdate": "",
-        "removing": "",
-        "settings": "",
         "name_exists": "",
-        "name_required": ""
+        "name_required": "",
+        "removing": "",
+        "settings": ""
       },
       "labels": {
-        "kiosk_mode": "",
-        "on": "",
-        "off": "",
-        "wide": "",
-        "tall": "",
-        "vertical": "",
-        "horizontal": "",
-        "orientation": "",
-        "card_size": "",
-        "model_info": "",
         "actual_in": "",
+        "addnewprofile": "",
         "alert": "",
-        "tasks": "",
         "alertoff": "",
         "alerton": "",
+        "alerts": "",
         "ats": "",
         "bodyhours": "",
         "bodypriority": "",
@@ -2820,6 +2783,7 @@
             "qbo_usa": ""
           }
         },
+        "card_size": "",
         "cardcolor": "",
         "cardsettings": "",
         "clm_no": "",
@@ -2828,48 +2792,88 @@
         "detailpriority": "",
         "employeeassignments": "",
         "employeesearch": "",
+        "estimator": "",
+        "horizontal": "",
         "ins_co_nm": "",
         "jobdetail": "",
+        "kiosk_mode": "",
         "laborhrs": "",
         "legend": "",
+        "model_info": "",
         "note": "",
+        "off": "",
+        "on": "",
+        "orientation": "",
         "ownr_nm": "",
         "paintpriority": "",
         "partsstatus": "",
-        "estimator": "",
-        "subtotal": "",
         "production_note": "",
         "refinishhours": "",
         "scheduled_completion": "",
         "selectview": "",
         "stickyheader": "",
         "sublets": "",
+        "subtotal": "",
+        "tall": "",
+        "tasks": "",
         "totalhours": "",
         "touchtime": "",
+        "vertical": "",
         "viewname": "",
-        "alerts": "",
+        "wide": ""
-        "addnewprofile": ""
+      },
+      "options": {
+        "horizontal": "",
+        "large": "",
+        "medium": "",
+        "small": "",
+        "vertical": ""
+      },
+      "settings": {
+        "board_settings": "",
+        "filters": {
+          "md_estimators": "",
+          "md_ins_cos": ""
+        },
+        "filters_title": "",
+        "information": "",
+        "layout": "",
+        "statistics": {
+          "jobs_in_production": "",
+          "tasks_in_production": "",
+          "tasks_on_board": "",
+          "total_amount_in_production": "",
+          "total_amount_on_board": "",
+          "total_hours_in_production": "",
+          "total_hours_on_board": "",
+          "total_jobs_on_board": "",
+          "total_lab_in_production": "",
+          "total_lab_on_board": "",
+          "total_lar_in_production": "",
+          "total_lar_on_board": ""
+        },
+        "statistics_title": ""
+      },
+      "statistics": {
+        "currency_symbol": "",
+        "hours": "",
+        "jobs": "",
+        "jobs_in_production": "",
+        "tasks": "",
+        "tasks_in_production": "",
+        "tasks_on_board": "",
+        "total_amount_in_production": "",
+        "total_amount_on_board": "",
+        "total_hours_in_production": "",
+        "total_hours_on_board": "",
+        "total_jobs_on_board": "",
+        "total_lab_in_production": "",
+        "total_lab_on_board": "",
+        "total_lar_in_production": "",
+        "total_lar_on_board": ""
       },
       "successes": {
         "removed": ""
-      },
-      "statistics": {
-        "total_hours_in_production": "",
-        "total_lab_in_production": "",
-        "total_lar_in_production": "",
-        "total_amount_in_production": "",
-        "jobs_in_production": "",
-        "total_hours_on_board": "",
-        "total_lab_on_board": "",
-        "total_lar_on_board": "",
-        "total_amount_on_board": "",
-        "total_jobs_on_board": "",
-        "tasks_in_production": "",
-        "tasks_on_board": "",
-        "tasks": "",
-        "hours": "",
-        "currency_symbol": "",
-        "jobs": ""
       }
     },
     "profile": {
@@ -2927,6 +2931,8 @@
         "vendor": ""
       },
       "templates": {
+        "adp_payroll_flat": "",
+        "adp_payroll_straight": "",
         "anticipated_revenue": "",
         "ar_aging": "",
         "attendance_detail": "",
@@ -3418,6 +3424,18 @@
       "vehicledetail": "Detalles del vehículo {{vehicle}} | {{app}}",
       "vehicles": "Todos los vehiculos | {{app}}"
     },
+    "trello": {
+      "labels": {
+        "add_card": "",
+        "add_lane": "",
+        "cancel": "",
+        "delete_lane": "",
+        "description": "",
+        "label": "",
+        "lane_actions": "",
+        "title": ""
+      }
+    },
     "tt_approvals": {
       "actions": {
         "approveselected": ""
@@ -3556,18 +3574,6 @@
       "validation": {
         "unique_vendor_name": ""
       }
-    },
-    "trello": {
-      "labels": {
-        "add_card": "",
-        "add_lane": "",
-        "delete_lane": "",
-        "lane_actions": "",
-        "title": "",
-        "description": "",
-        "label": "",
-        "cancel": ""
-      }
     }
   }
 }

client/src/translations/fr/common.json

@@ -270,9 +270,9 @@
         "testrender": ""
       },
       "errors": {
+        "creatingdefaultview": "",
         "loading": "Impossible de charger les détails de la boutique. Veuillez appeler le support technique.",
-        "saving": "",
+        "saving": ""
-        "creatingdefaultview": ""
       },
       "fields": {
         "ReceivableCustomField": "",
@@ -285,19 +285,21 @@
         },
         "appt_length": "",
         "attach_pdf_to_email": "",
+        "batchid": "",
         "bill_allow_post_to_closed": "",
         "bill_federal_tax_rate": "",
         "bill_local_tax_rate": "",
         "bill_state_tax_rate": "",
         "city": "",
         "closingperiod": "",
+        "companycode": "",
         "country": "",
         "dailybodytarget": "",
         "dailypainttarget": "",
         "default_adjustment_rate": "",
         "deliver": {
-          "templates": "",
+          "require_actual_delivery_date": "",
-          "require_actual_delivery_date": ""
+          "templates": ""
         },
         "dms": {
           "apcontrol": "",
@@ -700,10 +702,10 @@
         "workingdays": ""
       },
       "successes": {
-        "save": "",
-        "unsavedchanges": "",
         "areyousure": "",
-        "defaultviewcreated": ""
+        "defaultviewcreated": "",
+        "save": "",
+        "unsavedchanges": ""
       },
       "validation": {
         "centermustexist": "",
@@ -1133,8 +1135,8 @@
     },
     "general": {
       "actions": {
-        "defaults": "",
         "add": "",
+        "autoupdate": "",
         "calculate": "",
         "cancel": "",
         "clear": "",
@@ -1142,6 +1144,8 @@
         "copied": "",
         "copylink": "",
         "create": "",
+        "defaults": "",
+        "delay": "",
         "delete": "Effacer",
         "deleteall": "",
         "deselectall": "",
@@ -1153,10 +1157,12 @@
         "print": "",
         "refresh": "",
         "remove": "",
+        "remove_alert": "",
         "reset": " Rétablir l'original.",
         "resetpassword": "",
         "save": "sauvegarder",
         "saveandnew": "",
+        "saveas": "",
         "selectall": "",
         "send": "",
         "sendbysms": "",
@@ -1164,9 +1170,7 @@
         "submit": "",
         "tryagain": "",
         "view": "",
-        "viewreleasenotes": "",
+        "viewreleasenotes": ""
-        "remove_alert": "",
-        "saveas": ""
       },
       "errors": {
         "fcm": "",
@@ -1181,7 +1185,6 @@
         "vehicle": ""
       },
       "labels": {
-        "unsavedchanges": "",
         "actions": "actes",
         "areyousure": "",
         "barcode": "code à barre",
@@ -1250,6 +1253,7 @@
         "tuesday": "",
         "tvmode": "",
         "unknown": "Inconnu",
+        "unsavedchanges": "",
         "username": "",
         "view": "",
         "wednesday": "",
@@ -2739,41 +2743,6 @@
       }
     },
     "production": {
-      "constants": {
-        "main_profile": ""
-      },
-      "options": {
-        "small": "",
-        "medium": "",
-        "large": "",
-        "vertical": "",
-        "horizontal": ""
-      },
-      "settings": {
-        "layout": "",
-        "information": "",
-        "statistics_title": "",
-        "board_settings": "",
-        "filters_title": "",
-        "filters": {
-          "md_ins_cos": "",
-          "md_estimators": ""
-        },
-        "statistics": {
-          "total_hours_in_production": "",
-          "total_lab_in_production": "",
-          "total_lar_in_production": "",
-          "total_amount_in_production": "",
-          "jobs_in_production": "",
-          "total_hours_on_board": "",
-          "total_lab_on_board": "",
-          "total_lar_on_board": "",
-          "total_amount_on_board": "",
-          "total_jobs_on_board": "",
-          "tasks_in_production": "",
-          "tasks_on_board": ""
-        }
-      },
       "actions": {
         "addcolumns": "",
         "bodypriority-clear": "",
@@ -2788,29 +2757,23 @@
         "suspend": "",
         "unsuspend": ""
       },
+      "constants": {
+        "main_profile": ""
+      },
       "errors": {
         "boardupdate": "",
-        "removing": "",
-        "settings": "",
         "name_exists": "",
-        "name_required": ""
+        "name_required": "",
+        "removing": "",
+        "settings": ""
       },
       "labels": {
-        "kiosk_mode": "",
-        "on": "",
-        "off": "",
-        "wide": "",
-        "tall": "",
-        "vertical": "",
-        "horizontal": "",
-        "orientation": "",
-        "card_size": "",
-        "model_info": "",
         "actual_in": "",
+        "addnewprofile": "",
         "alert": "",
-        "tasks": "",
         "alertoff": "",
         "alerton": "",
+        "alerts": "",
         "ats": "",
         "bodyhours": "",
         "bodypriority": "",
@@ -2820,6 +2783,7 @@
             "qbo_usa": ""
           }
         },
+        "card_size": "",
         "cardcolor": "",
         "cardsettings": "",
         "clm_no": "",
@@ -2828,48 +2792,88 @@
         "detailpriority": "",
         "employeeassignments": "",
         "employeesearch": "",
+        "estimator": "",
+        "horizontal": "",
         "ins_co_nm": "",
         "jobdetail": "",
+        "kiosk_mode": "",
         "laborhrs": "",
         "legend": "",
+        "model_info": "",
         "note": "",
+        "off": "",
+        "on": "",
+        "orientation": "",
         "ownr_nm": "",
         "paintpriority": "",
         "partsstatus": "",
-        "estimator": "",
-        "subtotal": "",
         "production_note": "",
         "refinishhours": "",
         "scheduled_completion": "",
         "selectview": "",
         "stickyheader": "",
         "sublets": "",
+        "subtotal": "",
+        "tall": "",
+        "tasks": "",
         "totalhours": "",
         "touchtime": "",
+        "vertical": "",
         "viewname": "",
-        "alerts": "",
+        "wide": ""
-        "addnewprofile": ""
+      },
+      "options": {
+        "horizontal": "",
+        "large": "",
+        "medium": "",
+        "small": "",
+        "vertical": ""
+      },
+      "settings": {
+        "board_settings": "",
+        "filters": {
+          "md_estimators": "",
+          "md_ins_cos": ""
+        },
+        "filters_title": "",
+        "information": "",
+        "layout": "",
+        "statistics": {
+          "jobs_in_production": "",
+          "tasks_in_production": "",
+          "tasks_on_board": "",
+          "total_amount_in_production": "",
+          "total_amount_on_board": "",
+          "total_hours_in_production": "",
+          "total_hours_on_board": "",
+          "total_jobs_on_board": "",
+          "total_lab_in_production": "",
+          "total_lab_on_board": "",
+          "total_lar_in_production": "",
+          "total_lar_on_board": ""
+        },
+        "statistics_title": ""
+      },
+      "statistics": {
+        "currency_symbol": "",
+        "hours": "",
+        "jobs": "",
+        "jobs_in_production": "",
+        "tasks": "",
+        "tasks_in_production": "",
+        "tasks_on_board": "",
+        "total_amount_in_production": "",
+        "total_amount_on_board": "",
+        "total_hours_in_production": "",
+        "total_hours_on_board": "",
+        "total_jobs_on_board": "",
+        "total_lab_in_production": "",
+        "total_lab_on_board": "",
+        "total_lar_in_production": "",
+        "total_lar_on_board": ""
       },
       "successes": {
         "removed": ""
-      },
-      "statistics": {
-        "total_hours_in_production": "",
-        "total_lab_in_production": "",
-        "total_lar_in_production": "",
-        "total_amount_in_production": "",
-        "jobs_in_production": "",
-        "total_hours_on_board": "",
-        "total_lab_on_board": "",
-        "total_lar_on_board": "",
-        "total_amount_on_board": "",
-        "total_jobs_on_board": "",
-        "tasks_in_production": "",
-        "tasks_on_board": "",
-        "tasks": "",
-        "hours": "",
-        "currency_symbol": "",
-        "jobs": ""
       }
     },
     "profile": {
@@ -2927,6 +2931,8 @@
         "vendor": ""
       },
       "templates": {
+        "adp_payroll_flat": "",
+        "adp_payroll_straight": "",
         "anticipated_revenue": "",
         "ar_aging": "",
         "attendance_detail": "",
@@ -3418,6 +3424,18 @@
       "vehicledetail": "Détails du véhicule {{vehicle} | {{app}}",
       "vehicles": "Tous les véhicules | {{app}}"
     },
+    "trello": {
+      "labels": {
+        "add_card": "",
+        "add_lane": "",
+        "cancel": "",
+        "delete_lane": "",
+        "description": "",
+        "label": "",
+        "lane_actions": "",
+        "title": ""
+      }
+    },
     "tt_approvals": {
       "actions": {
         "approveselected": ""
@@ -3556,18 +3574,6 @@
       "validation": {
         "unique_vendor_name": ""
       }
-    },
-    "trello": {
-      "labels": {
-        "add_card": "",
-        "add_lane": "",
-        "delete_lane": "",
-        "lane_actions": "",
-        "title": "",
-        "description": "",
-        "label": "",
-        "cancel": ""
-      }
     }
   }
 }

client/src/utils/TemplateConstants.js

@@ -2158,6 +2158,32 @@ export const TemplateList = (type, context) => {
               field: i18n.t("tasks.fields.created_at")
             },
             group: "jobs"
+          },
+          adp_payroll_flat: {
+            title: i18n.t("reportcenter.templates.adp_payroll_flat"),
+            subject: i18n.t("reportcenter.templates.adp_payroll_flat"),
+            key: "adp_payroll_flat",
+            reporttype: "text",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.timetickets"),
+              field: i18n.t("timetickets.fields.committed_at")
+            },
+            group: "payroll",
+            adp_payroll: true
+          },
+          adp_payroll_straight: {
+            title: i18n.t("reportcenter.templates.adp_payroll_straight"),
+            subject: i18n.t("reportcenter.templates.adp_payroll_straight"),
+            key: "adp_payroll_straight",
+            reporttype: "text",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.timetickets"),
+              field: i18n.t("timetickets.fields.date")
+            },
+            group: "payroll",
+            adp_payroll: true
           }
         }
       : {}),

client/src/utils/countdownHook.js

@@ -0,0 +1,84 @@
+import React from "react";
+
+const useCountDown = (timeToCount = 60 * 1000, interval = 1000) => {
+  const [timeLeft, setTimeLeft] = React.useState(0);
+  const timer = React.useRef({});
+
+  const run = (ts) => {
+    if (!timer.current.started) {
+      timer.current.started = ts;
+      timer.current.lastInterval = ts;
+    }
+
+    const localInterval = Math.min(interval, timer.current.timeLeft || Infinity);
+    if (ts - timer.current.lastInterval >= localInterval) {
+      timer.current.lastInterval += localInterval;
+      setTimeLeft((timeLeft) => {
+        timer.current.timeLeft = timeLeft - localInterval;
+        return timer.current.timeLeft;
+      });
+    }
+
+    if (ts - timer.current.started < timer.current.timeToCount) {
+      timer.current.requestId = window.requestAnimationFrame(run);
+    } else {
+      timer.current = {};
+      setTimeLeft(0);
+    }
+  };
+
+  const start = React.useCallback(
+    (ttc) => {
+      window.cancelAnimationFrame(timer.current.requestId);
+
+      const newTimeToCount = ttc !== undefined ? ttc : timeToCount;
+      timer.current.started = null;
+      timer.current.lastInterval = null;
+      timer.current.timeToCount = newTimeToCount;
+      timer.current.requestId = window.requestAnimationFrame(run);
+
+      setTimeLeft(newTimeToCount);
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  const pause = React.useCallback(() => {
+    window.cancelAnimationFrame(timer.current.requestId);
+    timer.current.started = null;
+    timer.current.lastInterval = null;
+    timer.current.timeToCount = timer.current.timeLeft;
+  }, []);
+
+  const resume = React.useCallback(
+    () => {
+      if (!timer.current.started && timer.current.timeLeft > 0) {
+        window.cancelAnimationFrame(timer.current.requestId);
+        timer.current.requestId = window.requestAnimationFrame(run);
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  const reset = React.useCallback(() => {
+    if (timer.current.timeLeft) {
+      window.cancelAnimationFrame(timer.current.requestId);
+      timer.current = {};
+      setTimeLeft(0);
+    }
+  }, []);
+
+  const actions = React.useMemo(
+    () => ({ start, pause, resume, reset }), // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+
+  React.useEffect(() => {
+    return () => window.cancelAnimationFrame(timer.current.requestId);
+  }, []);
+
+  return [timeLeft, actions];
+};
+
+export default useCountDown;

client/src/utils/handleBeta.js

@@ -1,47 +0,0 @@
-export const BETA_KEY = "betaSwitchImex";
-
-export const checkBeta = () => {
-  const cookie = document.cookie.split("; ").find((row) => row.startsWith(BETA_KEY));
-  return cookie ? cookie.split("=")[1] === "true" : false;
-};
-
-export const setBeta = (value) => {
-  const domain = window.location.hostname.split(".").slice(-2).join(".");
-  document.cookie = `${BETA_KEY}=${value}; path=/; domain=.${domain}`;
-};
-
-export const handleBeta = () => {
-  if (window.location.hostname.startsWith("localhost")) {
-    console.log("Not on beta or test, so no need to handle beta.");
-    return;
-  }
-
-  const isBeta = checkBeta();
-  const currentHostName = window.location.hostname;
-
-  // Determine if the host name starts with "beta" or "www.beta"
-  const isBetaHost = currentHostName.startsWith("beta.");
-  const isBetaHostWithWWW = currentHostName.startsWith("www.beta.");
-
-  if (isBeta) {
-    // If beta is on and we are not on a beta domain, redirect to the beta version
-    if (!isBetaHost && !isBetaHostWithWWW) {
-      const newHostName = currentHostName.startsWith("www.")
-        ? `www.beta.${currentHostName.replace(/^www\./, "")}`
-        : `beta.${currentHostName}`;
-      const href = `${window.location.protocol}//${newHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
-      window.location.replace(href);
-    }
-    // Otherwise, if beta is on and we're already on a beta domain, stay there
-  } else {
-    // If beta is off and we are on a beta domain, redirect to the non-beta version
-    if (isBetaHost || isBetaHostWithWWW) {
-      const newHostName = currentHostName.replace(/^www\.beta\./, "www.").replace(/^beta\./, "");
-      const href = `${window.location.protocol}//${newHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
-      window.location.replace(href);
-    }
-    // Otherwise, if beta is off and we're not on a beta domain, stay there
-  }
-};
-
-export default handleBeta;

hasura/config.yaml

@@ -1,5 +1,5 @@
 version: 2
-endpoint: https://db.dev.bodyshop.app
+endpoint: https://db.dev.imex.online
 admin_secret: Dev-BodyShopApp!
 metadata_directory: metadata
 actions:

hasura/metadata/cron_triggers.yaml

@@ -1,3 +1,19 @@
+- name: AutoHouse Data Pump
+  webhook: '{{HASURA_API_URL}}/data/ah'
+  schedule: 0 6 * * *
+  include_in_metadata: true
+  payload: {}
+  headers:
+    - name: x-imex-auth
+      value_from_env: DATAPUMP_AUTH
+- name: Claimscorp Data Pump
+  webhook: '{{HASURA_API_URL}}/data/cc'
+  schedule: 30 6 * * *
+  include_in_metadata: true
+  payload: {}
+  headers:
+    - name: x-imex-auth
+      value_from_env: DATAPUMP_AUTH
 - name: Kaizen Data Pump
   webhook: '{{HASURA_API_URL}}/data/kaizen'
   schedule: 30 5 * * *

hasura/metadata/tables.yaml

@@ -918,6 +918,7 @@
           - bill_tax_rates
           - cdk_configuration
           - cdk_dealerid
+          - chatterid
           - city
           - claimscorpid
           - convenient_company
@@ -939,6 +940,7 @@
           - inhousevendorid
           - insurance_vendor_id
           - intakechecklist
+          - intellipay_config
           - jc_hourly_rates
           - jobsizelimit
           - last_name_first
@@ -1040,6 +1042,7 @@
           - inhousevendorid
           - insurance_vendor_id
           - intakechecklist
+          - intellipay_config
           - jc_hourly_rates
           - last_name_first
           - localmediaserverhttp
@@ -4240,6 +4243,63 @@
                 - active:
                     _eq: true
   event_triggers:
+    - name: job_modified
+      definition:
+        enable_manual: false
+        update:
+          columns:
+            - clm_no
+            - v_make_desc
+            - date_next_contact
+            - status
+            - employee_csr
+            - employee_prep
+            - clm_total
+            - suspended
+            - employee_body
+            - ro_number
+            - actual_in
+            - ownr_co_nm
+            - v_model_yr
+            - comment
+            - job_totals
+            - v_vin
+            - ownr_fn
+            - scheduled_completion
+            - special_coverage_policy
+            - v_color
+            - ca_gst_registrant
+            - scheduled_delivery
+            - actual_delivery
+            - actual_completion
+            - kanbanparent
+            - est_ct_fn
+            - employee_refinish
+            - ownr_ph1
+            - date_last_contacted
+            - alt_transport
+            - inproduction
+            - est_ct_ln
+            - production_vars
+            - category
+            - v_model_desc
+            - date_invoiced
+            - est_co_nm
+            - ownr_ln
+      retry_conf:
+        interval_sec: 10
+        num_retries: 0
+        timeout_sec: 60
+      webhook_from_env: HASURA_API_URL
+      headers:
+        - name: event-secret
+          value_from_env: EVENT_SECRET
+      request_transform:
+        method: POST
+        query_params: {}
+        template_engine: Kriti
+        url: '{{$base_url}}/job/job-updated'
+        version: 2
     - name: job_status_transition
       definition:
         enable_manual: true
@@ -4299,6 +4359,35 @@
         template_engine: Kriti
         url: '{{$base_url}}/opensearch'
         version: 2
+- table:
+    name: jobs_inproduction
+    schema: public
+  object_relationships:
+    - name: bodyshop
+      using:
+        manual_configuration:
+          column_mapping:
+            shopid: id
+          insertion_order: null
+          remote_table:
+            name: bodyshops
+            schema: public
+  select_permissions:
+    - role: user
+      permission:
+        columns:
+          - id
+          - shopid
+          - updated_at
+        filter:
+          bodyshop:
+            associations:
+              _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
 - table:
     name: masterdata
     schema: public

hasura/migrations/1726773072213_run_sql_migration/down.sql

@@ -0,0 +1,11 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE
+-- OR REPLACE VIEW "public"."jobs_inproduction" AS
+-- SELECT
+--   j.id,
+--   j.updated_at
+-- FROM
+--   jobs j
+-- WHERE
+-- j.inproduction=true;

hasura/migrations/1726773072213_run_sql_migration/up.sql

@@ -0,0 +1,9 @@
+CREATE
+OR REPLACE VIEW "public"."jobs_inproduction" AS
+SELECT
+  j.id,
+  j.updated_at
+FROM
+  jobs j
+WHERE
+j.inproduction=true;

hasura/migrations/1726773316245_run_sql_migration/down.sql

@@ -0,0 +1,8 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS
+--  SELECT j.id,
+--     j.updated_at,
+--     j.shopid
+--    FROM jobs j
+--   WHERE (j.inproduction = true);

hasura/migrations/1726773316245_run_sql_migration/up.sql

@@ -0,0 +1,6 @@
+CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS 
+ SELECT j.id,
+    j.updated_at,
+    j.shopid
+   FROM jobs j
+  WHERE (j.inproduction = true);

hasura/migrations/1726773326353_run_sql_migration/down.sql

@@ -0,0 +1,8 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS
+--  SELECT j.id,
+--     j.updated_at,
+--     j.shopid
+--    FROM jobs j
+--   WHERE (j.inproduction = true);

hasura/migrations/1726773326353_run_sql_migration/up.sql

@@ -0,0 +1,6 @@
+CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS 
+ SELECT j.id,
+    j.updated_at,
+    j.shopid
+   FROM jobs j
+  WHERE (j.inproduction = true);

hasura/migrations/1726775434726_run_sql_migration/down.sql

@@ -0,0 +1,3 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE INDEX idx_jobs_inproduction_true_cast ON jobs(inproduction) WHERE inproduction = ('true') :: boolean;

hasura/migrations/1726775434726_run_sql_migration/up.sql

@@ -0,0 +1 @@
+CREATE INDEX idx_jobs_inproduction_true_cast ON jobs(inproduction) WHERE inproduction = ('true') :: boolean;

hasura/migrations/1726775487038_drop_index_idx_jobs_inproduction_true_cast/down.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_inproduction_true_cast" on
+  "public"."jobs" using btree ("inproduction");

hasura/migrations/1726775487038_drop_index_idx_jobs_inproduction_true_cast/up.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_inproduction_true_cast";

server/accounting/qbo/qbo-payables.js

@@ -94,7 +94,10 @@ exports.default = async (req, res) => {
         ret.push({
           billid: bill.id,
           success: false,
-          errorMessage: (error && error.authResponse && error.authResponse.body) || (error && error.message)
+          errorMessage:
+            (error && error.authResponse && error.authResponse.body) ||
+            error.response?.data?.Fault?.Error.map((e) => e.Detail).join(", ") ||
+            (error && error.message)
         });
 
         //Add the export log error.
@@ -209,14 +212,14 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
       AccountBasedExpenseLineDetail: {
         ...(bill.job.class ? { ClassRef: { value: classes[bill.job.class] } } : {}),
         AccountRef: {
-          value: accounts[bodyshop.md_responsibility_centers.taxes.federal.accountdesc]
+          value: accounts[bodyshop.md_responsibility_centers.taxes.federal_itc.accountdesc]
         }
       },
 
       Amount: Dinero({
         amount: Math.round(
           bill.billlines.reduce((acc, val) => {
-            return acc + val.actual_cost * val.quantity;
+            return acc + val.applicable_taxes?.federal ? (val.actual_cost * val.quantity ?? 0) : 0;
           }, 0) * 100
         )
       })
@@ -274,6 +277,8 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
   } catch (error) {
     logger.log("qbo-payables-error", "DEBUG", req.user.email, bill.id, {
       error: error, //(error && error.authResponse && error.authResponse.body) || (error && error.message),
+      validationError: JSON.stringify(error?.response?.data),
+      accountmeta: JSON.stringify({ accounts, taxCodes, classes }),
       method: "InsertBill"
     });
     throw error;

server/accounting/qbo/qbo-receivables.js

@@ -179,7 +179,11 @@ exports.default = async (req, res) => {
         ret.push({
           jobid: job.id,
           success: false,
-          errorMessage: (error && error.authResponse && error.authResponse.body) || (error && error.message)
+          errorMessage:
+            error?.authResponse?.body ||
+            error?.response?.data?.Fault?.Error.map((e) => e.Detail).join(", ") ||
+            error?.response?.data ||
+            error?.message
         });
         console.log(error);
         logger.log("qbo-receivable-create-error", "ERROR", req.user.email, {
@@ -254,7 +258,6 @@ async function InsertInsuranceCo(oauthClient, qbo_realmId, req, job, bodyshop) {
     throw new Error(
       `Insurance Company '${job.ins_co_nm}' not found in shop configuration. Please make sure it exists or change the insurance company name on the job to one that exists.`
     );
-    return;
   }
   const Customer = {
     DisplayName: job.ins_co_nm.trim(),
@@ -575,7 +578,9 @@ async function InsertInvoice(oauthClient, qbo_realmId, req, job, bodyshop, paren
   } catch (error) {
     logger.log("qbo-receivables-error", "DEBUG", req.user.email, job.id, {
       error,
-      method: "InsertOwner"
+      method: "InsertInvoice",
+      validationError: JSON.stringify(error?.response?.data),
+      accountmeta: JSON.stringify({ items, taxCodes, classes })
     });
     throw error;
   }

server/data/autohouse.js

@@ -31,6 +31,12 @@ const ftpSetup = {
 };
 
 exports.default = async (req, res) => {
+  // Only process if in production environment.
+  if (process.env.NODE_ENV !== "production") {
+    res.sendStatus(403);
+    return;
+  }
+
   //Query for the List of Bodyshop Clients.
   logger.log("autohouse-start", "DEBUG", "api", null, null);
   const { bodyshops } = await client.request(queries.GET_AUTOHOUSE_SHOPS);

server/data/claimscorp.js

@@ -31,6 +31,12 @@ const ftpSetup = {
 };
 
 exports.default = async (req, res) => {
+  // Only process if in production environment.
+  if (process.env.NODE_ENV !== "production") {
+    res.sendStatus(403);
+    return;
+  }
+
   //Query for the List of Bodyshop Clients.
   logger.log("claimscorp-start", "DEBUG", "api", null, null);
   const { bodyshops } = await client.request(queries.GET_CLAIMSCORP_SHOPS);

server/data/kaizen.js

@@ -31,6 +31,12 @@ const ftpSetup = {
 };
 
 exports.default = async (req, res) => {
+  // Only process if in production environment.
+  if (process.env.NODE_ENV !== "production") {
+    res.sendStatus(403);
+    return;
+  }
+
   //Query for the List of Bodyshop Clients.
   logger.log("kaizen-start", "DEBUG", "api", null, null);
   const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE", "SHAW"];