IO-2913 Add in Translations

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
IO-2913 ADP Payroll Reports
2024-09-12 19:53:50 -07:00 · 2024-09-10 11:21:03 -07:00
15 changed files with 10902 additions and 12921 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -226,9 +226,7 @@ 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
@@ -315,9 +313,7 @@ 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
@@ -427,7 +423,7 @@ workflows:
          secret: ${HASURA_PROD_SECRET}
          filters:
            branches:
-              only: master-AIO
+              only: master
      - rome-api-deploy:
          filters:
            branches:
@@ -437,7 +433,7 @@ workflows:
            branches:
              only: master-AIO
      - rome-hasura-migrate:
-          secret: ${HASURA_ROME_PROD_SECRET}
+          secret: ${HASURA_PROD_SECRET}
          filters:
            branches:
              only: master-AIO
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
--- a/client/index.html
+++ b/client/index.html
@@ -2,9 +2,6 @@
 <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,6 +18,7 @@ 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";
@@ -107,6 +108,8 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
    return <LoadingSpinner message={t("general.labels.loggingin")} />;
  }

+  handleBeta();
+
  if (!online) {
    return (
      <Result
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -13,6 +13,7 @@ import Icon, {
  FileFilled,
  HomeFilled,
  ImportOutlined,
+  InfoCircleOutlined,
  LineChartOutlined,
  PaperClipOutlined,
  PhoneOutlined,
@@ -26,8 +27,8 @@ import Icon, {
  UserOutlined
 } from "@ant-design/icons";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Layout, Menu } from "antd";
-import React from "react";
+import { Layout, Menu, Switch, Tooltip } from "antd";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { BsKanban } from "react-icons/bs";
 import { FaCalendarAlt, FaCarCrash, FaCreditCard, FaFileInvoiceDollar, FaTasks } from "react-icons/fa";
@@ -42,6 +43,7 @@ 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";

@@ -113,21 +115,19 @@ function Header({
    names: ["ImEXPay", "DmsAp", "Simple_Inventory"],
    splitKey: bodyshop && bodyshop.imexshopid
  });
-
+  const [betaSwitch, setBetaSwitch] = useState(false);
  const { t } = useTranslation();

-  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`);
-    }
-  };
+  useEffect(() => {
+    const isBeta = checkBeta();
+    setBetaSwitch(isBeta);
+  }, []);

-  deleteBetaCookie();
+  const betaSwitchChange = (checked) => {
+    setBeta(checked);
+    setBetaSwitch(checked);
+    handleBeta();
+  };

  const accountingChildren = [];

@@ -695,6 +695,31 @@ 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/report-center-modal/report-center-modal.component.jsx
+++ b/client/src/components/report-center-modal/report-center-modal.component.jsx
@@ -34,28 +34,34 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
  const [form] = Form.useForm();
  const [search, setSearch] = useState("");
  const {
-    treatments: { Enhanced_Payroll }
+    treatments: { Enhanced_Payroll, ADPPayroll }
  } = useSplitTreatments({
    attributes: {},
-    names: ["Enhanced_Payroll"],
+    names: ["Enhanced_Payroll", "ADPPayroll"],
    splitKey: bodyshop.imexshopid
  });

  const [loading, setLoading] = useState(false);
  const { t } = useTranslation();
  const Templates = TemplateList("report_center");
-  const ReportsList =
-    Enhanced_Payroll.treatment === "on"
-      ? Object.keys(Templates)
-          .map((key) => {
-            return Templates[key];
-          })
-          .filter((temp) => temp.enhanced_payroll === undefined || temp.enhanced_payroll === true)
-      : Object.keys(Templates)
-          .map((key) => {
-            return Templates[key];
-          })
-          .filter((temp) => temp.enhanced_payroll === undefined || temp.enhanced_payroll === false);
+  const ReportsList = Object.keys(Templates)
+    .map((key) => Templates[key])
+    .filter((temp) => {
+      const enhancedPayrollOn = Enhanced_Payroll.treatment === "on";
+      const adpPayrollOn = ADPPayroll.treatment === "on";
+
+      if (enhancedPayrollOn && adpPayrollOn) {
+        return temp.enhanced_payroll !== false || temp.adp_payroll !== false;
+      }
+      if (enhancedPayrollOn) {
+        return temp.enhanced_payroll !== false && temp.adp_payroll !== true;
+      }
+      if (adpPayrollOn) {
+        return temp.adp_payroll !== false && temp.enhanced_payroll !== true;
+      }
+
+      return temp.enhanced_payroll !== true && temp.adp_payroll !== true;
+    });

  const { open } = reportCenterModal;

@@ -104,7 +110,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
        to: values.to,
        subject: Templates[values.key]?.subject
      },
-      values.sendbyexcel === "excel" ? "x" : values.sendby === "email" ? "e" : "p",
+      values.sendbytext === "text" ? values.sendbytext : values.sendbyexcel === "excel" ? "x" : values.sendby === "email" ? "e" : "p",
      id
    );
    setLoading(false);
@@ -291,7 +297,15 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                  </Radio.Group>
                </Form.Item>
              );
-            if (reporttype !== "excel")
+            if (reporttype === "text")
+              return (
+                <Form.Item label={t("general.labels.sendby")} name="sendbytext" initialValue="text">
+                  <Radio.Group>
+                    <Radio value="text">{t("general.labels.text")}</Radio>
+                  </Radio.Group>
+                </Form.Item>
+              );
+            if (reporttype !== "excel" || reporttype !== "text")
              return (
                <Form.Item label={t("general.labels.sendby")} name="sendby" initialValue="print">
                  <Radio.Group>
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -7,13 +7,13 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import DatePickerRanges from "../../utils/DatePickerRanges";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import FeatureWrapper, { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import PhoneFormItem, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import FeatureWrapper, { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 // TODO: Client Update, this might break
 const timeZonesList = Intl.supportedValuesOf("timeZone");
 const mapStateToProps = createStructuredSelector({
@@ -28,10 +28,10 @@ export function ShopInfoGeneral({ form, bodyshop }) {
  const { t } = useTranslation();

  const {
-    treatments: { ClosingPeriod }
+    treatments: { ClosingPeriod, ADPPayroll }
  } = useSplitTreatments({
    attributes: {},
-    names: ["ClosingPeriod"],
+    names: ["ClosingPeriod", "ADPPayroll"],
    splitKey: bodyshop && bodyshop.imexshopid
  });

@@ -98,7 +98,6 @@ export function ShopInfoGeneral({ form, bodyshop }) {
        <Form.Item label={t("bodyshop.fields.email")} name="email">
          <Input />
        </Form.Item>
-
        <Form.Item
          label={t("bodyshop.fields.phone")}
          name="phone"
@@ -356,14 +355,22 @@ export function ShopInfoGeneral({ form, bodyshop }) {
            <Select mode="tags" />
          </Form.Item>
          {ClosingPeriod.treatment === "on" && (
-            <>
-              <Form.Item
-                name={["accountingconfig", "ClosingPeriod"]}
-                label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
-              >
-                <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
-              </Form.Item>
-            </>
+            <Form.Item
+              name={["accountingconfig", "ClosingPeriod"]}
+              label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
+            >
+              <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
+            </Form.Item>
+          )}
+          {ADPPayroll.treatment === "on" && (
+            <Form.Item name={["accountingconfig", "companyCode"]} label={t("bodyshop.fields.companycode")}>
+              <Input />
+            </Form.Item>
+          )}
+          {ADPPayroll.treatment === "on" && (
+            <Form.Item name={["accountingconfig", "batchID"]} label={t("bodyshop.fields.batchid")}>
+              <Input />
+            </Form.Item>
          )}
        </LayoutFormRow>
      </FeatureWrapper>
--- a/client/src/components/update-alert/update-alert.component.jsx
+++ b/client/src/components/update-alert/update-alert.component.jsx
@@ -1,14 +1,13 @@
 import { AlertOutlined } from "@ant-design/icons";
-import { Alert, Button, Col, notification, Row, Space } from "antd";
+import { Alert, Button, Col, Row, Space } from "antd";
 import i18n from "i18next";
-import React, { useCallback, useEffect, useState } from "react";
+import React, { useEffect } 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
@@ -20,15 +19,6 @@ 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],
@@ -50,43 +40,11 @@ export function UpdateAlert({ updateAvailable }) {
    }
  });

-  const ReloadNewVersion = useCallback(() => {
-    setLoading(true);
-    updateServiceWorker(true);
-    setTimeout(() => {
-      window.location.reload(true);
-    }, 5000);
-  }, [updateServiceWorker]);
-
  useEffect(() => {
-    if (needRefresh) {
-      start();
-      setTimerStarted(true);
+    if (import.meta.env.DEV) {
+      console.log(`SW Status => Refresh? ${needRefresh} - offlineReady? ${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]);
+  }, [needRefresh, offlineReady]);

  if (!needRefresh) return null;

@@ -117,10 +75,9 @@ export function UpdateAlert({ updateAvailable }) {
              <Button onClick={() => window.open("https://imex-online.noticeable.news/", "_blank")}>
                {i18n.t("general.actions.viewreleasenotes")}
              </Button>
-              <Button loading={loading} type="primary" onClick={() => ReloadNewVersion()}>
-                {i18n.t("general.actions.refresh")} {`(${(timeLeft / 1000).toFixed(0)} s)`}
+              <Button type="primary" onClick={() => updateServiceWorker(true)}>
+                {i18n.t("general.actions.refresh")}
              </Button>
-              <Button onClick={() => start(300000)}>{i18n.t("general.actions.delay")}</Button>
            </Space>
          </Col>
        </Row>
--- a/client/src/firebase/firebase.utils.js
+++ b/client/src/firebase/firebase.utils.js
@@ -5,6 +5,7 @@ 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);
@@ -87,7 +88,7 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
    operationName: eventName,
    variables: additionalParams,
    dbevent: false,
-    env: "master"
+    env: checkBeta() ? "beta" : "master"
  });
  // console.log(
  //   "%c[Analytics]",
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -2158,6 +2158,32 @@ export const TemplateList = (type, context) => {
              field: i18n.t("tasks.fields.created_at")
            },
            group: "jobs"
+          },
+          adp_payroll_flat: {
+            title: i18n.t("reportcenter.templates.adp_payroll_flat"),
+            subject: i18n.t("reportcenter.templates.adp_payroll_flat"),
+            key: "adp_payroll_flat",
+            reporttype: "text",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.timetickets"),
+              field: i18n.t("timetickets.fields.committed_at")
+            },
+            group: "payroll",
+            adp_payroll: true
+          },
+          adp_payroll_straight: {
+            title: i18n.t("reportcenter.templates.adp_payroll_straight"),
+            subject: i18n.t("reportcenter.templates.adp_payroll_straight"),
+            key: "adp_payroll_straight",
+            reporttype: "text",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.timetickets"),
+              field: i18n.t("timetickets.fields.date")
+            },
+            group: "payroll",
+            adp_payroll: true
          }
        }
      : {}),
--- a/client/src/utils/countdownHook.js
+++ b/client/src/utils/countdownHook.js
@@ -1,84 +0,0 @@
-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
@@ -0,0 +1,47 @@
+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;
Author	SHA1	Message	Date
Allan Carr	9aa1279144	IO-2913 Add in Translations Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-12 19:53:50 -07:00
Allan Carr	fd9a51209f	IO-2913 ADP Payroll Reports Uses ADPPayroll Split Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-10 11:21:03 -07:00