IO-2949 change fetch policy on client to resolve issue.

Merged in feature/IO-2950-prod-db-view (pull request #1744 )
Feature/IO-2950 prod db view
2024-09-20 09:50:08 -07:00 · 2024-09-19 20:27:01 +00:00 · 2024-09-19 13:18:35 -07:00 · 2024-09-19 13:11:31 -07:00 · 2024-09-19 16:09:49 -04:00 · 2024-09-19 16:06:59 -04:00
35 changed files with 2799 additions and 446 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -226,7 +226,9 @@ jobs:
          command: |
            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
@@ -313,7 +315,9 @@ jobs:
          command: |
            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
@@ -423,7 +427,7 @@ workflows:
          secret: ${HASURA_PROD_SECRET}
          filters:
            branches:
-              only: master
+              only: master-AIO
      - rome-api-deploy:
          filters:
            branches:
@@ -433,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
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
--- a/client/index.html
+++ b/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') { %>
--- a/client/src/App/App.jsx
+++ b/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
--- a/client/src/components/bill-detail-edit/bill-detail-edit-component.jsx
+++ b/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) {
--- a/client/src/components/header/header.component.jsx
+++ b/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 React, { useEffect, useState } from "react";
+import { Layout, Menu } from "antd";
+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 isBeta = checkBeta();
-    setBetaSwitch(isBeta);
-  }, []);
-
-  const betaSwitchChange = (checked) => {
-    setBeta(checked);
-    setBetaSwitch(checked);
-    handleBeta();
+  const deleteBetaCookie = () => {
+    const cookieExists = document.cookie.split("; ").some((row) => row.startsWith(`betaSwitchImex=`));
+    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}`;
+      console.log(`betaSwitchImex cookie deleted`);
+    } else {
+      console.log(`betaSwitchImex cookie does not exist`);
+    }
  };

+  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
--- a/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
+++ b/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
      },
-      // {
-      //   key: t("jobs.fields.federal_tax_payable"),
-      //   total: job.job_totals.totals.custPayable.federal_tax,
-      // },
+      ...(InstanceRenderManager({
+        imex: [{
+          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
--- a/client/src/components/parts-order-modal/parts-order-modal-price-change.component.jsx
+++ b/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: (
--- a/client/src/components/production-board-kanban/production-board-kanban.container.jsx
+++ b/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, {
-    onError: (error) => console.error(`Error subscribing to jobs in production: ${error.message}`)
-  });
+  const { data: updatedJobs } = useSubscription(
+    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) {
-      refetch().catch((err) => console.error(`Error re-fetching jobs in production: ${err.message}`));
+    if (!updatedJobs) {
+      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;
--- a/client/src/components/production-list-table/production-list-table.container.jsx
+++ b/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;
--- a/client/src/components/update-alert/update-alert.component.jsx
+++ b/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],
@@ -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) {
-      console.log(`SW Status => Refresh? ${needRefresh} - offlineReady? ${offlineReady}`);
+    if (needRefresh) {
+      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)}>
-                {i18n.t("general.actions.refresh")}
+              <Button loading={loading} type="primary" onClick={() => ReloadNewVersion()}>
+                {i18n.t("general.actions.refresh")} {`(${(timeLeft / 1000).toFixed(0)} s)`}
              </Button>
+              <Button onClick={() => start(300000)}>{i18n.t("general.actions.delay")}</Button>
            </Space>
          </Col>
        </Row>
--- a/client/src/components/vendor-search-select/vendor-search-select.component.jsx
+++ b/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 style={{ flex: 1 }}>{label}</div>
-
+          <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.map((o) => (
-            <Option key={`favorite-${o.id}`} value={o.id} name={o.name} discount={o.discount}>
-              <div className="imex-flex-row">
-                <div style={{ flex: 1 }}>{o.name}</div>
-                <Space style={{ marginLeft: "1rem" }}>
-                  <HeartOutlined style={{ color: "red" }} />
-                  {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
-                  {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
-                </Space>
+      {favorites &&
+        favorites.map((o) => (
+          <Option key={`favorite-${o.id}`} value={o.id} name={o.name} discount={o.discount}>
+            <div
+              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>
-          ))
-        : null}
-      {options
-        ? options.map((o) => (
-            <Option key={o.id} value={o.id} name={o.name} discount={o.discount}>
-              <div className="imex-flex-row" style={{ width: "100%" }}>
-                <div style={{ flex: 1 }}>{o.name}</div>
-
-                <Space style={{ marginLeft: "1rem" }}>
-                  {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
-                  {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
-                </Space>
+              <Space style={{ marginLeft: "1rem" }}>
+                <HeartOutlined style={{ color: "red" }} />
+                {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
+                {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
+              </Space>
+            </div>
+          </Option>
+        ))}
+      {options &&
+        options.map((o) => (
+          <Option key={o.id} value={o.id} name={o.name} discount={o.discount}>
+            <div
+              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>
-          ))
-        : null}
+              <Space style={{ marginLeft: "1rem" }}>
+                {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
+                {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
+              </Space>
+            </div>
+          </Option>
+        ))}
    </Select>
  );
 };
--- a/client/src/firebase/firebase.utils.js
+++ b/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]",
--- a/client/src/graphql/jobs.queries.js
+++ b/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 {
--- a/client/src/pages/production-board/production-board.component.jsx
+++ b/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() {
-  return <ProductionBoardKanbanContainer />;
+export function ProductionBoardComponent({ bodyshop }) {
+  const {
+    treatments: { Production_Use_View }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["Production_Use_View"],
+    splitKey: bodyshop && bodyshop.imexshopid
+  });
+
+  return <ProductionBoardKanbanContainer subscriptionType={Production_Use_View.treatment} />;
 }
--- a/client/src/pages/production-list/production-list.component.jsx
+++ b/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} />
    </>
  );
 }
--- a/client/src/redux/messaging/messaging.sagas.js
+++ b/client/src/redux/messaging/messaging.sagas.js
@@ -36,7 +36,8 @@ export function* openChatByPhone({ payload }) {
      data: { conversations }
    } = yield client.query({
      query: CONVERSATION_ID_BY_PHONE,
-      variables: { phone: p.number }
+      variables: { phone: p.number },
+      fetchPolicy: 'no-cache'
    });

    if (conversations.length === 0) {
--- a/client/src/translations/en_us/common.json
+++ b/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}}",
-        "creatingdefaultview": "Error creating default view."
+        "saving": "Error encountered while saving. {{message}}"
      },
      "fields": {
        "ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
@@ -298,8 +298,8 @@
        "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",
@@ -702,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.",
@@ -1135,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",
@@ -1144,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",
@@ -1155,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",
@@ -1166,9 +1170,7 @@
        "submit": "Submit",
        "tryagain": "Try Again",
        "view": "View",
-        "viewreleasenotes": "See What's Changed",
-        "remove_alert": "Are you sure you want to dismiss the alert?",
-        "saveas": "Save As"
+        "viewreleasenotes": "See What's Changed"
      },
      "errors": {
        "fcm": "You must allow notification permissions to have real time messaging.  Click to try again.",
@@ -1183,7 +1185,6 @@
        "vehicle": "Vehicle"
      },
      "labels": {
-        "unsavedchanges": "Unsaved changes.",
        "actions": "Actions",
        "areyousure": "Are you sure?",
        "barcode": "Barcode",
@@ -1252,6 +1253,7 @@
        "tuesday": "Tuesday",
        "tvmode": "TV Mode",
        "unknown": "Unknown",
+        "unsavedchanges": "Unsaved changes.",
        "username": "Username",
        "view": "View",
        "wednesday": "Wednesday",
@@ -2741,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",
@@ -2790,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",
@@ -2822,6 +2783,7 @@
            "qbo_usa": "QBO USA"
          }
        },
+        "card_size": "Card Size",
        "cardcolor": "Colored Cards",
        "cardsettings": "Card Settings",
        "clm_no": "Claim Number",
@@ -2830,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",
-        "addnewprofile": "Add New Profile"
+        "wide": "Wide"
+      },
+      "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": {
@@ -3422,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"
@@ -3560,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"
-      }
    }
  }
 }
--- a/client/src/translations/es/common.json
+++ b/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": "",
-        "creatingdefaultview": ""
+        "saving": ""
      },
      "fields": {
        "ReceivableCustomField": "",
@@ -298,8 +298,8 @@
        "dailypainttarget": "",
        "default_adjustment_rate": "",
        "deliver": {
-          "templates": "",
-          "require_actual_delivery_date": ""
+          "require_actual_delivery_date": "",
+          "templates": ""
        },
        "dms": {
          "apcontrol": "",
@@ -702,10 +702,10 @@
        "workingdays": ""
      },
      "successes": {
-        "save": "",
-        "unsavedchanges": "",
        "areyousure": "",
-        "defaultviewcreated": ""
+        "defaultviewcreated": "",
+        "save": "",
+        "unsavedchanges": ""
      },
      "validation": {
        "centermustexist": "",
@@ -1135,8 +1135,8 @@
    },
    "general": {
      "actions": {
-        "defaults": "defaults",
        "add": "",
+        "autoupdate": "",
        "calculate": "",
        "cancel": "",
        "clear": "",
@@ -1144,6 +1144,8 @@
        "copied": "",
        "copylink": "",
        "create": "",
+        "defaults": "defaults",
+        "delay": "",
        "delete": "Borrar",
        "deleteall": "",
        "deselectall": "",
@@ -1155,10 +1157,12 @@
        "print": "",
        "refresh": "",
        "remove": "",
+        "remove_alert": "",
        "reset": " Restablecer a original.",
        "resetpassword": "",
        "save": "Salvar",
        "saveandnew": "",
+        "saveas": "",
        "selectall": "",
        "send": "",
        "sendbysms": "",
@@ -1166,9 +1170,7 @@
        "submit": "",
        "tryagain": "",
        "view": "",
-        "viewreleasenotes": "",
-        "remove_alert": "",
-        "saveas": ""
+        "viewreleasenotes": ""
      },
      "errors": {
        "fcm": "",
@@ -1183,7 +1185,6 @@
        "vehicle": ""
      },
      "labels": {
-        "unsavedchanges": "",
        "actions": "Comportamiento",
        "areyousure": "",
        "barcode": "código de barras",
@@ -1252,6 +1253,7 @@
        "tuesday": "",
        "tvmode": "",
        "unknown": "Desconocido",
+        "unsavedchanges": "",
        "username": "",
        "view": "",
        "wednesday": "",
@@ -2741,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": "",
@@ -2790,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": "",
@@ -2822,6 +2783,7 @@
            "qbo_usa": ""
          }
        },
+        "card_size": "",
        "cardcolor": "",
        "cardsettings": "",
        "clm_no": "",
@@ -2830,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": "",
-        "addnewprofile": ""
+        "wide": ""
+      },
+      "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": {
@@ -3422,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": ""
@@ -3560,18 +3574,6 @@
      "validation": {
        "unique_vendor_name": ""
      }
-    },
-    "trello": {
-      "labels": {
-        "add_card": "",
-        "add_lane": "",
-        "delete_lane": "",
-        "lane_actions": "",
-        "title": "",
-        "description": "",
-        "label": "",
-        "cancel": ""
-      }
    }
  }
 }
--- a/client/src/translations/fr/common.json
+++ b/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": "",
-        "creatingdefaultview": ""
+        "saving": ""
      },
      "fields": {
        "ReceivableCustomField": "",
@@ -298,8 +298,8 @@
        "dailypainttarget": "",
        "default_adjustment_rate": "",
        "deliver": {
-          "templates": "",
-          "require_actual_delivery_date": ""
+          "require_actual_delivery_date": "",
+          "templates": ""
        },
        "dms": {
          "apcontrol": "",
@@ -702,10 +702,10 @@
        "workingdays": ""
      },
      "successes": {
-        "save": "",
-        "unsavedchanges": "",
        "areyousure": "",
-        "defaultviewcreated": ""
+        "defaultviewcreated": "",
+        "save": "",
+        "unsavedchanges": ""
      },
      "validation": {
        "centermustexist": "",
@@ -1135,8 +1135,8 @@
    },
    "general": {
      "actions": {
-        "defaults": "",
        "add": "",
+        "autoupdate": "",
        "calculate": "",
        "cancel": "",
        "clear": "",
@@ -1144,6 +1144,8 @@
        "copied": "",
        "copylink": "",
        "create": "",
+        "defaults": "",
+        "delay": "",
        "delete": "Effacer",
        "deleteall": "",
        "deselectall": "",
@@ -1155,10 +1157,12 @@
        "print": "",
        "refresh": "",
        "remove": "",
+        "remove_alert": "",
        "reset": " Rétablir l'original.",
        "resetpassword": "",
        "save": "sauvegarder",
        "saveandnew": "",
+        "saveas": "",
        "selectall": "",
        "send": "",
        "sendbysms": "",
@@ -1166,9 +1170,7 @@
        "submit": "",
        "tryagain": "",
        "view": "",
-        "viewreleasenotes": "",
-        "remove_alert": "",
-        "saveas": ""
+        "viewreleasenotes": ""
      },
      "errors": {
        "fcm": "",
@@ -1183,7 +1185,6 @@
        "vehicle": ""
      },
      "labels": {
-        "unsavedchanges": "",
        "actions": "actes",
        "areyousure": "",
        "barcode": "code à barre",
@@ -1252,6 +1253,7 @@
        "tuesday": "",
        "tvmode": "",
        "unknown": "Inconnu",
+        "unsavedchanges": "",
        "username": "",
        "view": "",
        "wednesday": "",
@@ -2741,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": "",
@@ -2790,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": "",
@@ -2822,6 +2783,7 @@
            "qbo_usa": ""
          }
        },
+        "card_size": "",
        "cardcolor": "",
        "cardsettings": "",
        "clm_no": "",
@@ -2830,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": "",
-        "addnewprofile": ""
+        "wide": ""
+      },
+      "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": {
@@ -3422,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": ""
@@ -3560,18 +3574,6 @@
      "validation": {
        "unique_vendor_name": ""
      }
-    },
-    "trello": {
-      "labels": {
-        "add_card": "",
-        "add_lane": "",
-        "delete_lane": "",
-        "lane_actions": "",
-        "title": "",
-        "description": "",
-        "label": "",
-        "cancel": ""
-      }
    }
  }
 }
--- a/client/src/utils/countdownHook.js
+++ b/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;
--- a/client/src/utils/handleBeta.js
+++ b/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;
--- a/hasura/metadata/tables.yaml
+++ b/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
--- a/hasura/migrations/1726773072213_run_sql_migration/down.sql
+++ b/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;
--- a/hasura/migrations/1726773072213_run_sql_migration/up.sql
+++ b/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;
--- a/hasura/migrations/1726773316245_run_sql_migration/down.sql
+++ b/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);
--- a/hasura/migrations/1726773316245_run_sql_migration/up.sql
+++ b/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);
--- a/hasura/migrations/1726773326353_run_sql_migration/down.sql
+++ b/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);
--- a/hasura/migrations/1726773326353_run_sql_migration/up.sql
+++ b/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);
--- a/hasura/migrations/1726775434726_run_sql_migration/down.sql
+++ b/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;
--- a/hasura/migrations/1726775434726_run_sql_migration/up.sql
+++ b/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;
--- a/hasura/migrations/1726775487038_drop_index_idx_jobs_inproduction_true_cast/down.sql
+++ b/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");
--- a/hasura/migrations/1726775487038_drop_index_idx_jobs_inproduction_true_cast/up.sql
+++ b/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";
--- a/server/accounting/qbo/qbo-payables.js
+++ b/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;
--- a/server/accounting/qbo/qbo-receivables.js
+++ b/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;
  }
Author	SHA1	Message	Date
Patrick Fic	bece3278f4	IO-2949 change fetch policy on client to resolve issue.	2024-09-20 09:50:08 -07:00
Patrick Fic	3b1da6901d	Merged in feature/IO-2950-prod-db-view (pull request #1744 ) Feature/IO-2950 prod db view	2024-09-19 20:27:01 +00:00
Patrick Fic	fc6ec54233	IO-2950 Resolve reversed split.	2024-09-19 13:18:35 -07:00
Patrick Fic	64928d0849	IO-2950 remove unneeded updated query.	2024-09-19 13:11:31 -07:00
Dave Richer	56a580b1e7	IO-2950 - Add in double subscription fix Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-19 16:09:49 -04:00
Dave Richer	f7af3b407b	clear stage Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-19 16:06:59 -04:00
Patrick Fic	9a0674f5d7	IO-2950 Add subscription using view instead of variable.	2024-09-19 12:58:13 -07:00
Dave Richer	449330441a	Merged in release/2024-09-13 (pull request #1725 ) Release/2024 09 13 - IO-2913 - IO-2915 - IO-2733 - IO-2923 - IO-2925 - IO-2928 - IO-2927 - IO-2928 - IO-2913 - IO-2733 - IO-2926	2024-09-16 16:28:40 +00:00
Dave Richer	fcab5e6ef2	Merged in feature/IO-2926-Vendor-Discount-Wrapping-In-Parts-Order (pull request #1723 ) feature/IO-2926-Vendor-Discount-Wrapping-In-Parts-Order - Fix Wrapping in Vendor Search Select	2024-09-16 16:18:05 +00:00
Dave Richer	0212b837ea	feature/IO-2926-Vendor-Discount-Wrapping-In-Parts-Order - Fix Wrapping in Vendor Search Select Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-16 12:16:29 -04:00
Patrick Fic	e7438a099e	Merged in feature/IO-2733-pwa-timer (pull request #1721 ) IO-2733 Add loading state and further delay reload.	2024-09-13 18:24:11 +00:00
Patrick Fic	b3303e3c38	IO-2733 Add loading state and further delay reload.	2024-09-13 11:22:38 -07:00
Patrick Fic	c69c86d193	Merged in feature/IO-2733-pwa-timer (pull request #1719 ) IO-2733 Resolve notification showing incorrect time.	2024-09-13 17:51:33 +00:00
Patrick Fic	73ec8b8a70	IO-2733 Resolve notification showing incorrect time.	2024-09-13 10:51:04 -07:00
Patrick Fic	af09796df8	Merged in feature/IO-2733-pwa-timer (pull request #1717 ) IO-2733 Add Timer Started check to prevent auto refresh early.	2024-09-13 16:59:58 +00:00
Patrick Fic	954504de8d	IO-2733 Add Timer Started check to prevent auto refresh early.	2024-09-13 09:58:46 -07:00
Allan Carr	0aba040338	Merged in feature/IO-2928-QBO-CAUSA-Payable-TAX (pull request #1714 ) IO-2928 QBO CA US Tax Accumulator Approved-by: Patrick Fic	2024-09-13 14:43:58 +00:00
Allan Carr	c3bfe87674	Merge branch 'feature/IO-2913-ADP-Payroll' into release/2024-09-13 Signed-off-by: Allan Carr <allan.carr@thinkimex.com> # Conflicts: # client/src/translations/en_us/common.json # client/src/translations/es/common.json # client/src/translations/fr/common.json	2024-09-12 19:59:47 -07:00
Allan Carr	4e6c45b195	IO-2928 Null coalesce billline amount Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-12 17:13:29 -07:00
Allan Carr	4fdb939bd2	Merged in feature/IO-2927-qbo-usa-gst-itc (pull request #1715 ) IO-2927 Extend Logging passthru Approved-by: Patrick Fic	2024-09-12 23:58:24 +00:00
Allan Carr	062a1dcc72	IO-2927 Extend Logging passthru Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-12 16:29:37 -07:00
Allan Carr	7b420b1855	IO-2928 QBO CA US Tax Accumulator Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-12 16:27:43 -07:00
Allan Carr	40f61bbc8f	Merged in feature/IO-2927-qbo-usa-gst-itc (pull request #1713 ) IO-2927 Correct accountmeta	2024-09-12 22:23:54 +00:00
Allan Carr	f5d821c394	Merged in feature/IO-2927-qbo-usa-gst-itc (pull request #1712 ) IO-2927 Correct accountmeta	2024-09-12 22:12:32 +00:00
Allan Carr	3958ec9189	IO-2927 Correct accountmeta accounts doesn't exist in recievables, switch to items Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-12 15:11:06 -07:00
Allan Carr	1e4f52e541	Merged in feature/IO-2927-qbo-usa-gst-itc (pull request #1710 ) Feature/IO-2927 qbo usa gst itc IO-2927	2024-09-12 20:33:27 +00:00
Patrick Fic	5cc5cb444e	Merged in feature/IO-2927-qbo-usa-gst-itc (pull request #1709 ) IO-2997 Add better error handling for 400 requests. Approved-by: Allan Carr	2024-09-12 20:26:16 +00:00
Patrick Fic	4acf0c59ca	IO-2997 Remove unnecessary comment.	2024-09-12 13:25:14 -07:00
Patrick Fic	2858a5e871	IO-2997 Add better error handling for 400 requests.	2024-09-12 13:23:53 -07:00
Patrick Fic	24496d3ee1	Merged in feature/IO-2927-qbo-usa-gst-itc (pull request #1707 ) IO-2927 Update QBO Payable to use ITC. Approved-by: Allan Carr	2024-09-12 20:04:33 +00:00
Patrick Fic	0a5df69b12	IO-2927 Update QBO Payable to use ITC.	2024-09-12 13:03:23 -07:00
Patrick Fic	80efea02c6	Merged in feature/IO-2925-ppc-40-points (pull request #1704 ) IO-2925 Add 40% as PPC choice. Approved-by: Allan Carr	2024-09-12 17:15:03 +00:00
Patrick Fic	9f5c282b41	IO-2925 Add 40% as PPC choice.	2024-09-12 09:19:49 -07:00
Allan Carr	b2602c3385	Merged in feature/IO-2923-Edit-Bill-Line-original_actual_price (pull request #1702 ) IO-2923 Edit Bill Line original_actual_price Approved-by: Dave Richer	2024-09-12 15:54:58 +00:00
Allan Carr	0e584af424	IO-2923 Edit Bill Line original_actual_price IO-2923 Edit Bill Line original_actual_price Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-11 16:36:28 -07:00
Patrick Fic	cdc3de2a33	Merge branch 'feature/IO-2733-pwa-timer' into release/2024-09-13	2024-09-10 15:58:59 -07:00
Patrick Fic	3bfa556b02	IO-2733 Added countdown timer to PWA Refresh & cache busting meta.	2024-09-10 15:54:15 -07:00
Allan Carr	44cb7577e2	Merged in feature/IO-2913-ADP-Payroll (pull request #1698 ) IO-2913 ADP Payroll Reports Approved-by: Dave Richer	2024-09-10 20:24:51 +00:00
Allan Carr	46d2b08477	Merged in feature/IO-2915-Customer-Portion-Totals-Federal-Tax (pull request #1699 ) IO-2915 Customer Portion Totals - Federal Tax Approved-by: Dave Richer	2024-09-10 20:24:13 +00:00
Allan Carr	0193ff9e65	IO-2915 Customer Portion Totals - Federal Tax Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-10 11:55:42 -07:00
Dave Richer	d0a7b87e04	Merged in feature/IO-2916-Remove-Beta-Switch-AIO (pull request #1693 ) feature/IO-2916-Remove-Beta-Switch-AIO - Remove Beta Switch	2024-09-10 17:29:31 +00:00
Dave Richer	799b24c90e	feature/IO-2916-Remove-Beta-Switch-LEGACY - Remove cookie Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-10 13:16:08 -04:00
Dave Richer	3e1a8c87d1	feature/IO-2916-Remove-Beta-Switch-AIO - Remove cookie Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-10 13:10:49 -04:00
Dave Richer	c886d874de	feature/IO-2916-Remove-Beta-Switch-AIO - Remove Beta Switch Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-09 23:34:54 -04:00
				`@@ -0,0 +1 @@`
				`CREATE INDEX idx_jobs_inproduction_true_cast ON jobs(inproduction) WHERE inproduction = ('true') :: boolean;`
				`@@ -0,0 +1 @@`
				`DROP INDEX IF EXISTS "public"."idx_jobs_inproduction_true_cast";`