IO-2782 Adjust to Object for items

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
IO-2782 - Fix query
2024-09-20 16:45:48 -07:00 · 2024-09-20 18:53:33 -04:00 · 2024-09-19 13:11:02 -04:00 · 2024-09-19 13:08:23 -04:00 · 2024-09-19 12:54:26 -04:00 · 2024-09-19 11:29:13 -04:00
33 changed files with 6776 additions and 4033 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/card-payment-modal/card-payment-modal.component..jsx
+++ b/client/src/components/card-payment-modal/card-payment-modal.component..jsx
@@ -1,6 +1,6 @@
-import { DeleteFilled } from "@ant-design/icons";
+import { DeleteFilled, CopyFilled } from "@ant-design/icons";
 import { useLazyQuery, useMutation } from "@apollo/client";
-import { Button, Card, Col, Form, Input, Row, Space, Spin, Statistic, notification } from "antd";
+import { Button, Card, Col, Form, Input, Row, Space, Spin, Statistic, message, notification } from "antd";
 import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -14,10 +14,12 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
 import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
+import { getCurrentUser } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  cardPaymentModal: selectCardPayment,
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
+  currentUser: getCurrentUser
 });

 const mapDispatchToProps = (dispatch) => ({
@@ -25,11 +27,17 @@ const mapDispatchToProps = (dispatch) => ({
  toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment"))
 });

-const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisible, insertAuditTrail }) => {
+const CardPaymentModalComponent = ({
+  bodyshop,
+  currentUser,
+  cardPaymentModal,
+  toggleModalVisible,
+  insertAuditTrail
+}) => {
  const { context, actions } = cardPaymentModal;

  const [form] = Form.useForm();
-
+  const [paymentLink, setPaymentLink] = useState();
  const [loading, setLoading] = useState(false);
  // const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
  const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
@@ -51,8 +59,7 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi
      //2024-04-25: Nothing is going to happen here anymore. We'll completely rely on the callback.
      //Add a slight delay to allow the refetch to properly get the data.
      setTimeout(() => {
-        if (actions && actions.refetch && typeof actions.refetch === "function")
-          actions.refetch();
+        if (actions && actions.refetch && typeof actions.refetch === "function") actions.refetch();
        setLoading(false);
        toggleModalVisible();
      }, 750);
@@ -86,7 +93,6 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi
    });
  };

-
  const handleIntelliPayCharge = async () => {
    setLoading(true);
    //Validate
@@ -101,7 +107,7 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi
      const response = await axios.post("/intellipay/lightbox_credentials", {
        bodyshop,
        refresh: !!window.intellipay,
-        paymentSplitMeta: form.getFieldsValue(),
+        paymentSplitMeta: form.getFieldsValue()
      });

      if (window.intellipay) {
@@ -126,6 +132,42 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi
    }
  };

+  const handleIntelliPayChargeShortLink = async () => {
+    setLoading(true);
+    //Validate
+    try {
+      await form.validateFields();
+    } catch (error) {
+      setLoading(false);
+      return;
+    }
+
+    try {
+      const { payments } = form.getFieldsValue();
+      const response = await axios.post("/intellipay/generate_payment_url", {
+        bodyshop,
+        amount: payments?.reduce((acc, val) => {
+          return acc + (val?.amount || 0);
+        }, 0),
+        account: payments && data && data.jobs.length > 0 ? data.jobs.map((j) => j.ro_number).join(", ") : null,
+        comment: btoa(JSON.stringify({ payments, userEmail: currentUser.email })),
+        paymentSplitMeta: form.getFieldsValue()
+      });
+      if (response.data) {
+        setPaymentLink(response.data?.shorUrl);
+        navigator.clipboard.writeText(response.data?.shorUrl);
+        message.success(t("general.actions.copied"));
+      }
+      setLoading(false);
+    } catch (error) {
+      notification.open({
+        type: "error",
+        message: t("job_payments.notifications.error.openingip")
+      });
+      setLoading(false);
+    }
+  };
+
  return (
    <Card title="Card Payment">
      <Spin spinning={loading}>
@@ -208,10 +250,7 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi
            {() => {
              //If all of the job ids have been fileld in, then query and update the IP field.
              const { payments } = form.getFieldsValue();
-              if (
-                payments?.length > 0 &&
-                payments?.filter((p) => p?.jobid).length === payments?.length
-              ) {
+              if (payments?.length > 0 && payments?.filter((p) => p?.jobid).length === payments?.length) {
                refetch({ jobids: payments.map((p) => p.jobid) });
              }
              return (
@@ -246,7 +285,6 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi
              const totalAmountToCharge = payments?.reduce((acc, val) => {
                return acc + (val?.amount || 0);
              }, 0);
-
              return (
                <Space style={{ float: "right" }}>
                  <Statistic title="Amount To Charge" value={totalAmountToCharge} precision={2} />
@@ -273,11 +311,36 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi
                  >
                    {t("job_payments.buttons.proceedtopayment")}
                  </Button>
+                  <Space direction="vertical" align="center">
+                    <Button
+                      type="primary"
+                      //  data-ipayname="submit"
+                      className="ipayfield"
+                      loading={queryLoading || loading}
+                      disabled={!(totalAmountToCharge > 0)}
+                      onClick={handleIntelliPayChargeShortLink}
+                    >
+                      {t("job_payments.buttons.create_short_link")}
+                    </Button>
+                  </Space>
                </Space>
              );
            }}
          </Form.Item>
        </Form>
+        {paymentLink && (
+          <Space
+            style={{ cursor: "pointer", float: "right" }}
+            align="end"
+            onClick={() => {
+              navigator.clipboard.writeText(paymentLink);
+              message.success(t("general.actions.copied"));
+            }}
+          >
+            <div>{paymentLink}</div>
+            <CopyFilled />
+          </Space>
+        )}
      </Spin>
    </Card>
  );
--- 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/payments-generate-link/payments-generate-link.component.jsx
+++ b/client/src/components/payments-generate-link/payments-generate-link.component.jsx
@@ -8,11 +8,12 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { openChatByPhone, setMessage } from "../../redux/messaging/messaging.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";

 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
  openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
@@ -20,7 +21,7 @@ const mapDispatchToProps = (dispatch) => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(PaymentsGenerateLink);

-export function PaymentsGenerateLink({ bodyshop, callback, job, openChatByPhone, setMessage }) {
+export function PaymentsGenerateLink({ bodyshop, currentUser, callback, job, openChatByPhone, setMessage }) {
  const { t } = useTranslation();
  const [form] = Form.useForm();

@@ -30,29 +31,35 @@ export function PaymentsGenerateLink({ bodyshop, callback, job, openChatByPhone,

  const handleFinish = async ({ amount }) => {
    setLoading(true);
-
-    const p = parsePhoneNumber(job.ownr_ph1, "CA");
+    let p;
+    try {
+      p = parsePhoneNumber(job.ownr_ph1 || "", "CA");
+    } catch (error) {
+      console.log("Unable to parse phone number");
+    }
    setLoading(true);
    const response = await axios.post("/intellipay/generate_payment_url", {
      bodyshop,
      amount: amount,
      account: job.ro_number,
-      invoice: job.id
+      comment: btoa(JSON.stringify({ payments: [{ jobid: job.id, amount }], userEmail: currentUser.email }))
    });
    setLoading(false);
    setPaymentLink(response.data.shorUrl);

-    openChatByPhone({
-      phone_num: p.formatInternational(),
-      jobid: job.id
-    });
-    setMessage(
-      t("payments.labels.smspaymentreminder", {
-        shopname: bodyshop.shopname,
-        amount: amount,
-        payment_link: response.data.shorUrl
-      })
-    );
+    if (p) {
+      openChatByPhone({
+        phone_num: p.formatInternational(),
+        jobid: job.id
+      });
+      setMessage(
+        t("payments.labels.smspaymentreminder", {
+          shopname: bodyshop.shopname,
+          amount: amount,
+          payment_link: response.data.shorUrl
+        })
+      );
+    }

    //Add in confirmation & errors.
    if (callback) callback();
--- a/client/src/components/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -20,6 +20,7 @@ import ShopInfoTaskPresets from "./shop-info.task-presets.component";
 import queryString from "query-string";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import ShopInfoRoGuard from "./shop-info.roguard.component";
+import ShopInfoIntellipay from "./shop-intellipay-config.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -135,6 +136,17 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
      ],
      rome: "USE_IMEX",
      promanager: []
+    }),
+    ...InstanceRenderManager({
+      imex: [],
+      rome: [
+        {
+          key: "intellipay",
+          label: t("bodyshop.labels.intellipay"),
+          children: <ShopInfoIntellipay form={form} />
+        }
+      ],
+      promanager: []
    })
  ];
  return (
--- a/client/src/components/shop-info/shop-intellipay-config.component.jsx
+++ b/client/src/components/shop-info/shop-intellipay-config.component.jsx
@@ -0,0 +1,54 @@
+import { Alert, Form, InputNumber, Switch } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoIntellipay);
+
+export function ShopInfoIntellipay({ bodyshop, form }) {
+  const { t } = useTranslation();
+
+  return (
+    <>
+      <Form.Item dependencies={[["intellipay_config", "enable_cash_discount"]]}>
+        {() => {
+          const { intellipay_config } = form.getFieldsValue();
+
+          if (intellipay_config?.enable_cash_discount)
+            return <Alert message={t("bodyshop.labels.intellipay_cash_discount")} />;
+        }}
+      </Form.Item>
+
+      <LayoutFormRow noDivider>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.enable_cash_discount")}
+          valuePropName="checked"
+          name={["intellipay_config", "enable_cash_discount"]}
+        >
+          <Switch />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.cash_discount_percentage")}
+          valuePropName="checked"
+          dependencies={[["intellipay_config", "enable_cash_discount"]]}
+          name={["intellipay_config", "cash_discount_percentage"]}
+          rules={[
+            ({ getFieldsValue }) => ({ required: form.getFieldValue(["intellipay_config", "enable_cash_discount"]) })
+          ]}
+        >
+          <InputNumber min={0} max={100} precision={1} suffix='%'/>
+        </Form.Item>
+      </LayoutFormRow>
+    </>
+  );
+}
--- 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/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -138,7 +138,8 @@ export const QUERY_BODYSHOP = gql`
      tt_enforce_hours_for_tech_console
      md_tasks_presets
      use_paint_scale_data
-            md_ro_guard
+      intellipay_config
+      md_ro_guard
      employee_teams(order_by: { name: asc }, where: { active: { _eq: true } }) {
        id
        name
@@ -266,7 +267,8 @@ export const UPDATE_SHOP = gql`
        enforce_conversion_category
        tt_enforce_hours_for_tech_console
        md_tasks_presets
-                md_ro_guard
+        intellipay_config
+        md_ro_guard
        employee_teams(order_by: { name: asc }, where: { active: { _eq: true } }) {
          id
          name
--- a/client/src/pages/shop/shop.page.component.jsx
+++ b/client/src/pages/shop/shop.page.component.jsx
@@ -1,21 +1,21 @@
 import { Tabs } from "antd";
-import React, { useEffect } from "react";
-import { useLocation, useNavigate } from "react-router-dom";
 import queryString from "query-string";
+import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { useLocation, useNavigate } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
+import ShopCsiConfig from "../../components/shop-csi-config/shop-csi-config.component";
 import ShopEmployeesContainer from "../../components/shop-employees/shop-employees.container";
 import ShopInfoContainer from "../../components/shop-info/shop-info.container";
-import ShopCsiConfig from "../../components/shop-csi-config/shop-csi-config.component";
-import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
+import ShopInfoUsersComponent from "../../components/shop-users/shop-users.component";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import ShopInfoUsersComponent from "../../components/shop-users/shop-users.component";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";

-import ShopTeamsContainer from "../../components/shop-teams/shop-teams.container";
 import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
+import ShopTeamsContainer from "../../components/shop-teams/shop-teams.container";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
--- 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",
@@ -332,6 +332,10 @@
          "next_contact_hours": "Automatic Next Contact Date - Hours from Intake",
          "templates": "Intake Templates"
        },
+        "intellipay_config": {
+          "cash_discount_percentage": "Cash Discount %",
+          "enable_cash_discount": "Enable Cash Discounting"
+        },
        "invoice_federal_tax_rate": "Invoices - Federal Tax Rate",
        "invoice_local_tax_rate": "Invoices - Local Tax Rate",
        "invoice_state_tax_rate": "Invoices - State Tax Rate",
@@ -663,6 +667,8 @@
        "filehandlers": "Adjusters",
        "insurancecos": "Insurance Companies",
        "intakechecklist": "Intake Checklist",
+        "intellipay": "IntelliPay",
+        "intellipay_cash_discount": "Please ensure that cash discounting has been enabled on your merchant account. Reach out to IntelliPay Support if you need assistance. ",
        "jobstatuses": "Job Statuses",
        "laborrates": "Labor Rates",
        "licensing": "Licensing",
@@ -702,10 +708,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 +1141,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 +1150,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 +1163,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 +1176,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 +1191,6 @@
        "vehicle": "Vehicle"
      },
      "labels": {
-        "unsavedchanges": "Unsaved changes.",
        "actions": "Actions",
        "areyousure": "Are you sure?",
        "barcode": "Barcode",
@@ -1252,6 +1259,7 @@
        "tuesday": "Tuesday",
        "tvmode": "TV Mode",
        "unknown": "Unknown",
+        "unsavedchanges": "Unsaved changes.",
        "username": "Username",
        "view": "View",
        "wednesday": "Wednesday",
@@ -1365,6 +1373,7 @@
    },
    "job_payments": {
      "buttons": {
+        "create_short_link": "Generate Short Link",
        "goback": "Go Back",
        "proceedtopayment": "Proceed to Payment",
        "refundpayment": "Refund Payment"
@@ -2741,41 +2750,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 +2764,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 +2790,7 @@
            "qbo_usa": "QBO USA"
          }
        },
+        "card_size": "Card Size",
        "cardcolor": "Colored Cards",
        "cardsettings": "Card Settings",
        "clm_no": "Claim Number",
@@ -2830,48 +2799,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 +3431,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 +3581,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": "",
@@ -332,6 +332,10 @@
          "next_contact_hours": "",
          "templates": ""
        },
+        "intellipay_config": {
+          "cash_discount_percentage": "",
+          "enable_cash_discount": ""
+        },
        "invoice_federal_tax_rate": "",
        "invoice_local_tax_rate": "",
        "invoice_state_tax_rate": "",
@@ -663,6 +667,8 @@
        "filehandlers": "",
        "insurancecos": "",
        "intakechecklist": "",
+        "intellipay": "",
+        "intellipay_cash_discount": "",
        "jobstatuses": "",
        "laborrates": "",
        "licensing": "",
@@ -702,10 +708,10 @@
        "workingdays": ""
      },
      "successes": {
-        "save": "",
-        "unsavedchanges": "",
        "areyousure": "",
-        "defaultviewcreated": ""
+        "defaultviewcreated": "",
+        "save": "",
+        "unsavedchanges": ""
      },
      "validation": {
        "centermustexist": "",
@@ -1135,8 +1141,8 @@
    },
    "general": {
      "actions": {
-        "defaults": "defaults",
        "add": "",
+        "autoupdate": "",
        "calculate": "",
        "cancel": "",
        "clear": "",
@@ -1144,6 +1150,8 @@
        "copied": "",
        "copylink": "",
        "create": "",
+        "defaults": "defaults",
+        "delay": "",
        "delete": "Borrar",
        "deleteall": "",
        "deselectall": "",
@@ -1155,10 +1163,12 @@
        "print": "",
        "refresh": "",
        "remove": "",
+        "remove_alert": "",
        "reset": " Restablecer a original.",
        "resetpassword": "",
        "save": "Salvar",
        "saveandnew": "",
+        "saveas": "",
        "selectall": "",
        "send": "",
        "sendbysms": "",
@@ -1166,9 +1176,7 @@
        "submit": "",
        "tryagain": "",
        "view": "",
-        "viewreleasenotes": "",
-        "remove_alert": "",
-        "saveas": ""
+        "viewreleasenotes": ""
      },
      "errors": {
        "fcm": "",
@@ -1183,7 +1191,6 @@
        "vehicle": ""
      },
      "labels": {
-        "unsavedchanges": "",
        "actions": "Comportamiento",
        "areyousure": "",
        "barcode": "código de barras",
@@ -1252,6 +1259,7 @@
        "tuesday": "",
        "tvmode": "",
        "unknown": "Desconocido",
+        "unsavedchanges": "",
        "username": "",
        "view": "",
        "wednesday": "",
@@ -1365,6 +1373,7 @@
    },
    "job_payments": {
      "buttons": {
+        "create_short_link": "",
        "goback": "",
        "proceedtopayment": "",
        "refundpayment": ""
@@ -2741,41 +2750,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 +2764,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 +2790,7 @@
            "qbo_usa": ""
          }
        },
+        "card_size": "",
        "cardcolor": "",
        "cardsettings": "",
        "clm_no": "",
@@ -2830,48 +2799,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 +3431,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 +3581,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
--- 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
@@ -939,6 +939,7 @@
          - inhousevendorid
          - insurance_vendor_id
          - intakechecklist
+          - intellipay_config
          - jc_hourly_rates
          - jobsizelimit
          - last_name_first
@@ -1040,6 +1041,7 @@
          - inhousevendorid
          - insurance_vendor_id
          - intakechecklist
+          - intellipay_config
          - jc_hourly_rates
          - last_name_first
          - localmediaserverhttp
@@ -4240,6 +4242,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
--- a/hasura/migrations/1726511165929_alter_table_public_bodyshops_add_column_intellipay_config/down.sql
+++ b/hasura/migrations/1726511165929_alter_table_public_bodyshops_add_column_intellipay_config/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "intellipay_config" jsonb
+--  not null default jsonb_build_object();
--- a/hasura/migrations/1726511165929_alter_table_public_bodyshops_add_column_intellipay_config/up.sql
+++ b/hasura/migrations/1726511165929_alter_table_public_bodyshops_add_column_intellipay_config/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "intellipay_config" jsonb
+ not null default jsonb_build_object();
--- 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;
  }
--- a/server/email/sendemail.js
+++ b/server/email/sendemail.js
@@ -96,7 +96,21 @@ const sendServerEmail = async ({ subject, text }) => {
  }
 };

-const sendTaskEmail = async ({ to, subject, text, attachments }) => {
+const sendProManagerWelcomeEmail = async ({to, subject, html}) => {
+  try {
+    await transporter.sendMail({
+      from: `ProManager <noreply@promanager.web-est.com>`,
+      to,
+      subject,
+      html
+    });
+  } catch (error) {
+    console.log(error);
+    logger.log("server-email-failure", "error", null, null, error);
+  }
+};
+
+const sendTaskEmail = async ({ to, subject, type = "text", html, text, attachments }) => {
  try {
    transporter.sendMail(
      {
@@ -107,7 +121,7 @@ const sendTaskEmail = async ({ to, subject, text, attachments }) => {
        }),
        to: to,
        subject: subject,
-        text: text,
+        ...(type === "text" ? { text } : { html }),
        attachments: attachments || null
      },
      (err, info) => {
@@ -309,5 +323,6 @@ module.exports = {
  sendEmail,
  sendServerEmail,
  sendTaskEmail,
+  sendProManagerWelcomeEmail,
  emailBounce
 };
--- a/server/email/tasksEmails.js
+++ b/server/email/tasksEmails.js
@@ -94,8 +94,9 @@ const formatPriority = (priority) => {
 * @param taskId
 * @returns {{header, body: string, subHeader: string}}
 */
-const generateTemplateArgs = (title, priority, description, dueDate, bodyshop, job, taskId) => {
-  const endPoints = InstanceManager({
+
+const getEndpoints = () =>
+  InstanceManager({
    imex: process.env?.NODE_ENV === "test" ? "https://test.imex.online" : "https://imex.online",
    rome:
      bodyshop.convenient_company === "promanager"
@@ -106,6 +107,9 @@ const generateTemplateArgs = (title, priority, description, dueDate, bodyshop, j
          ? "https//test.romeonline.io"
          : "https://romeonline.io"
  });
+
+const generateTemplateArgs = (title, priority, description, dueDate, bodyshop, job, taskId) => {
+  const endPoints = getEndpoints();
  return {
    header: title,
    subHeader: `Body Shop: ${bodyshop.shopname} | Priority: ${formatPriority(priority)} ${formatDate(dueDate)}`,
@@ -333,5 +337,6 @@ const tasksRemindEmail = async (req, res) => {

 module.exports = {
  taskAssignedEmail,
-  tasksRemindEmail
+  tasksRemindEmail,
+  getEndpoints
 };
--- a/server/firebase/firebase-handler.js
+++ b/server/firebase/firebase-handler.js
@@ -1,30 +1,28 @@
-const admin = require("firebase-admin");
-const logger = require("../utils/logger");
 const path = require("path");
-const { auth } = require("firebase-admin");
-
 require("dotenv").config({
  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });
-const client = require("../graphql-client/graphql-client").client;

+const admin = require("firebase-admin");
+const logger = require("../utils/logger");
+const { sendProManagerWelcomeEmail } = require("../email/sendemail");
+const client = require("../graphql-client/graphql-client").client;
 const serviceAccount = require(process.env.FIREBASE_ADMINSDK_JSON);
-const adminEmail = require("../utils/adminEmail");
+const generateEmailTemplate = require("../email/generateTemplate");

 admin.initializeApp({
  credential: admin.credential.cert(serviceAccount),
  databaseURL: process.env.FIREBASE_DATABASE_URL
 });

-exports.admin = admin;
-
-exports.createUser = async (req, res) => {
+const createUser = async (req, res) => {
  logger.log("admin-create-user", "ADMIN", req.user.email, null, {
    request: req.body,
    ioadmin: true
  });

-  const { email, displayName, password, shopid, authlevel } = req.body;
+  const { email, displayName, password, shopid, authlevel, validemail } = req.body;
+
  try {
    const userRecord = await admin.auth().createUser({ email, displayName, password });

@@ -42,6 +40,7 @@ exports.createUser = async (req, res) => {
        user: {
          email: email.toLowerCase(),
          authid: userRecord.uid,
+          validemail,
          associations: {
            data: [{ shopid, authlevel, active: true }]
          }
@@ -58,21 +57,115 @@ exports.createUser = async (req, res) => {
  }
 };

-exports.updateUser = (req, res) => {
+const sendPromanagerWelcomeEmail = (req, res) => {
+  const { authid, email } = req.body;
+
+  // Fetch user from Firebase
+  admin
+    .auth()
+    .getUser(authid)
+    .then((userRecord) => {
+      if (!userRecord) {
+        return Promise.reject({ status: 404, message: "User not found in Firebase." });
+      }
+
+      // Fetch user data from the database using GraphQL
+      return client.request(
+        `
+        query GET_USER_BY_EMAIL($email: String!) {
+          users(where: { email: { _eq: $email } }) {
+            email
+            validemail
+            associations {
+              id
+              shopid
+              bodyshop {
+                id
+                convenient_company
+              }
+            }
+          }
+        }`,
+        { email: email.toLowerCase() }
+      );
+    })
+    .then((dbUserResult) => {
+      const dbUser = dbUserResult?.users?.[0];
+      if (!dbUser) {
+        return Promise.reject({ status: 404, message: "User not found in database." });
+      }
+
+      // Validate email before proceeding
+      if (!dbUser.validemail) {
+        logger.log("admin-send-welcome-email-skip", "ADMIN", req.user.email, null, {
+          message: "User email is not valid, skipping email.",
+          email
+        });
+        return res.status(200).json({ message: "User email is not valid, email not sent." });
+      }
+
+      // Check if the user's company is ProManager
+      const convenientCompany = dbUser.associations?.[0]?.bodyshop?.convenient_company;
+      if (convenientCompany !== "promanager") {
+        logger.log("admin-send-welcome-email-skip", "ADMIN", req.user.email, null, {
+          message: 'convenient_company is not "promanager", skipping email.',
+          convenientCompany
+        });
+        return res.status(200).json({ message: `convenient_company is not "promanager", email not sent.` });
+      }
+
+      // Generate password reset link
+      return admin
+        .auth()
+        .generatePasswordResetLink(dbUser.email)
+        .then((resetLink) => ({ dbUser, resetLink }));
+    })
+    .then(({ dbUser, resetLink }) => {
+      // Send welcome email (replace with your actual email-sending service)
+      return sendProManagerWelcomeEmail({
+        to: dbUser.email,
+        subject: "Welcome to the ProManager platform.",
+        html: generateEmailTemplate({
+          header: "",
+          subHeader: "",
+          body: `
+            <p>Welcome to the ProManager platform. Please click the link below to reset your password:</p>
+            <p><a href="${resetLink}">Reset your password</a></p>
+            <p>User Details:</p>
+            <ul>
+              <li>Email: ${dbUser.email}</li>
+            </ul>
+          `
+        })
+      });
+    })
+    .then(() => {
+      // Log success and return response
+      logger.log("admin-send-welcome-email", "ADMIN", req.user.email, null, {
+        request: req.body,
+        ioadmin: true,
+        emailSentTo: email
+      });
+      res.status(200).json({ message: "Welcome email sent successfully." });
+    })
+    .catch((error) => {
+      logger.log("admin-send-welcome-email-error", "ERROR", req.user.email, null, { error });
+
+      if (!res.headersSent) {
+        res.status(error.status || 500).json({
+          message: error.message || "Error sending welcome email.",
+          error
+        });
+      }
+    });
+};
+
+const updateUser = (req, res) => {
  logger.log("admin-update-user", "ADMIN", req.user.email, null, {
    request: req.body,
    ioadmin: true
  });

-  if (!adminEmail.includes(req.user.email) && !req.user.ioadmin) {
-    logger.log("admin-update-user-unauthorized", "ERROR", req.user.email, null, {
-      request: req.body,
-      user: req.user
-    });
-    res.sendStatus(404);
-    return;
-  }
-
  admin
    .auth()
    .updateUser(
@@ -105,26 +198,45 @@ exports.updateUser = (req, res) => {
    });
 };

-exports.getUser = (req, res) => {
+const getUser = (req, res) => {
  logger.log("admin-get-user", "ADMIN", req.user.email, null, {
    request: req.body,
    ioadmin: true
  });

-  if (!adminEmail.includes(req.user.email) && !req.user.ioadmin) {
-    logger.log("admin-update-user-unauthorized", "ERROR", req.user.email, null, {
-      request: req.body,
-      user: req.user
-    });
-    res.sendStatus(404);
-    return;
-  }
-
  admin
    .auth()
    .getUser(req.body.uid)
    .then((userRecord) => {
-      res.json(userRecord);
+      return client
+        .request(
+          `
+          query GET_USER_BY_AUTHID($authid: String!) {
+            users(where: { authid: { _eq: $authid } }) {
+              email
+              validemail
+              associations {
+                id
+                shopid
+                bodyshop {
+                  id
+                  convenient_company
+                }
+              }
+            }
+          }
+          `,
+          { authid: req.body.uid }
+        )
+        .then((dbUserResult) => {
+          res.json({
+            ...userRecord,
+            db: {
+              validemail: dbUserResult?.users?.[0]?.validemail,
+              company: dbUserResult?.users?.[0]?.associations?.[0]?.bodyshop?.convenient_company
+            }
+          });
+        });
    })
    .catch((error) => {
      logger.log("admin-get-user-error", "ERROR", req.user.email, null, {
@@ -134,7 +246,7 @@ exports.getUser = (req, res) => {
    });
 };

-exports.sendNotification = async (req, res) => {
+const sendNotification = async (req, res) => {
  setTimeout(() => {
    // Send a message to the device corresponding to the provided
    // registration token.
@@ -167,7 +279,7 @@ exports.sendNotification = async (req, res) => {
  }, 500);
 };

-exports.subscribe = async (req, res) => {
+const subscribe = async (req, res) => {
  const result = await admin
    .messaging()
    .subscribeToTopic(req.body.fcm_tokens, `${req.body.imexshopid}-${req.body.type}`);
@@ -175,7 +287,7 @@ exports.subscribe = async (req, res) => {
  res.json(result);
 };

-exports.unsubscribe = async (req, res) => {
+const unsubscribe = async (req, res) => {
  try {
    const result = await admin
      .messaging()
@@ -187,6 +299,17 @@ exports.unsubscribe = async (req, res) => {
  }
 };

+module.exports = {
+  admin,
+  createUser,
+  updateUser,
+  getUser,
+  sendPromanagerWelcomeEmail,
+  sendNotification,
+  subscribe,
+  unsubscribe
+};
+
 //Admin claims code.
 // const uid = "JEqqYlsadwPEXIiyRBR55fflfko1";

--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -2502,6 +2502,13 @@ exports.GET_JOBS_BY_PKS = `query GET_JOBS_BY_PKS($ids: [uuid!]!) {
  jobs(where: {id: {_in: $ids}}) {
    id
    shopid
+    ro_number
+    ownr_co_nm
+    ownr_fn
+    ownr_ln
+    v_make_desc
+    v_model_yr
+    v_model_desc
  }
 }
 `;
--- a/server/intellipay/intellipay.js
+++ b/server/intellipay/intellipay.js
@@ -7,7 +7,9 @@ const axios = require("axios");
 const moment = require("moment");
 const logger = require("../utils/logger");
 const InstanceManager = require("../utils/instanceMgr").default;
-
+const { sendTaskEmail } = require("../email/sendemail");
+const generateEmailTemplate = require("../email/generateTemplate");
+const { getEndpoints } = require("../email/tasksEmails");
 require("dotenv").config({
  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });
@@ -129,6 +131,7 @@ exports.generate_payment_url = async (req, res) => {
        //...req.body,
        amount: Dinero({ amount: Math.round(req.body.amount * 100) }).toFormat("0.00"),
        account: req.body.account,
+        comment: req.body.comment,
        invoice: req.body.invoice,
        createshorturl: true
        //The postback URL is set at the CP teller global terminal settings page.
@@ -162,7 +165,67 @@ exports.postback = async (req, res) => {
      return;
    }

-    if (values.invoice) {
+    if (comment) {
+      //Shifted the order to have this first to retain backwards compatibility for the old style of short link.
+      //This has been triggered by IO and may have multiple jobs.
+      const parsedComment = JSON.parse(comment);
+
+      //Adding in the user email to the short pay email.
+      //Need to check this to ensure backwards compatibility for clients that don't update.
+
+      const partialPayments = Array.isArray(parsedComment) ? parsedComment : parsedComment.payments;
+
+      const jobs = await gqlClient.request(queries.GET_JOBS_BY_PKS, {
+        ids: partialPayments.map((p) => p.jobid)
+      });
+
+      const paymentResult = await gqlClient.request(queries.INSERT_NEW_PAYMENT, {
+        paymentInput: partialPayments.map((p) => ({
+          amount: p.amount,
+          transactionid: values.authcode,
+          payer: "Customer",
+          type: values.cardtype,
+          jobid: p.jobid,
+          date: moment(Date.now()),
+          payment_responses: {
+            data: {
+              amount: values.total,
+              bodyshopid: jobs.jobs[0].shopid,
+              jobid: p.jobid,
+              declinereason: "Approved",
+              ext_paymentid: values.paymentid,
+              successful: true,
+              response: values
+            }
+          }
+        }))
+      });
+      logger.log("intellipay-postback-app-success", "DEBUG", req.user?.email, null, {
+        iprequest: values,
+        paymentResult
+      });
+
+      if (values.origin === "OneLink" && parsedComment.userEmail) {
+        //Send an email, it was a text to pay link.
+        const endPoints = getEndpoints();
+        sendTaskEmail({
+          to: parsedComment.userEmail,
+          subject: `New Payment(s) Received - RO ${jobs.jobs.map((j) => j.ro_number).join(", ")}`,
+          type: "html",
+          html: generateEmailTemplate({
+            header: "New Payment(s) Received",
+            subHeader: "",
+            body: jobs.jobs
+              .map(
+                (job) =>
+                  `Reference: <a href="${endPoints}/manage/jobs/${job.id}">${job.ro_number || "N/A"}</a> | ${job.ownr_co_nm ? job.ownr_co_nm : `${job.ownr_fn || ""} ${job.ownr_ln || ""}`.trim()} | ${`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`.trim()} | $${partialPayments.find((p) => p.jobid === job.id).amount}`
+              )
+              .join("<br/>")
+          })
+        });
+        res.sendStatus(200);
+      }
+    } else if (values.invoice) {
      //This is a link email that's been sent out.
      const job = await gqlClient.request(queries.GET_JOB_BY_PK, {
        id: values.invoice
@@ -198,39 +261,6 @@ exports.postback = async (req, res) => {
        paymentResult
      });
      res.sendStatus(200);
-    } else if (comment) {
-      //This has been triggered by IO and may have multiple jobs.
-      const partialPayments = JSON.parse(comment);
-      const jobs = await gqlClient.request(queries.GET_JOBS_BY_PKS, {
-        ids: partialPayments.map((p) => p.jobid)
-      });
-
-      const paymentResult = await gqlClient.request(queries.INSERT_NEW_PAYMENT, {
-        paymentInput: partialPayments.map((p) => ({
-          amount: p.amount,
-          transactionid: values.authcode,
-          payer: "Customer",
-          type: values.cardtype,
-          jobid: p.jobid,
-          date: moment(Date.now()),
-          payment_responses: {
-            data: {
-              amount: values.total,
-              bodyshopid: jobs.jobs[0].shopid,
-              jobid: p.jobid,
-              declinereason: "Approved",
-              ext_paymentid: values.paymentid,
-              successful: true,
-              response: values
-            }
-          }
-        }))
-      });
-      logger.log("intellipay-postback-app-success", "DEBUG", req.user?.email, null, {
-        iprequest: values,
-        paymentResult
-      });
-      res.sendStatus(200);
    }
  } catch (error) {
    logger.log("intellipay-postback-error", "ERROR", req.user?.email, null, {
--- a/server/routes/adminRoutes.js
+++ b/server/routes/adminRoutes.js
@@ -1,18 +1,20 @@
 const express = require("express");
 const router = express.Router();
-const fb = require("../firebase/firebase-handler");
 const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
 const { createAssociation, createShop, updateShop, updateCounter } = require("../admin/adminops");
+const { updateUser, getUser, createUser, sendPromanagerWelcomeEmail } = require("../firebase/firebase-handler");
 const validateAdminMiddleware = require("../middleware/validateAdminMiddleware");

 router.use(validateFirebaseIdTokenMiddleware);
+router.use(validateAdminMiddleware);

-router.post("/createassociation", validateAdminMiddleware, createAssociation);
-router.post("/createshop", validateAdminMiddleware, createShop);
-router.post("/updateshop", validateAdminMiddleware, updateShop);
-router.post("/updatecounter", validateAdminMiddleware, updateCounter);
-router.post("/updateuser", fb.updateUser);
-router.post("/getuser", fb.getUser);
-router.post("/createuser", fb.createUser);
+router.post("/createassociation", createAssociation);
+router.post("/createshop", createShop);
+router.post("/updateshop", updateShop);
+router.post("/updatecounter", updateCounter);
+router.post("/updateuser", updateUser);
+router.post("/getuser", getUser);
+router.post("/createuser", createUser);
+router.post("/promanagerwelcome", sendPromanagerWelcomeEmail);

 module.exports = router;
Author	SHA1	Message	Date
Allan Carr	646754732d	IO-2782 Adjust to Object for items Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-20 16:45:48 -07:00
Dave Richer	efc1157653	IO-2782 - Fix query Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-20 18:53:33 -04:00
Dave Richer	a5d3f2caf1	IO-2782-Send-Promanager-Welcome-Email - Update for merge conflict Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-19 13:11:02 -04:00
Dave Richer	4ad87a522c	IO-2782-Send-Promanager-Welcome-Email - Update for merge conflict Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-19 13:08:23 -04:00
Dave Richer	145cf7cc93	IO-2782-Send-Promanager-Welcome-Email - Finalize cleanup Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-19 12:54:26 -04:00
Dave Richer	cdb2d4d2d6	IO-2782-Send-Promanager-Welcome-Email - Cleanup of adminRoutes / firebase-handler.js Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-19 11:29:13 -04:00
Dave Richer	29f0031c1e	IO-2782-Send-Promanager-Welcome-Email - Send ProManager welcome email Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-18 18:30:02 -04:00
Patrick Fic	e3059b41ae	IO-2933 Resolve PR comments.	2024-09-18 11:19:43 -07:00
Patrick Fic	2a33f462a3	IO-2933 Add in email for succesful postback from Short URL.	2024-09-16 16:02:19 -07:00
Patrick Fic	cbc164dbeb	IO-2933 Add in ability to text payments for multiple ROs.	2024-09-16 14:33:17 -07:00
Patrick Fic	6382fdf19c	Merge branch 'feature/IO-2920-cash-discounting' into release/2024-09-20	2024-09-16 12:23:53 -07:00
Patrick Fic	9287e6608d	IO-2920 Pretty JSON Translation	2024-09-16 12:23:29 -07:00
Patrick Fic	d221763064	Merge branch 'feature/IO-2920-cash-discounting' into release/2024-09-20	2024-09-16 12:13:13 -07:00
Patrick Fic	b39a5b755e	IO-2920 Add hasura changes for cash discount & add config page.	2024-09-16 12:07:35 -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