Merged in release/AIO/2024-05-24 (pull request #1447)

Release/AIO/2024 05 24

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

@@ -32,6 +32,7 @@ import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { BsKanban } from "react-icons/bs";
 import { FaCalendarAlt, FaCarCrash, FaCreditCard, FaFileInvoiceDollar, FaTasks } from "react-icons/fa";
+import { FiLogOut } from "react-icons/fi";
 import { GiPayMoney, GiPlayerTime, GiSettingsKnobs } from "react-icons/gi";
 import { IoBusinessOutline } from "react-icons/io5";
 import { RiSurveyLine } from "react-icons/ri";
@@ -42,7 +43,6 @@ import { selectRecentItems, selectSelectedHeader } from "../../redux/application
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { signOutStart } from "../../redux/user/user.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import { FiLogOut } from "react-icons/fi";
 import { checkBeta, handleBeta, setBeta } from "../../utils/betaHandler";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
@@ -604,14 +604,22 @@ function Header({
             );
           }
         },
-        // {
+        ...(InstanceRenderManager({
-        //     key: 'rescue',
+          imex: true,
-        //     icon: <Icon component={CarFilled}/>,
+          rome: false,
-        //     label: t("menus.header.rescueme"),
+          promanager: false
-        //     onClick: () => {
+        })
-        //         window.open("https://imexrescue.com/", "_blank");
+          ? [
-        //     }
+              {
-        // },
+                key: "rescue",
+                icon: <Icon component={CarFilled} />,
+                label: t("menus.header.rescueme"),
+                onClick: () => {
+                  window.open("https://imexrescue.com/", "_blank");
+                }
+              }
+            ]
+          : []),
 
         ...(InstanceRenderManager({
           imex: true,

server/intellipay/intellipay.js

@@ -145,19 +145,19 @@ exports.generate_payment_url = async (req, res) => {
 };
 
 exports.postback = async (req, res) => {
-  logger.log("intellipay-postback", "DEBUG", req.user?.email, null, req.body);
-  const { body: values } = req;
-
-  const comment = Buffer.from(values?.comment, "base64").toString();
-
-  if ((!values.invoice || values.invoice === "") && !comment) {
-    //invoice is specified through the pay link. Comment by IO.
-    logger.log("intellipay-postback-ignored", "DEBUG", req.user?.email, null, req.body);
-    res.sendStatus(200);
-    return;
-  }
-
   try {
+    logger.log("intellipay-postback", "DEBUG", req.user?.email, null, req.body);
+    const { body: values } = req;
+
+    const comment = Buffer.from(values?.comment, "base64").toString();
+
+    if ((!values.invoice || values.invoice === "") && !comment) {
+      //invoice is specified through the pay link. Comment by IO.
+      logger.log("intellipay-postback-ignored", "DEBUG", req.user?.email, null, req.body);
+      res.sendStatus(200);
+      return;
+    }
+
     if (values.invoice) {
       //This is a link email that's been sent out.
       const job = await gqlClient.request(queries.GET_JOB_BY_PK, {