IO-2957 Resolve task reminders not sending with incorrect references.

Merged in feature/IO-2945-intellipaypostbackhandling (pull request #1765 )
feature/IO-2945-intellipaypostbackhandling Approved-by: Patrick Fic
2024-09-23 18:02:17 -07:00 · 2024-09-23 22:15:51 +00:00 · 2024-09-23 15:04:51 -07:00 · 2024-09-20 23:46:03 +00:00 · 2024-09-20 23:45:00 +00:00 · 2024-09-20 16:45:48 -07:00
86 changed files with 5161 additions and 3733 deletions
--- a/_reference/prHelper.html
+++ b/_reference/prHelper.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>IMEX IO Extractor</title>
+  <style>
+    body {
+      font-family: Arial, sans-serif;
+      padding: 20px;
+    }
+    textarea {
+      width: 100%;
+      height: 200px;
+    }
+    .output-box {
+      margin-top: 20px;
+      padding: 10px;
+      border: 1px solid #ccc;
+      background-color: #f9f9f9;
+      min-height: 40px;
+    }
+    .copy-button {
+      margin-top: 10px;
+    }
+  </style>
+</head>
+<body>
+<h1>IMEX IO Extractor</h1>
+<textarea id="inputText" placeholder="Paste your text here..."></textarea>
+<br>
+<button onclick="extractIO()">Extract</button>
+
+<div class="output-box" id="outputBox" contenteditable="true"></div>
+<button class="copy-button" onclick="copyToClipboard()">Copy to Clipboard</button>
+
+<script>
+  function extractIO() {
+    const inputText = document.getElementById('inputText').value;
+    const ioNumbers = [...new Set(inputText.match(/IO-\d{4}/g))] // Extract unique IO-#### matches
+      .map(io => ({ io, num: parseInt(io.split('-')[1]) }))    // Extract number part for sorting
+      .sort((a, b) => a.num - b.num)                           // Sort by the number
+      .map(item => item.io);                                   // Extract sorted IO-####
+
+    document.getElementById('outputBox').innerText = ioNumbers.join(', '); // Display horizontally
+  }
+
+  function copyToClipboard() {
+    const outputBox = document.getElementById('outputBox');
+    const range = document.createRange();
+    range.selectNodeContents(outputBox);
+    const selection = window.getSelection();
+    selection.removeAllRanges();
+    selection.addRange(range);
+    document.execCommand('copy');
+  }
+</script>
+</body>
+</html>
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
    <!--

    BabelEdit project file
@@ -22361,6 +22361,27 @@
                            <folder_node>
                                <name>buttons</name>
                                <children>
+                                    <concept_node>
+                                        <name>create_short_link</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                    <concept_node>
                                        <name>goback</name>
                                        <definition_loaded>false</definition_loaded>
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -7,6 +7,7 @@
    "": {
      "name": "bodyshop",
      "version": "0.2.1",
+      "hasInstallScript": true,
      "dependencies": {
        "@ant-design/pro-layout": "^7.19.12",
        "@apollo/client": "^3.11.4",
--- a/client/package.json
+++ b/client/package.json
@@ -84,6 +84,7 @@
    "web-vitals": "^3.5.2"
  },
  "scripts": {
+    "postinstall": "echo 'when updating react-big-calendar, remember to check to localizer in the calendar wrapper'",
    "analyze": "source-map-explorer 'build/static/js/*.js'",
    "start": "vite",
    "build": "dotenvx run --env-file=.env.development.imex -- vite build",
--- 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);
@@ -37,7 +45,7 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi

  const [, { data, refetch, queryLoading }] = useLazyQuery(QUERY_RO_AND_OWNER_BY_JOB_PKS, {
    variables: { jobids: [context.jobid] },
-    skip: true
+    skip: !context?.jobid
  });

  //Initialize the intellipay window.
@@ -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}>
@@ -202,16 +244,14 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi

          <Form.Item
            shouldUpdate={(prevValues, curValues) =>
-              prevValues.payments?.map((p) => p?.jobid).join() !== curValues.payments?.map((p) => p?.jobid).join()
+              prevValues.payments?.map((p) => p?.jobid + p?.amount).join() !==
+              curValues.payments?.map((p) => p?.jobid + p?.amount).join()
            }
          >
            {() => {
              //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 +286,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 +312,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/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/production-board-kanban/production-board-kanban.container.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.container.jsx
@@ -1,8 +1,12 @@
-import React, { useEffect, useMemo } from "react";
+import React, { useEffect, useMemo, useRef } from "react";
 import { useQuery, useSubscription } from "@apollo/client";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { QUERY_JOBS_IN_PRODUCTION, SUBSCRIPTION_JOBS_IN_PRODUCTION } from "../../graphql/jobs.queries";
+import {
+  QUERY_JOBS_IN_PRODUCTION,
+  SUBSCRIPTION_JOBS_IN_PRODUCTION,
+  SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW
+} from "../../graphql/jobs.queries";
 import { QUERY_KANBAN_SETTINGS } from "../../graphql/user.queries";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import ProductionBoardKanbanComponent from "./production-board-kanban.component";
@@ -12,7 +16,9 @@ const mapStateToProps = createStructuredSelector({
  currentUser: selectCurrentUser
 });

-function ProductionBoardKanbanContainer({ bodyshop, currentUser }) {
+function ProductionBoardKanbanContainer({ bodyshop, currentUser, subscriptionType = "direct" }) {
+  const fired = useRef(false); // useRef to keep track of whether the subscription fired
+
  const combinedStatuses = useMemo(
    () => [
      ...bodyshop.md_ro_statuses.production_statuses,
@@ -28,9 +34,12 @@ function ProductionBoardKanbanContainer({ bodyshop, currentUser }) {
    onError: (error) => console.error(`Error fetching jobs in production: ${error.message}`)
  });

-  const { data: updatedJobs } = useSubscription(SUBSCRIPTION_JOBS_IN_PRODUCTION, {
-    onError: (error) => console.error(`Error subscribing to jobs in production: ${error.message}`)
-  });
+  const { data: updatedJobs } = useSubscription(
+    subscriptionType === "view" ? SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW : SUBSCRIPTION_JOBS_IN_PRODUCTION,
+    {
+      onError: (error) => console.error(`Error subscribing to jobs in production: ${error.message}`)
+    }
+  );

  const { loading: associationSettingsLoading, data: associationSettings } = useQuery(QUERY_KANBAN_SETTINGS, {
    variables: { email: currentUser.email },
@@ -40,10 +49,15 @@ function ProductionBoardKanbanContainer({ bodyshop, currentUser }) {
  // const currentReducerData = useSelector((state) => (state.trello.lanes ? state.trello : {}));

  useEffect(() => {
-    if (updatedJobs && data) {
-      refetch().catch((err) => console.error(`Error re-fetching jobs in production: ${err.message}`));
+    if (!updatedJobs) {
+      return;
    }
-  }, [updatedJobs, data, refetch]);
+    if (!fired.current) {
+      fired.current = true;
+      return;
+    }
+    refetch().catch((err) => console.error(`Error re-fetching jobs in production: ${err.message}`));
+  }, [updatedJobs, refetch]);

  const filteredAssociationSettings = useMemo(() => {
    return associationSettings?.associations[0] || null;
--- a/client/src/components/production-list-columns/production-list-columns.data.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.data.jsx
@@ -298,6 +298,16 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
      ellipsis: true,
      sorter: (a, b) => statusSort(a.status, b.status, activeStatuses),
      sortOrder: state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+      filters:
+        activeStatuses
+          ?.map((s) => {
+            return {
+              text: s || "No Status*",
+              value: [s]
+            };
+          })
+          .sort((a, b) => statusSort(a.text, b.text, activeStatuses)) || [],
+      onFilter: (value, record) => value.includes(record.status),
      render: (text, record) => <ProductionListColumnStatus record={record} />
    },
    {
--- a/client/src/components/production-list-table/production-list-table.container.jsx
+++ b/client/src/components/production-list-table/production-list-table.container.jsx
@@ -4,12 +4,13 @@ import {
  QUERY_EXACT_JOB_IN_PRODUCTION,
  QUERY_EXACT_JOBS_IN_PRODUCTION,
  QUERY_JOBS_IN_PRODUCTION,
-  SUBSCRIPTION_JOBS_IN_PRODUCTION
+  SUBSCRIPTION_JOBS_IN_PRODUCTION,
+  SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW
 } from "../../graphql/jobs.queries";
 import ProductionListTable from "./production-list-table.component";
 import _ from "lodash";

-export default function ProductionListTableContainer() {
+export default function ProductionListTableContainer({ subscriptionType = "direct" }) {
  const { refetch, loading, data } = useQuery(QUERY_JOBS_IN_PRODUCTION, {
    pollInterval: 3600000,
    fetchPolicy: "network-only",
@@ -17,7 +18,9 @@ export default function ProductionListTableContainer() {
  });
  const client = useApolloClient();
  const [joblist, setJoblist] = useState([]);
-  const { data: updatedJobs } = useSubscription(SUBSCRIPTION_JOBS_IN_PRODUCTION);
+  const { data: updatedJobs } = useSubscription(
+    subscriptionType === "view" ? SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW : SUBSCRIPTION_JOBS_IN_PRODUCTION
+  );

  useEffect(() => {
    if (!(data && data.jobs)) return;
--- a/client/src/components/schedule-calendar-wrapper/localizer.js
+++ b/client/src/components/schedule-calendar-wrapper/localizer.js
@@ -0,0 +1,505 @@
+import isBetween from "dayjs/plugin/isBetween";
+import isSameOrAfter from "dayjs/plugin/isSameOrAfter";
+import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
+import localeData from "dayjs/plugin/localeData";
+import localizedFormat from "dayjs/plugin/localizedFormat";
+import minMax from "dayjs/plugin/minMax";
+import utc from "dayjs/plugin/utc";
+import { DateLocalizer } from "react-big-calendar";
+
+function arrayWithHoles(arr) {
+  if (Array.isArray(arr)) return arr;
+}
+
+function iterableToArrayLimit(arr, i) {
+  if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
+  var _arr = [];
+  var _n = true;
+  var _d = false;
+  var _e = undefined;
+  try {
+    for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+      _arr.push(_s.value);
+      if (i && _arr.length === i) break;
+    }
+  } catch (err) {
+    _d = true;
+    _e = err;
+  } finally {
+    try {
+      if (!_n && _i["return"] != null) _i["return"]();
+    } finally {
+      if (_d) throw _e;
+    }
+  }
+  return _arr;
+}
+
+function unsupportedIterableToArray(o, minLen) {
+  if (!o) return;
+  if (typeof o === "string") return arrayLikeToArray(o, minLen);
+  var n = Object.prototype.toString.call(o).slice(8, -1);
+  if (n === "Object" && o.constructor) n = o.constructor.name;
+  if (n === "Map" || n === "Set") return Array.from(o);
+  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return arrayLikeToArray(o, minLen);
+}
+
+function arrayLikeToArray(arr, len) {
+  if (len == null || len > arr.length) len = arr.length;
+  for (var i = 0, arr2 = new Array(len); i < len; i++) {
+    arr2[i] = arr[i];
+  }
+  return arr2;
+}
+
+function nonIterableRest() {
+  throw new TypeError(
+    "Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."
+  );
+}
+
+function _slicedToArray(arr, i) {
+  return arrayWithHoles(arr) || iterableToArrayLimit(arr, i) || unsupportedIterableToArray(arr, i) || nonIterableRest();
+}
+
+function fixUnit(unit) {
+  var datePart = unit ? unit.toLowerCase() : unit;
+  if (datePart === "FullYear") {
+    datePart = "year";
+  } else if (!datePart) {
+    datePart = undefined;
+  }
+  return datePart;
+}
+
+var timeRangeFormat = function timeRangeFormat(_ref3, culture, local) {
+  var start = _ref3.start,
+    end = _ref3.end;
+  return local.format(start, "LT", culture) + " – " + local.format(end, "LT", culture);
+};
+var timeRangeStartFormat = function timeRangeStartFormat(_ref4, culture, local) {
+  var start = _ref4.start;
+  return local.format(start, "LT", culture) + " – ";
+};
+var timeRangeEndFormat = function timeRangeEndFormat(_ref5, culture, local) {
+  var end = _ref5.end;
+  return " – " + local.format(end, "LT", culture);
+};
+var weekRangeFormat = function weekRangeFormat(_ref, culture, local) {
+  var start = _ref.start,
+    end = _ref.end;
+  return (
+    local.format(start, "MMMM DD", culture) +
+    " – " +
+    // updated to use this localizer 'eq()' method
+    local.format(end, local.eq(start, end, "month") ? "DD" : "MMMM DD", culture)
+  );
+};
+var dateRangeFormat = function dateRangeFormat(_ref2, culture, local) {
+  var start = _ref2.start,
+    end = _ref2.end;
+  return local.format(start, "L", culture) + " – " + local.format(end, "L", culture);
+};
+
+var formats = {
+  dateFormat: "DD",
+  dayFormat: "DD ddd",
+  weekdayFormat: "ddd",
+  selectRangeFormat: timeRangeFormat,
+  eventTimeRangeFormat: timeRangeFormat,
+  eventTimeRangeStartFormat: timeRangeStartFormat,
+  eventTimeRangeEndFormat: timeRangeEndFormat,
+  timeGutterFormat: "LT",
+  monthHeaderFormat: "MMMM YYYY",
+  dayHeaderFormat: "dddd MMM DD",
+  dayRangeHeaderFormat: weekRangeFormat,
+  agendaHeaderFormat: dateRangeFormat,
+  agendaDateFormat: "ddd MMM DD",
+  agendaTimeFormat: "LT",
+  agendaTimeRangeFormat: timeRangeFormat
+};
+
+const localizer = (dayjsLib) => {
+  // load dayjs plugins
+  dayjsLib.extend(isBetween);
+  dayjsLib.extend(isSameOrAfter);
+  dayjsLib.extend(isSameOrBefore);
+  dayjsLib.extend(localeData);
+  dayjsLib.extend(localizedFormat);
+  dayjsLib.extend(minMax);
+  dayjsLib.extend(utc);
+  var locale = function locale(dj, c) {
+    return c ? dj.locale(c) : dj;
+  };
+
+  // if the timezone plugin is loaded,
+  // then use the timezone aware version
+
+  //TODO This was the issue entirely...
+  //  var dayjs = dayjsLib.tz ? dayjsLib.tz : dayjsLib;
+  var dayjs = dayjsLib;
+
+  function getTimezoneOffset(date) {
+    // ensures this gets cast to timezone
+    return dayjs(date).toDate().getTimezoneOffset();
+  }
+
+  function getDstOffset(start, end) {
+    var _st$tz$$x$$timezone;
+    // convert to dayjs, in case
+    var st = dayjs(start);
+    var ed = dayjs(end);
+    // if not using the dayjs timezone plugin
+    if (!dayjs.tz) {
+      return st.toDate().getTimezoneOffset() - ed.toDate().getTimezoneOffset();
+    }
+    /**
+     * If a default timezone has been applied, then
+     * use this to get the proper timezone offset, otherwise default
+     * the timezone to the browser local
+     */
+    var tzName =
+      (_st$tz$$x$$timezone = st.tz().$x.$timezone) !== null && _st$tz$$x$$timezone !== void 0
+        ? _st$tz$$x$$timezone
+        : dayjsLib.tz.guess();
+    // invert offsets to be inline with moment.js
+    var startOffset = -dayjs.tz(+st, tzName).utcOffset();
+    var endOffset = -dayjs.tz(+ed, tzName).utcOffset();
+    return startOffset - endOffset;
+  }
+
+  function getDayStartDstOffset(start) {
+    var dayStart = dayjs(start).startOf("day");
+    return getDstOffset(dayStart, start);
+  }
+
+  /*** BEGIN localized date arithmetic methods with dayjs ***/
+  function defineComparators(a, b, unit) {
+    var datePart = fixUnit(unit);
+    var dtA = datePart ? dayjs(a).startOf(datePart) : dayjs(a);
+    var dtB = datePart ? dayjs(b).startOf(datePart) : dayjs(b);
+    return [dtA, dtB, datePart];
+  }
+
+  function startOf() {
+    var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+    var unit = arguments.length > 1 ? arguments[1] : undefined;
+    var datePart = fixUnit(unit);
+    if (datePart) {
+      return dayjs(date).startOf(datePart).toDate();
+    }
+    return dayjs(date).toDate();
+  }
+
+  function endOf() {
+    var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+    var unit = arguments.length > 1 ? arguments[1] : undefined;
+    var datePart = fixUnit(unit);
+    if (datePart) {
+      return dayjs(date).endOf(datePart).toDate();
+    }
+    return dayjs(date).toDate();
+  }
+
+  // dayjs comparison operations *always* convert both sides to dayjs objects
+  // prior to running the comparisons
+  function eq(a, b, unit) {
+    var _defineComparators = defineComparators(a, b, unit),
+      _defineComparators2 = _slicedToArray(_defineComparators, 3),
+      dtA = _defineComparators2[0],
+      dtB = _defineComparators2[1],
+      datePart = _defineComparators2[2];
+    return dtA.isSame(dtB, datePart);
+  }
+
+  function neq(a, b, unit) {
+    return !eq(a, b, unit);
+  }
+
+  function gt(a, b, unit) {
+    var _defineComparators3 = defineComparators(a, b, unit),
+      _defineComparators4 = _slicedToArray(_defineComparators3, 3),
+      dtA = _defineComparators4[0],
+      dtB = _defineComparators4[1],
+      datePart = _defineComparators4[2];
+    return dtA.isAfter(dtB, datePart);
+  }
+
+  function lt(a, b, unit) {
+    var _defineComparators5 = defineComparators(a, b, unit),
+      _defineComparators6 = _slicedToArray(_defineComparators5, 3),
+      dtA = _defineComparators6[0],
+      dtB = _defineComparators6[1],
+      datePart = _defineComparators6[2];
+    return dtA.isBefore(dtB, datePart);
+  }
+
+  function gte(a, b, unit) {
+    var _defineComparators7 = defineComparators(a, b, unit),
+      _defineComparators8 = _slicedToArray(_defineComparators7, 3),
+      dtA = _defineComparators8[0],
+      dtB = _defineComparators8[1],
+      datePart = _defineComparators8[2];
+    return dtA.isSameOrBefore(dtB, datePart);
+  }
+
+  function lte(a, b, unit) {
+    var _defineComparators9 = defineComparators(a, b, unit),
+      _defineComparators10 = _slicedToArray(_defineComparators9, 3),
+      dtA = _defineComparators10[0],
+      dtB = _defineComparators10[1],
+      datePart = _defineComparators10[2];
+    return dtA.isSameOrBefore(dtB, datePart);
+  }
+
+  function inRange(day, min, max) {
+    var unit = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "day";
+    var datePart = fixUnit(unit);
+    var djDay = dayjs(day);
+    var djMin = dayjs(min);
+    var djMax = dayjs(max);
+    return djDay.isBetween(djMin, djMax, datePart, "[]");
+  }
+
+  function min(dateA, dateB) {
+    var dtA = dayjs(dateA);
+    var dtB = dayjs(dateB);
+    var minDt = dayjsLib.min(dtA, dtB);
+    return minDt.toDate();
+  }
+
+  function max(dateA, dateB) {
+    var dtA = dayjs(dateA);
+    var dtB = dayjs(dateB);
+    var maxDt = dayjsLib.max(dtA, dtB);
+    return maxDt.toDate();
+  }
+
+  function merge(date, time) {
+    if (!date && !time) return null;
+    var tm = dayjs(time).format("HH:mm:ss");
+    var dt = dayjs(date).startOf("day").format("MM/DD/YYYY");
+    // We do it this way to avoid issues when timezone switching
+    return dayjsLib("".concat(dt, " ").concat(tm), "MM/DD/YYYY HH:mm:ss").toDate();
+  }
+
+  function add(date, adder, unit) {
+    var datePart = fixUnit(unit);
+    return dayjs(date).add(adder, datePart).toDate();
+  }
+
+  function range(start, end) {
+    var unit = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "day";
+    var datePart = fixUnit(unit);
+    // because the add method will put these in tz, we have to start that way
+    var current = dayjs(start).toDate();
+    var days = [];
+    while (lte(current, end)) {
+      days.push(current);
+      current = add(current, 1, datePart);
+    }
+    return days;
+  }
+
+  function ceil(date, unit) {
+    var datePart = fixUnit(unit);
+    var floor = startOf(date, datePart);
+    return eq(floor, date) ? floor : add(floor, 1, datePart);
+  }
+
+  function diff(a, b) {
+    var unit = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "day";
+    var datePart = fixUnit(unit);
+    // don't use 'defineComparators' here, as we don't want to mutate the values
+    var dtA = dayjs(a);
+    var dtB = dayjs(b);
+    return dtB.diff(dtA, datePart);
+  }
+
+  function minutes(date) {
+    var dt = dayjs(date);
+    return dt.minutes();
+  }
+
+  function firstOfWeek(culture) {
+    var data = culture ? dayjsLib.localeData(culture) : dayjsLib.localeData();
+    return data ? data.firstDayOfWeek() : 0;
+  }
+
+  function firstVisibleDay(date) {
+    return dayjs(date).startOf("month").startOf("week").toDate();
+  }
+
+  function lastVisibleDay(date) {
+    return dayjs(date).endOf("month").endOf("week").toDate();
+  }
+
+  function visibleDays(date) {
+    var current = firstVisibleDay(date);
+    var last = lastVisibleDay(date);
+    var days = [];
+    while (lte(current, last)) {
+      days.push(current);
+      current = add(current, 1, "d");
+    }
+    return days;
+  }
+
+  /*** END localized date arithmetic methods with dayjs ***/
+
+  /**
+   * Moved from TimeSlots.js, this method overrides the method of the same name
+   * in the localizer.js, using dayjs to construct the js Date
+   * @param {Date} dt - date to start with
+   * @param {Number} minutesFromMidnight
+   * @param {Number} offset
+   * @returns {Date}
+   */
+  function getSlotDate(dt, minutesFromMidnight, offset) {
+    return dayjs(dt)
+      .startOf("day")
+      .minute(minutesFromMidnight + offset)
+      .toDate();
+  }
+
+  // dayjs will automatically handle DST differences in it's calculations
+  function getTotalMin(start, end) {
+    return diff(start, end, "minutes");
+  }
+
+  function getMinutesFromMidnight(start) {
+    var dayStart = dayjs(start).startOf("day");
+    var day = dayjs(start);
+    return day.diff(dayStart, "minutes") + getDayStartDstOffset(start);
+  }
+
+  // These two are used by DateSlotMetrics
+  function continuesPrior(start, first) {
+    var djStart = dayjs(start);
+    var djFirst = dayjs(first);
+    return djStart.isBefore(djFirst, "day");
+  }
+
+  function continuesAfter(start, end, last) {
+    var djEnd = dayjs(end);
+    var djLast = dayjs(last);
+    return djEnd.isSameOrAfter(djLast, "minutes");
+  }
+
+  function daySpan(start, end) {
+    var startDay = dayjs(start);
+    var endDay = dayjs(end);
+    return endDay.diff(startDay, "day");
+  }
+
+  // These two are used by eventLevels
+  function sortEvents(_ref6) {
+    var _ref6$evtA = _ref6.evtA,
+      aStart = _ref6$evtA.start,
+      aEnd = _ref6$evtA.end,
+      aAllDay = _ref6$evtA.allDay,
+      _ref6$evtB = _ref6.evtB,
+      bStart = _ref6$evtB.start,
+      bEnd = _ref6$evtB.end,
+      bAllDay = _ref6$evtB.allDay;
+    var startSort = +startOf(aStart, "day") - +startOf(bStart, "day");
+    var durA = daySpan(aStart, aEnd);
+    var durB = daySpan(bStart, bEnd);
+    return (
+      startSort ||
+      // sort by start Day first
+      durB - durA ||
+      // events spanning multiple days go first
+      !!bAllDay - !!aAllDay ||
+      // then allDay single day events
+      +aStart - +bStart ||
+      // then sort by start time *don't need dayjs conversion here
+      +aEnd - +bEnd // then sort by end time *don't need dayjs conversion here either
+    );
+  }
+
+  function inEventRange(_ref7) {
+    var _ref7$event = _ref7.event,
+      start = _ref7$event.start,
+      end = _ref7$event.end,
+      _ref7$range = _ref7.range,
+      rangeStart = _ref7$range.start,
+      rangeEnd = _ref7$range.end;
+    var startOfDay = dayjs(start).startOf("day");
+    var eEnd = dayjs(end);
+    var rStart = dayjs(rangeStart);
+    var rEnd = dayjs(rangeEnd);
+    var startsBeforeEnd = startOfDay.isSameOrBefore(rEnd, "day");
+    // when the event is zero duration we need to handle a bit differently
+    var sameMin = !startOfDay.isSame(eEnd, "minutes");
+    var endsAfterStart = sameMin ? eEnd.isAfter(rStart, "minutes") : eEnd.isSameOrAfter(rStart, "minutes");
+    return startsBeforeEnd && endsAfterStart;
+  }
+
+  function isSameDate(date1, date2) {
+    var dt = dayjs(date1);
+    var dt2 = dayjs(date2);
+    return dt.isSame(dt2, "day");
+  }
+
+  /**
+   * This method, called once in the localizer constructor, is used by eventLevels
+   * 'eventSegments()' to assist in determining the 'span' of the event in the display,
+   * specifically when using a timezone that is greater than the browser native timezone.
+   * @returns number
+   */
+  function browserTZOffset() {
+    /**
+     * Date.prototype.getTimezoneOffset horrifically flips the positive/negative from
+     * what you see in it's string, so we have to jump through some hoops to get a value
+     * we can actually compare.
+     */
+    var dt = new Date();
+    var neg = /-/.test(dt.toString()) ? "-" : "";
+    var dtOffset = dt.getTimezoneOffset();
+    var comparator = Number("".concat(neg).concat(Math.abs(dtOffset)));
+    // dayjs correctly provides positive/negative offset, as expected
+    var mtOffset = dayjs().utcOffset();
+    return mtOffset > comparator ? 1 : 0;
+  }
+
+  return new DateLocalizer({
+    formats: formats,
+    firstOfWeek: firstOfWeek,
+    firstVisibleDay: firstVisibleDay,
+    lastVisibleDay: lastVisibleDay,
+    visibleDays: visibleDays,
+    format: function format(value, _format, culture) {
+      return locale(dayjs(value), culture).format(_format);
+    },
+    lt: lt,
+    lte: lte,
+    gt: gt,
+    gte: gte,
+    eq: eq,
+    neq: neq,
+    merge: merge,
+    inRange: inRange,
+    startOf: startOf,
+    endOf: endOf,
+    range: range,
+    add: add,
+    diff: diff,
+    ceil: ceil,
+    min: min,
+    max: max,
+    minutes: minutes,
+    getSlotDate: getSlotDate,
+    getTimezoneOffset: getTimezoneOffset,
+    getDstOffset: getDstOffset,
+    getTotalMin: getTotalMin,
+    getMinutesFromMidnight: getMinutesFromMidnight,
+    continuesPrior: continuesPrior,
+    continuesAfter: continuesAfter,
+    sortEvents: sortEvents,
+    inEventRange: inEventRange,
+    isSameDate: isSameDate,
+    browserTZOffset: browserTZOffset
+  });
+};
+export default localizer;
--- a/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
+++ b/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
@@ -1,7 +1,7 @@
 import dayjs from "../../utils/day";
 import queryString from "query-string";
 import React from "react";
-import { Calendar, dayjsLocalizer } from "react-big-calendar";
+import { Calendar } from "react-big-calendar";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
@@ -14,12 +14,13 @@ import { selectProblemJobs } from "../../redux/application/application.selectors
 import { Alert, Collapse, Space } from "antd";
 import { Trans, useTranslation } from "react-i18next";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import local from "./localizer";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  problemJobs: selectProblemJobs
 });
-const localizer = dayjsLocalizer(dayjs);
+const localizer = local(dayjs);

 export function ScheduleCalendarWrapperComponent({
  bodyshop,
--- a/client/src/firebase/firebase.utils.js
+++ b/client/src/firebase/firebase.utils.js
@@ -87,7 +87,7 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
    operationName: eventName,
    variables: additionalParams,
    dbevent: false,
-    env: "master"
+    env: `master-AIO|${import.meta.env.VITE_APP_GIT_SHA_DATE}`
  });
  // console.log(
  //   "%c[Analytics]",
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -2461,6 +2461,14 @@ export const SUBSCRIPTION_JOBS_IN_PRODUCTION = gql`
    }
  }
 `;
+export const SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW = gql`
+  subscription SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW {
+    jobs: jobs_inproduction {
+      id
+      updated_at
+    }
+  }
+`;

 export const QUERY_JOBS_IN_PRODUCTION = gql`
  query QUERY_JOBS_IN_PRODUCTION {
--- a/client/src/pages/production-board/production-board.component.jsx
+++ b/client/src/pages/production-board/production-board.component.jsx
@@ -1,6 +1,26 @@
 import React from "react";
 import ProductionBoardKanbanContainer from "../../components/production-board-kanban/production-board-kanban.container";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(ProductionBoardComponent);

-export default function ProductionBoardComponent() {
-  return <ProductionBoardKanbanContainer />;
+export function ProductionBoardComponent({ bodyshop }) {
+  const {
+    treatments: { Production_Use_View }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["Production_Use_View"],
+    splitKey: bodyshop && bodyshop.imexshopid
+  });
+
+  return <ProductionBoardKanbanContainer subscriptionType={Production_Use_View.treatment} />;
 }
--- a/client/src/pages/production-list/production-list.component.jsx
+++ b/client/src/pages/production-list/production-list.component.jsx
@@ -2,11 +2,31 @@ import React from "react";
 import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";
 import ProductionListTable from "../../components/production-list-table/production-list-table.container";

-export default function ProductionListComponent() {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(ProductionListComponent);
+
+export function ProductionListComponent({ bodyshop }) {
+  const {
+    treatments: { Production_Use_View }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["Production_Use_View"],
+    splitKey: bodyshop && bodyshop.imexshopid
+  });
+
  return (
    <>
      <NoteUpsertModal />
-      <ProductionListTable />
+      <ProductionListTable subscriptionType={Production_Use_View.treatment} />
    </>
  );
 }
--- a/client/src/redux/messaging/messaging.sagas.js
+++ b/client/src/redux/messaging/messaging.sagas.js
@@ -36,7 +36,8 @@ export function* openChatByPhone({ payload }) {
      data: { conversations }
    } = yield client.query({
      query: CONVERSATION_ID_BY_PHONE,
-      variables: { phone: p.number }
+      variables: { phone: p.number },
+      fetchPolicy: 'no-cache'
    });

    if (conversations.length === 0) {
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1373,6 +1373,7 @@
    },
    "job_payments": {
      "buttons": {
+        "create_short_link": "Generate Short Link",
        "goback": "Go Back",
        "proceedtopayment": "Proceed to Payment",
        "refundpayment": "Refund Payment"
--- 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
@@ -1373,6 +1373,7 @@
 		},
 		"job_payments": {
 			"buttons": {
+				"create_short_link": "",
 				"goback": "",
 				"proceedtopayment": "",
 				"refundpayment": ""
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -918,6 +918,7 @@
          - bill_tax_rates
          - cdk_configuration
          - cdk_dealerid
+          - chatterid
          - city
          - claimscorpid
          - convenient_company
@@ -4358,6 +4359,35 @@
        template_engine: Kriti
        url: '{{$base_url}}/opensearch'
        version: 2
+- table:
+    name: jobs_inproduction
+    schema: public
+  object_relationships:
+    - name: bodyshop
+      using:
+        manual_configuration:
+          column_mapping:
+            shopid: id
+          insertion_order: null
+          remote_table:
+            name: bodyshops
+            schema: public
+  select_permissions:
+    - role: user
+      permission:
+        columns:
+          - id
+          - shopid
+          - updated_at
+        filter:
+          bodyshop:
+            associations:
+              _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
 - table:
    name: masterdata
    schema: public
--- a/hasura/migrations/1726528225033_alter_table_public_bodyshops_add_column_chatterid/down.sql
+++ b/hasura/migrations/1726528225033_alter_table_public_bodyshops_add_column_chatterid/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 "chatterid" text
+--  null;
--- a/hasura/migrations/1726528225033_alter_table_public_bodyshops_add_column_chatterid/up.sql
+++ b/hasura/migrations/1726528225033_alter_table_public_bodyshops_add_column_chatterid/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "chatterid" text
+ null;
--- a/hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/down.sql
+++ b/hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/down.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "courtesycars_idx_fleet" on
+  "public"."courtesycars" using btree ("fleetnumber");
--- a/hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/up.sql
+++ b/hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/up.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."courtesycars_idx_fleet";
--- a/hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/down.sql
+++ b/hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/down.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_ownrfn" on
+  "public"."jobs" using gin ("ownr_fn");
--- a/hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/up.sql
+++ b/hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/up.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_ownrfn";
--- a/hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/down.sql
+++ b/hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/down.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_ownrln" on
+  "public"."jobs" using gin ("ownr_ln");
--- a/hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/up.sql
+++ b/hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/up.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_ownrln";
--- a/hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/down.sql
+++ b/hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/down.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "jobs_idx_iouparent" on
+  "public"."jobs" using btree ("iouparent");
--- a/hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/up.sql
+++ b/hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/up.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."jobs_idx_iouparent";
--- a/hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/down.sql
+++ b/hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/down.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_ronumber" on
+  "public"."jobs" using gin ("ro_number");
--- a/hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/up.sql
+++ b/hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/up.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_ronumber";
--- a/hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/down.sql
+++ b/hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/down.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_clmno" on
+  "public"."jobs" using gin ("clm_no");
--- a/hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/up.sql
+++ b/hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/up.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_clmno";
--- a/hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/down.sql
+++ b/hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/down.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_vmodeldesc" on
+  "public"."jobs" using gin ("v_model_desc");
--- a/hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/up.sql
+++ b/hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/up.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_vmodeldesc";
--- a/hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/down.sql
+++ b/hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/down.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_vmakedesc" on
+  "public"."jobs" using gin ("v_make_desc");
--- a/hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/up.sql
+++ b/hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/up.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_vmakedesc";
--- a/hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/down.sql
+++ b/hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/down.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_plateno" on
+  "public"."jobs" using gin ("plate_no");
--- a/hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/up.sql
+++ b/hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/up.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_plateno";
--- a/hasura/migrations/1726773072213_run_sql_migration/down.sql
+++ b/hasura/migrations/1726773072213_run_sql_migration/down.sql
@@ -0,0 +1,11 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE
+-- OR REPLACE VIEW "public"."jobs_inproduction" AS
+-- SELECT
+--   j.id,
+--   j.updated_at
+-- FROM
+--   jobs j
+-- WHERE
+-- j.inproduction=true;
--- a/hasura/migrations/1726773072213_run_sql_migration/up.sql
+++ b/hasura/migrations/1726773072213_run_sql_migration/up.sql
@@ -0,0 +1,9 @@
+CREATE
+OR REPLACE VIEW "public"."jobs_inproduction" AS
+SELECT
+  j.id,
+  j.updated_at
+FROM
+  jobs j
+WHERE
+j.inproduction=true;
--- a/hasura/migrations/1726773316245_run_sql_migration/down.sql
+++ b/hasura/migrations/1726773316245_run_sql_migration/down.sql
@@ -0,0 +1,8 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS
+--  SELECT j.id,
+--     j.updated_at,
+--     j.shopid
+--    FROM jobs j
+--   WHERE (j.inproduction = true);
--- a/hasura/migrations/1726773316245_run_sql_migration/up.sql
+++ b/hasura/migrations/1726773316245_run_sql_migration/up.sql
@@ -0,0 +1,6 @@
+CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS 
+ SELECT j.id,
+    j.updated_at,
+    j.shopid
+   FROM jobs j
+  WHERE (j.inproduction = true);
--- a/hasura/migrations/1726773326353_run_sql_migration/down.sql
+++ b/hasura/migrations/1726773326353_run_sql_migration/down.sql
@@ -0,0 +1,8 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS
+--  SELECT j.id,
+--     j.updated_at,
+--     j.shopid
+--    FROM jobs j
+--   WHERE (j.inproduction = true);
--- a/hasura/migrations/1726773326353_run_sql_migration/up.sql
+++ b/hasura/migrations/1726773326353_run_sql_migration/up.sql
@@ -0,0 +1,6 @@
+CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS 
+ SELECT j.id,
+    j.updated_at,
+    j.shopid
+   FROM jobs j
+  WHERE (j.inproduction = true);
--- a/hasura/migrations/1726775434726_run_sql_migration/down.sql
+++ b/hasura/migrations/1726775434726_run_sql_migration/down.sql
@@ -0,0 +1,3 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE INDEX idx_jobs_inproduction_true_cast ON jobs(inproduction) WHERE inproduction = ('true') :: boolean;
--- a/hasura/migrations/1726775434726_run_sql_migration/up.sql
+++ b/hasura/migrations/1726775434726_run_sql_migration/up.sql
@@ -0,0 +1 @@
+CREATE INDEX idx_jobs_inproduction_true_cast ON jobs(inproduction) WHERE inproduction = ('true') :: boolean;
--- a/hasura/migrations/1726775487038_drop_index_idx_jobs_inproduction_true_cast/down.sql
+++ b/hasura/migrations/1726775487038_drop_index_idx_jobs_inproduction_true_cast/down.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_inproduction_true_cast" on
+  "public"."jobs" using btree ("inproduction");
--- a/hasura/migrations/1726775487038_drop_index_idx_jobs_inproduction_true_cast/up.sql
+++ b/hasura/migrations/1726775487038_drop_index_idx_jobs_inproduction_true_cast/up.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_inproduction_true_cast";
--- a/hasura/migrations/1726868398933_run_sql_migration/down.sql
+++ b/hasura/migrations/1726868398933_run_sql_migration/down.sql
@@ -0,0 +1,3 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE INDEX idx_jobs_created_at_desc ON jobs (created_at DESC);
--- a/hasura/migrations/1726868398933_run_sql_migration/up.sql
+++ b/hasura/migrations/1726868398933_run_sql_migration/up.sql
@@ -0,0 +1 @@
+CREATE INDEX idx_jobs_created_at_desc ON jobs (created_at DESC);
--- a/hasura/migrations/1726868654375_create_index_idx_jobs_vehicleid/down.sql
+++ b/hasura/migrations/1726868654375_create_index_idx_jobs_vehicleid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_vehicleid";
--- a/hasura/migrations/1726868654375_create_index_idx_jobs_vehicleid/up.sql
+++ b/hasura/migrations/1726868654375_create_index_idx_jobs_vehicleid/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_vehicleid" on
+  "public"."jobs" using btree ("vehicleid");
--- a/hasura/migrations/1726871373784_run_sql_migration/down.sql
+++ b/hasura/migrations/1726871373784_run_sql_migration/down.sql
@@ -0,0 +1,34 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE OR REPLACE FUNCTION public.search_exportlog(search text)
+--  RETURNS SETOF exportlog
+--  LANGUAGE plpgsql
+--  STABLE
+-- AS $function$ BEGIN IF search = '' THEN RETURN query
+-- SELECT
+--   *
+-- FROM
+--   exportlog e;
+--   ELSE RETURN query
+-- SELECT
+--   e.*
+-- FROM
+--   exportlog e
+--   LEFT JOIN jobs j on j.id = e.jobid
+-- LEFT JOIN payments p
+--     ON p.id = e.paymentid
+-- LEFT JOIN bills b
+--     ON e.billid = b.id
+-- WHERE
+--   (
+--     j.ro_number ILIKE '%' || search
+--     OR b.invoice_number ILIKE '%' || search
+--     OR p.paymentnum ILIKE '%' || search
+--     OR e.useremail ILIKE '%' || search
+--   )
+--   AND (e.jobid = j.id
+--   or e.paymentid = p.id
+--  or e.billid = b.id)
+-- ;
+-- END IF;
+-- END $function$;
--- a/hasura/migrations/1726871373784_run_sql_migration/up.sql
+++ b/hasura/migrations/1726871373784_run_sql_migration/up.sql
@@ -0,0 +1,32 @@
+CREATE OR REPLACE FUNCTION public.search_exportlog(search text)
+ RETURNS SETOF exportlog
+ LANGUAGE plpgsql
+ STABLE
+AS $function$ BEGIN IF search = '' THEN RETURN query
+SELECT
+  *
+FROM
+  exportlog e;
+  ELSE RETURN query
+SELECT
+  e.*
+FROM
+  exportlog e
+  LEFT JOIN jobs j on j.id = e.jobid
+LEFT JOIN payments p 
+    ON p.id = e.paymentid
+LEFT JOIN bills b
+    ON e.billid = b.id
+WHERE
+  (
+    j.ro_number ILIKE '%' || search 
+    OR b.invoice_number ILIKE '%' || search 
+    OR p.paymentnum ILIKE '%' || search 
+    OR e.useremail ILIKE '%' || search 
+  )
+  AND (e.jobid = j.id
+  or e.paymentid = p.id
+ or e.billid = b.id)
+;
+END IF;
+END $function$;
--- a/hasura/migrations/1726871384601_run_sql_migration/down.sql
+++ b/hasura/migrations/1726871384601_run_sql_migration/down.sql
@@ -0,0 +1,34 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE OR REPLACE FUNCTION public.search_exportlog(search text)
+--  RETURNS SETOF exportlog
+--  LANGUAGE plpgsql
+--  STABLE
+-- AS $function$ BEGIN IF search = '' THEN RETURN query
+-- SELECT
+--   *
+-- FROM
+--   exportlog e;
+--   ELSE RETURN query
+-- SELECT
+--   e.*
+-- FROM
+--   exportlog e
+--   LEFT JOIN jobs j on j.id = e.jobid
+-- LEFT JOIN payments p
+--     ON p.id = e.paymentid
+-- LEFT JOIN bills b
+--     ON e.billid = b.id
+-- WHERE
+--   (
+--     j.ro_number ILIKE '%' || search
+--     OR b.invoice_number ILIKE '%' || search
+--     OR p.paymentnum ILIKE '%' || search
+--     OR e.useremail ILIKE '%' || search
+--   )
+--   AND (e.jobid = j.id
+--   or e.paymentid = p.id
+--  or e.billid = b.id)
+-- ;
+-- END IF;
+-- END $function$;
--- a/hasura/migrations/1726871384601_run_sql_migration/up.sql
+++ b/hasura/migrations/1726871384601_run_sql_migration/up.sql
@@ -0,0 +1,32 @@
+CREATE OR REPLACE FUNCTION public.search_exportlog(search text)
+ RETURNS SETOF exportlog
+ LANGUAGE plpgsql
+ STABLE
+AS $function$ BEGIN IF search = '' THEN RETURN query
+SELECT
+  *
+FROM
+  exportlog e;
+  ELSE RETURN query
+SELECT
+  e.*
+FROM
+  exportlog e
+  LEFT JOIN jobs j on j.id = e.jobid
+LEFT JOIN payments p 
+    ON p.id = e.paymentid
+LEFT JOIN bills b
+    ON e.billid = b.id
+WHERE
+  (
+    j.ro_number ILIKE '%' || search 
+    OR b.invoice_number ILIKE '%' || search 
+    OR p.paymentnum ILIKE '%' || search 
+    OR e.useremail ILIKE '%' || search 
+  )
+  AND (e.jobid = j.id
+  or e.paymentid = p.id
+ or e.billid = b.id)
+;
+END IF;
+END $function$;
--- a/hasura/migrations/1726871425044_create_index_idx_bill_invoice_number/down.sql
+++ b/hasura/migrations/1726871425044_create_index_idx_bill_invoice_number/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_bill_invoice_number";
--- a/hasura/migrations/1726871425044_create_index_idx_bill_invoice_number/up.sql
+++ b/hasura/migrations/1726871425044_create_index_idx_bill_invoice_number/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_bill_invoice_number" on
+  "public"."bills" using btree ("invoice_number");
--- a/hasura/migrations/1726871466395_create_index_idx_payments_paymentnum/down.sql
+++ b/hasura/migrations/1726871466395_create_index_idx_payments_paymentnum/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_payments_paymentnum";
--- a/hasura/migrations/1726871466395_create_index_idx_payments_paymentnum/up.sql
+++ b/hasura/migrations/1726871466395_create_index_idx_payments_paymentnum/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_payments_paymentnum" on
+  "public"."payments" using btree ("paymentnum");
--- a/hasura/migrations/1726871529961_create_index_exportlog_useremail/down.sql
+++ b/hasura/migrations/1726871529961_create_index_exportlog_useremail/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."exportlog_useremail";
--- a/hasura/migrations/1726871529961_create_index_exportlog_useremail/up.sql
+++ b/hasura/migrations/1726871529961_create_index_exportlog_useremail/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "exportlog_useremail" on
+  "public"."exportlog" using btree ("useremail");
--- a/hasura/migrations/1726871632920_create_index_available_jobs_jobid/down.sql
+++ b/hasura/migrations/1726871632920_create_index_available_jobs_jobid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."available_jobs_jobid";
--- a/hasura/migrations/1726871632920_create_index_available_jobs_jobid/up.sql
+++ b/hasura/migrations/1726871632920_create_index_available_jobs_jobid/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "available_jobs_jobid" on
+  "public"."available_jobs" using btree ("jobid");
--- a/hasura/migrations/1726872195945_run_sql_migration/down.sql
+++ b/hasura/migrations/1726872195945_run_sql_migration/down.sql
@@ -0,0 +1,3 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE INDEX idx_jobslines_ordering ON joblines (jobid, removed, line_no asc) where removed=false;
--- a/hasura/migrations/1726872195945_run_sql_migration/up.sql
+++ b/hasura/migrations/1726872195945_run_sql_migration/up.sql
@@ -0,0 +1 @@
+CREATE INDEX idx_jobslines_ordering ON joblines (jobid, removed, line_no asc) where removed=false;
--- a/hasura/migrations/1726872572029_run_sql_migration/down.sql
+++ b/hasura/migrations/1726872572029_run_sql_migration/down.sql
@@ -0,0 +1,3 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE INDEX idx_joblines_types ON joblines (jobid, mod_lbr_ty, removed) where removed=false;
--- a/hasura/migrations/1726872572029_run_sql_migration/up.sql
+++ b/hasura/migrations/1726872572029_run_sql_migration/up.sql
@@ -0,0 +1 @@
+CREATE INDEX idx_joblines_types ON joblines (jobid, mod_lbr_ty, removed) where removed=false;
--- a/hasura/migrations/1726872872872_run_sql_migration/down.sql
+++ b/hasura/migrations/1726872872872_run_sql_migration/down.sql
@@ -0,0 +1,3 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE INDEX idx_exportlog_created_at_desc ON exportlog (created_at desc);
--- a/hasura/migrations/1726872872872_run_sql_migration/up.sql
+++ b/hasura/migrations/1726872872872_run_sql_migration/up.sql
@@ -0,0 +1 @@
+CREATE INDEX idx_exportlog_created_at_desc ON exportlog (created_at desc);
--- a/hasura/migrations/1726872925447_drop_index_joblines_idx_removed/down.sql
+++ b/hasura/migrations/1726872925447_drop_index_joblines_idx_removed/down.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "joblines_idx_removed" on
+  "public"."joblines" using btree ("removed");
--- a/hasura/migrations/1726872925447_drop_index_joblines_idx_removed/up.sql
+++ b/hasura/migrations/1726872925447_drop_index_joblines_idx_removed/up.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."joblines_idx_removed";
--- a/hasura/migrations/1726872944447_drop_index_joblines_idx_line_no/down.sql
+++ b/hasura/migrations/1726872944447_drop_index_joblines_idx_line_no/down.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "joblines_idx_line_no" on
+  "public"."joblines" using btree ("jobid", "line_no");
--- a/hasura/migrations/1726872944447_drop_index_joblines_idx_line_no/up.sql
+++ b/hasura/migrations/1726872944447_drop_index_joblines_idx_line_no/up.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."joblines_idx_line_no";
--- a/server/accounting/qbo/qbo-payables.js
+++ b/server/accounting/qbo/qbo-payables.js
@@ -194,7 +194,9 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
      bodyshop.md_responsibility_centers.sales_tax_codes,
      classes,
      taxCodes,
-      bodyshop.md_responsibility_centers.costs
+      bodyshop.md_responsibility_centers.costs,
+      bodyshop.accountingconfig,
+      bodyshop.region_config
    )
  );

@@ -219,7 +221,7 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
      Amount: Dinero({
        amount: Math.round(
          bill.billlines.reduce((acc, val) => {
-            return acc + val.applicable_taxes?.federal ? (val.actual_cost * val.quantity ?? 0) : 0;
+            return acc + (val.applicable_taxes?.federal ? (val.actual_cost * val.quantity ?? 0) : 0);
          }, 0) * 100
        )
      })
@@ -298,17 +300,29 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
 //   },
 // ],

-const generateBillLine = (billLine, accounts, jobClass, ioSalesTaxCodes, classes, taxCodes, costCenters) => {
+const generateBillLine = (
+  billLine,
+  accounts,
+  jobClass,
+  ioSalesTaxCodes,
+  classes,
+  taxCodes,
+  costCenters,
+  accountingconfig,
+  region_config
+) => {
  const account = costCenters.find((c) => c.name === billLine.cost_center);
-
  return {
    DetailType: "AccountBasedExpenseLineDetail",

    AccountBasedExpenseLineDetail: {
      ...(jobClass ? { ClassRef: { value: classes[jobClass] } } : {}),
-      TaxCodeRef: {
-        value: taxCodes[findTaxCode(billLine.applicable_taxes, ioSalesTaxCodes)]
-      },
+      TaxCodeRef:
+        accountingconfig.qbo && accountingconfig.qbo_usa && region_config.includes("CA_")
+          ? {}
+          : {
+              value: taxCodes[findTaxCode(billLine.applicable_taxes, ioSalesTaxCodes)]
+            },
      AccountRef: {
        value: accounts[account.accountname]
      }
--- a/server/data/chatter.js
+++ b/server/data/chatter.js
@@ -0,0 +1,168 @@
+const path = require("path");
+const queries = require("../graphql-client/queries");
+const moment = require("moment-timezone");
+const converter = require("json-2-csv");
+const _ = require("lodash");
+const logger = require("../utils/logger");
+const fs = require("fs");
+const { SecretsManagerClient, GetSecretValueCommand } = require("@aws-sdk/client-secrets-manager");
+require("dotenv").config({ path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) });
+let Client = require("ssh2-sftp-client");
+
+const client = require("../graphql-client/graphql-client").client;
+const { sendServerEmail } = require("../email/sendemail");
+
+const ftpSetup = {
+  host: process.env.CHATTER_HOST,
+  port: process.env.CHATTER_PORT,
+  username: process.env.CHATTER_USER,
+  privateKey: null,
+  debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
+  algorithms: {
+    serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
+  }
+};
+exports.default = async (req, res) => {
+  // Only process if in production environment.
+  if (process.env.NODE_ENV !== "production") {
+    res.sendStatus(403);
+    return;
+  }
+
+  if (req.headers["x-imex-auth"] !== process.env.AUTOHOUSE_AUTH_TOKEN) {
+    res.sendStatus(401);
+    return;
+  }
+  //Query for the List of Bodyshop Clients.
+  logger.log("chatter-start", "DEBUG", "api", null, null);
+  const { bodyshops } = await client.request(queries.GET_CHATTER_SHOPS);
+  const specificShopIds = req.body.bodyshopIds; // ['uuid]
+  const { start, end, skipUpload } = req.body; //YYYY-MM-DD
+
+  const allcsvsToUpload = [];
+  const allErrors = [];
+  try {
+    for (const bodyshop of specificShopIds ? bodyshops.filter((b) => specificShopIds.includes(b.id)) : bodyshops) {
+      logger.log("chatter-start-shop-extract", "DEBUG", "api", bodyshop.id, {
+        shopname: bodyshop.shopname
+      });
+      try {
+        const { jobs, bodyshops_by_pk } = await client.request(queries.CHATTER_QUERY, {
+          bodyshopid: bodyshop.id,
+          start: start ? moment(start).startOf("day") : moment().subtract(1, "days").startOf("day"),
+          ...(end && { end: moment(end).endOf("day") })
+        });
+
+        const chatterObject = jobs.map((j) => {
+          return {
+            poc_trigger_code: bodyshops_by_pk.chatterid,
+            firstname: j.ownr_co_nm ? null : j.ownr_fn,
+            lastname: j.ownr_co_nm ? j.ownr_co_nm : j.ownr_ln,
+            transaction_id: j.ro_number,
+            email: j.ownr_ea,
+            phone_number: j.ownr_ph1
+          };
+        });
+
+        const ret = converter.json2csv(chatterObject, { emptyFieldValue: "" });
+
+        allcsvsToUpload.push({
+          count: chatterObject.length,
+          csv: ret,
+          filename: `${bodyshop.shopname}_solicitation_${moment().format("YYYYMMDD")}.csv`
+        });
+
+        logger.log("chatter-end-shop-extract", "DEBUG", "api", bodyshop.id, {
+          shopname: bodyshop.shopname
+        });
+      } catch (error) {
+        //Error at the shop level.
+        logger.log("chatter-error-shop", "ERROR", "api", bodyshop.id, {
+          ...error
+        });
+
+        allErrors.push({
+          bodyshopid: bodyshop.id,
+          imexshopid: bodyshop.imexshopid,
+          shopname: bodyshop.shopname,
+          fatal: true,
+          errors: [error.toString()]
+        });
+      } finally {
+        allErrors.push({
+          bodyshopid: bodyshop.id,
+          imexshopid: bodyshop.imexshopid,
+          shopname: bodyshop.shopname
+        });
+      }
+    }
+
+    if (skipUpload) {
+      for (const csvObj of allcsvsToUpload) {
+        fs.writeFile(`./logs/${csvObj.filename}`, csvObj.csv);
+      }
+
+      sendServerEmail({
+        subject: `Chatter Report ${moment().format("MM-DD-YY")}`,
+        text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
+      Uploaded: ${JSON.stringify(
+        allcsvsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
+        null,
+        2
+      )}
+      `
+      });
+      res.json(allcsvsToUpload);
+      return;
+    }
+
+    const sftp = new Client();
+    sftp.on("error", (errors) => logger.log("chatter-sftp-error", "ERROR", "api", null, { ...errors }));
+    try {
+      //Get the private key from AWS Secrets Manager.
+      ftpSetup.privateKey = await getPrivateKey();
+
+      //Connect to the FTP and upload all.
+      await sftp.connect(ftpSetup);
+
+      for (const csvObj of allcsvsToUpload) {
+        logger.log("chatter-sftp-upload", "DEBUG", "api", null, { filename: csvObj.filename });
+
+        const uploadResult = await sftp.put(Buffer.from(csvObj.xml), `/${csvObj.filename}`);
+        logger.log("chatter-sftp-upload-result", "DEBUG", "api", null, { uploadResult });
+      }
+    } catch (error) {
+      logger.log("chatter-sftp-error", "ERROR", "api", null, { ...error });
+    } finally {
+      sftp.end();
+    }
+    sendServerEmail({
+      subject: `Chatter Report ${moment().format("MM-DD-YY")}`,
+      text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
+      Uploaded: ${JSON.stringify(
+        allcsvsToUpload.map((x) => ({ filename: x.filename, count: x.count })),
+        null,
+        2
+      )}`
+    });
+    res.sendStatus(200);
+  } catch (error) {
+    res.status(200).json(error);
+  }
+};
+
+async function getPrivateKey() {
+  // Connect to AWS Secrets Manager
+  const client = new SecretsManagerClient({ region: "ca-central-1" });
+  const command = new GetSecretValueCommand({ SecretId: CHATTER_PRIVATE_KEY });
+
+  logger.log("chatter-get-private-key", "DEBUG", "api", null, null);
+  try {
+    const { SecretString, SecretBinary } = await client.send(command);
+    if (SecretString || SecretBinary) logger.log("chatter-retrieved-private-key", "DEBUG", "api", null, null);
+    return SecretString || Buffer.from(SecretBinary, "base64").toString("ascii");
+  } catch (error) {
+    logger.log("chatter-get-private-key", "ERROR", "api", null, error);
+    throw err;
+  }
+}
--- a/server/data/data.js
+++ b/server/data/data.js
@@ -1,4 +1,5 @@
 exports.arms = require("./arms").default;
 exports.autohouse = require("./autohouse").default;
+exports.chatter = require("./chatter").default;
 exports.claimscorp = require("./claimscorp").default;
 exports.kaizen = require("./kaizen").default;
--- 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,11 +94,12 @@ 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 = (bodyshop) =>
+  InstanceManager({
    imex: process.env?.NODE_ENV === "test" ? "https://test.imex.online" : "https://imex.online",
    rome:
-      bodyshop.convenient_company === "promanager"
+      bodyshop?.convenient_company === "promanager"
        ? process.env?.NODE_ENV === "test"
          ? "https//test.promanager.web-est.com"
          : "https://promanager.web-est.com"
@@ -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(bodyshop);
  return {
    header: title,
    subHeader: `Body Shop: ${bodyshop.shopname} | Priority: ${formatPriority(priority)} ${formatDate(dueDate)}`,
@@ -243,7 +247,7 @@ const tasksRemindEmail = async (req, res) => {
      const fromEmails = InstanceManager({
        imex: "ImEX Online <noreply@imex.online>",
        rome:
-          onlyTask.bodyshop.convenient_company === "promanager"
+        tasksRequest?.tasks[0].bodyshop.convenient_company === "promanager"
            ? "ProManager <noreply@promanager.web-est.com>"
            : "Rome Online <noreply@romeonline.io>"
      });
@@ -279,7 +283,7 @@ const tasksRemindEmail = async (req, res) => {
        const endPoints = InstanceManager({
          imex: process.env?.NODE_ENV === "test" ? "https://test.imex.online" : "https://imex.online",
          rome:
-            allTasks[0].bodyshop.convenient_company === "promanager"
+          tasksRequest?.tasks[0].bodyshop.convenient_company === "promanager"
              ? process.env?.NODE_ENV === "test"
                ? "https//test.promanager.web-est.com"
                : "https://promanager.web-est.com"
@@ -316,7 +320,7 @@ const tasksRemindEmail = async (req, res) => {
              tasksEmailQueue.push(taskId);
            }
          },
-          allTasks[0].bodyshop.convenient_company
+          tasksRequest?.tasks[0].bodyshop.convenient_company
        );
      }
    });
@@ -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
@@ -832,6 +832,25 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
  }
 }`;

+exports.CHATTER_QUERY = `query CHATTER_EXPORT($start: timestamptz, $bodyshopid: uuid!, $end: timestamptz) {
+  bodyshops_by_pk(id: $bodyshopid){
+    id
+    shopname 
+    chatterid
+    timezone
+  }
+  jobs(where: {_and: [{converted: {_eq: true}}, {actual_delivery: {_gt: $start}}, {actual_delivery: {_lte: $end}}, {shopid: {_eq: $bodyshopid}}, {_or: [{ownr_ph1: {_is_null: false}}, {ownr_ea: {_is_null: false}}]}]}) {
+    id
+    created_at
+    ro_number
+    ownr_fn
+    ownr_ln
+    ownr_co_nm
+    ownr_ph1
+    ownr_ea
+  }
+}`;
+
 exports.CLAIMSCORP_QUERY = `query CLAIMSCORP_EXPORT($start: timestamptz, $bodyshopid: uuid!, $end: timestamptz) {
  bodyshops_by_pk(id: $bodyshopid){
    id
@@ -1732,6 +1751,16 @@ exports.GET_AUTOHOUSE_SHOPS = `query GET_AUTOHOUSE_SHOPS {
  }
 }`;

+exports.GET_CHATTER_SHOPS = `query GET_CHATTER_SHOPS {
+  bodyshops(where: {chatterid: {_is_null: false}, _or: {chatterid: {_neq: ""}}}){
+    id
+    shopname
+    chatterid
+    imexshopid
+    timezone
+  }
+}`;
+
 exports.GET_CLAIMSCORP_SHOPS = `query GET_CLAIMSCORP_SHOPS {
  bodyshops(where: {claimscorpid: {_is_null: false}, _or: {claimscorpid: {_neq: ""}}}){
      id
@@ -2502,6 +2531,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,75 @@ 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, JSON.stringify(jobs), {
+        iprequest: values,
+        paymentResult
+      });
+
+      if (values.origin === "OneLink" && parsedComment.userEmail) {
+        //Send an email, it was a text to pay link.
+        try {
+          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/>")
+            })
+          });
+        } catch (error) {
+          logger.log("intellipay-postback-app-email-error", "DEBUG", req.user?.email, JSON.stringify(jobs), {
+            iprequest: values,
+            paymentResult,
+            error: error.message
+          });
+        }
+      }
+      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
@@ -192,48 +263,15 @@ exports.postback = async (req, res) => {
        }
      });

-      logger.log("intellipay-postback-link-success", "DEBUG", req.user?.email, null, {
+      logger.log("intellipay-postback-link-success", "DEBUG", req.user?.email, values.invoice, {
        iprequest: values,
        responseResults,
        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, {
+    logger.log("intellipay-postback-total-error", "ERROR", req.user?.email, null, {
      error: JSON.stringify(error),
      body: req.body
    });
--- 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;
--- a/server/routes/dataRoutes.js
+++ b/server/routes/dataRoutes.js
@@ -1,9 +1,10 @@
 const express = require("express");
 const router = express.Router();
-const { autohouse, claimscorp, kaizen } = require("../data/data");
+const { autohouse, claimscorp, chatter, kaizen } = require("../data/data");

 router.post("/ah", autohouse);
 router.post("/cc", claimscorp);
+router.post("/chatter", chatter);
 router.post("/kaizen", kaizen);

 module.exports = router;
Author	SHA1	Message	Date
Patrick Fic	cafca35500	IO-2957 Resolve task reminders not sending with incorrect references.	2024-09-23 18:02:17 -07:00
Patrick Fic	6e61159608	Merged in feature/IO-2945-intellipaypostbackhandling (pull request #1765 ) feature/IO-2945-intellipaypostbackhandling Approved-by: Patrick Fic	2024-09-23 22:15:51 +00:00
Patrick Fic	3c85de3e34	IO-2945 Resolve no success being sent to intellipay creating triple posting.	2024-09-23 15:04:51 -07:00
Allan Carr	1a4c9faab1	Merged in release/2024-09-20 (pull request #1759 ) IO-2782 Adjust to Object for items	2024-09-20 23:46:03 +00:00
Allan Carr	bfbf34e11d	Merged in feature/IO-2782-Send-Promanager-Welcome-Email (pull request #1758 ) IO-2782 Adjust to Object for items	2024-09-20 23:45:00 +00:00
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
Patrick Fic	439d9e7b74	Merged in release/2024-09-20 (pull request #1757 ) Further index changes.	2024-09-20 22:58:14 +00:00
Patrick Fic	464f7044f0	Further index changes.	2024-09-20 15:56:42 -07:00
Dave Richer	7cde2f64af	Merged in release/2024-09-20 (pull request #1755 ) IO-2782 - Fix query	2024-09-20 22:54:41 +00:00
Dave Richer	f674fff930	Merged in feature/IO-2782-Send-Promanager-Welcome-Email (pull request #1754 ) IO-2782 - Fix query	2024-09-20 22:54:23 +00:00
Dave Richer	efc1157653	IO-2782 - Fix query Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-20 18:53:33 -04:00
Allan Carr	0677712d6e	Merged in release/2024-09-20 (pull request #1753 ) Release/2024 09 20 IO-2782, IO-2920, IO-2921, IO-2928, IO-2932, IO-2933, IO-2934, IO-2936, IO-2939, IO-2948, IO-2949	2024-09-20 22:27:11 +00:00
Allan Carr	2e106a5d07	Merged in feature/IO-2928-QBO-CAUSA-Payable-TAX (pull request #1751 ) IO-2928 Adjust accumulator in reducer for tax	2024-09-20 22:19:28 +00:00
Allan Carr	da7b97042e	IO-2928 Adjust accumulator in reducer for tax Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-20 15:19:24 -07:00
Patrick Fic	f018a2b2a6	Add additional Hasura Indexes	2024-09-20 14:57:31 -07:00
Patrick Fic	c3f7d7bad2	Merged in feature/IO-2933-ip-short-url-email (pull request #1750 ) IO-2933 resolve missing account details on Approved-by: Patrick Fic	2024-09-20 20:16:23 +00:00
Patrick Fic	70d857bfec	IO-2933 resolve missing account details on	2024-09-20 13:14:15 -07:00
Dave Richer	f3265901b6	Adhoc - Add PR Helper Utility to Reference directory Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-20 13:30:23 -04:00
Allan Carr	7c8ac50426	Merged in feature/IO-2928-QBO-CAUSA-Payable-TAX (pull request #1746 ) IO-2928 Remove Tax Code Ref if QBO US in Canada Approved-by: Patrick Fic	2024-09-20 17:03:07 +00:00
Patrick Fic	8ad39fe855	Add Git SHA date to ioevent.	2024-09-20 09:59:03 -07:00
Patrick Fic	13b6218c43	Merged in feature/IO-2949-messaging-multiple-conversations-found (pull request #1748 ) IO-2949 change fetch policy on client to resolve issue.	2024-09-20 16:51:10 +00:00
Patrick Fic	bece3278f4	IO-2949 change fetch policy on client to resolve issue.	2024-09-20 09:50:08 -07:00
Allan Carr	4c0a1960ad	IO-2928 Remove Tax Code Ref if QBO US in Canada Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-20 09:37:09 -07:00
Dave Richer	47324422a6	Merged in feature/IO-2950-prod-db-view (pull request #1745 ) Feature/IO-2950 prod db view	2024-09-19 20:28:51 +00:00
Patrick Fic	3b1da6901d	Merged in feature/IO-2950-prod-db-view (pull request #1744 ) Feature/IO-2950 prod db view	2024-09-19 20:27:01 +00:00
Patrick Fic	fc6ec54233	IO-2950 Resolve reversed split.	2024-09-19 13:18:35 -07:00
Patrick Fic	64928d0849	IO-2950 remove unneeded updated query.	2024-09-19 13:11:31 -07:00
Dave Richer	56a580b1e7	IO-2950 - Add in double subscription fix Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-19 16:09:49 -04:00
Dave Richer	f7af3b407b	clear stage Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-19 16:06:59 -04:00
Patrick Fic	9a0674f5d7	IO-2950 Add subscription using view instead of variable.	2024-09-19 12:58:13 -07:00
Patrick Fic	cc30ea658e	Hasura index removal.	2024-09-19 12:07:24 -07:00
Dave Richer	59869def31	Merged in feature/IO-2782-Send-Promanager-Welcome-Email (pull request #1740 ) Feature/IO-2782 Send Promanager Welcome Email	2024-09-19 17:12:27 +00: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
Allan Carr	453812222b	Merged in feature/IO-2948-Production-Job-Status-Filter (pull request #1738 ) IO-2948 Production Job Status Filter Approved-by: Dave Richer	2024-09-19 17:00:39 +00: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
Allan Carr	c09e22ed96	IO-2948 Production Job Status Filter Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-19 09:45:32 -07: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
Allan Carr	e8099e130a	Merged in feature/IO-2921-CARSTAR-Canada-Chatter-Integration (pull request #1731 ) Feature/IO-2921 CARSTAR Canada Chatter Integration Approved-by: Dave Richer Approved-by: Patrick Fic	2024-09-18 19:44:33 +00:00
Dave Richer	1cbca1ddf0	Merged in feature/IO-2932-Scheduling-Lag-on-AIO-HotFix (pull request #1735 ) IO-2932-Scheduling-Lag-on-AIO-HotFix - Remove timezone from DayJS for scheduling by adjusting the localizer	2024-09-18 19:15:25 +00:00
Dave Richer	eeed004fe2	IO-2932-Scheduling-Lag-on-AIO-HotFix - Remove timezone from DayJS for scheduling by adjusting the localizer Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-18 15:00:32 -04:00
Patrick Fic	5a180b86fb	Merged in feature/IO-2933-ip-short-url-email (pull request #1728 ) Feature/IO-2933 ip short url email	2024-09-18 18:21:53 +00:00
Patrick Fic	e3059b41ae	IO-2933 Resolve PR comments.	2024-09-18 11:19:43 -07:00
Allan Carr	1a5c71048c	IO-2921 CARSTAR Canada Requested Adjustments Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-18 10:04:45 -07:00
Allan Carr	fc4e97c9b5	Merged in feature/IO-2939-CDK-Local-Tax-IMEX (pull request #1732 ) IO-2939 CDK Local Tax for ImEX Instance Approved-by: Dave Richer	2024-09-18 15:54:57 +00:00
Allan Carr	1bb2212e4a	IO-2921 CARSTAR Canada Chatter Datapump Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-17 12:55:08 -07:00
Allan Carr	0e9ad1258d	IO-2921 ChatterID DB field for Bodyshop Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-09-16 16:13:13 -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
				`@@ -0,0 +1 @@`
				`DROP INDEX IF EXISTS "public"."courtesycars_idx_fleet";`
				`@@ -0,0 +1 @@`
				`DROP INDEX IF EXISTS "public"."idx_jobs_ownrfn";`
				`@@ -0,0 +1 @@`
				`DROP INDEX IF EXISTS "public"."jobs_idx_iouparent";`
				`@@ -0,0 +1 @@`
				`CREATE INDEX idx_jobs_inproduction_true_cast ON jobs(inproduction) WHERE inproduction = ('true') :: boolean;`
				`@@ -0,0 +1 @@`
				`CREATE INDEX idx_jobs_created_at_desc ON jobs (created_at DESC);`
				`@@ -0,0 +1 @@`
				`DROP INDEX IF EXISTS "public"."idx_bill_invoice_number";`
				`@@ -0,0 +1 @@`
				`DROP INDEX IF EXISTS "public"."idx_payments_paymentnum";`
				`@@ -0,0 +1 @@`
				`DROP INDEX IF EXISTS "public"."exportlog_useremail";`
				`@@ -0,0 +1 @@`
				`DROP INDEX IF EXISTS "public"."available_jobs_jobid";`