IO-3096-GlobalNotifications - Correct time zone from footer in notification email

client/.env.development.imex

@@ -9,6 +9,6 @@ VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
 VITE_APP_AXIOS_BASE_API_URL=/api/
-VITE_APP_REPORTS_SERVER_URL=https://reports.test.imex.online
+VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX

client/.env.development.rome

@@ -10,7 +10,7 @@ VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
 VITE_APP_AXIOS_BASE_API_URL=/api/
-VITE_APP_REPORTS_SERVER_URL=https://reports.test.romeonline.io
+VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_COUNTRY=USA
 VITE_APP_INSTANCE=ROME

client/.env.test.imex

@@ -9,7 +9,7 @@ VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BN2GcDPjipR5MTEosO5dT4CfQ3cmrdBIsI4juoOQrRijn_5aRiHlwj1mlq0W145mOusx6xynEKl_tvYJhpCc9lo'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
 VITE_APP_AXIOS_BASE_API_URL=https://api.test.imex.online/
-VITE_APP_REPORTS_SERVER_URL=https://reports.test.imex.online
+VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 VITE_APP_IS_TEST=true
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX

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

@@ -1,3 +1,15 @@
+import { Badge, Layout, Menu, Spin } from "antd";
+import { useTranslation } from "react-i18next";
+import { useEffect, useRef, useState } from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { Link } from "react-router-dom";
+import { useQuery } from "@apollo/client";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+import NotificationCenterContainer from "../notification-center/notification-center.container.jsx";
+import LockWrapper from "../lock-wrapper/lock-wrapper.component";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import {
   BankFilled,
   BarChartOutlined,
@@ -26,31 +38,19 @@ import {
   UnorderedListOutlined,
   UserOutlined
 } from "@ant-design/icons";
-import { useQuery } from "@apollo/client";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Badge, Layout, Menu, Spin } from "antd";
-import { useEffect, useRef, 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";
-import { connect } from "react-redux";
-import { Link } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { GET_UNREAD_COUNT } from "../../graphql/notifications.queries.js";
 import { selectRecentItems, selectSelectedHeader } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { signOutStart } from "../../redux/user/user.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import day from "../../utils/day.js";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
-import LockWrapper from "../lock-wrapper/lock-wrapper.component";
-import NotificationCenterContainer from "../notification-center/notification-center.container.jsx";
+import day from "../../utils/day.js";
 
 // Redux mappings
 const mapStateToProps = createStructuredSelector({
@@ -208,14 +208,25 @@ function Header({
       key: "allpayments",
       id: "header-accounting-allpayments",
       icon: <BankFilled />,
-      label: <Link to="/manage/payments">{t("menus.header.allpayments")}</Link>
+      label: (
+        <Link to="/manage/payments">
+          <LockWrapper featureName="payments" bodyshop={bodyshop}>
+            {t("menus.header.allpayments")}
+          </LockWrapper>
+        </Link>
+      )
     },
     {
       key: "enterpayments",
       id: "header-accounting-enterpayments",
       icon: <FaCreditCard />,
-      label: t("menus.header.enterpayment"),
+      label: (
+        <LockWrapper featureName="payments" bodyshop={bodyshop}>
+          {t("menus.header.enterpayment")}
+        </LockWrapper>
+      ),
       onClick: () =>
+        HasFeatureAccess({ featureName: "payments", bodyshop }) &&
         setPaymentContext({
           actions: {},
           context: null

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -28,11 +28,11 @@ import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import LockerWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
-import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
 import JobsDetailHeaderActionsToggleProduction from "./jobs-detail-header-actions.toggle-production";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -775,14 +775,15 @@ export function JobsDetailHeaderActions({
     key: "enterpayments",
     id: "job-actions-enterpayments",
     disabled: !job.converted,
-    label: t("menus.header.enterpayment"),
+    label: <LockerWrapperComponent featureName="payments">{t("menus.header.enterpayment")}</LockerWrapperComponent>,
     onClick: () => {
       logImEXEvent("job_header_enter_payment");
 
-      setPaymentContext({
-        actions: {},
-        context: { jobid: job.id }
-      });
+      HasFeatureAccess({ featureName: "payments", bodyshop }) &&
+        setPaymentContext({
+          actions: {},
+          context: { jobid: job.id }
+        });
     }
   });
 

client/src/pages/payments-all/payments-all.container.page.jsx

@@ -1,6 +1,6 @@
 import { useQuery } from "@apollo/client";
 import queryString from "query-string";
-import { useEffect } from "react";
+import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation } from "react-router-dom";
@@ -10,17 +10,23 @@ import PaymentsListPaginated from "../../components/payments-list-paginated/paym
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { QUERY_ALL_PAYMENTS_PAGINATED } from "../../graphql/payments.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import { pageLimit } from "../../utils/config";
+import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wrapper.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
+import { Card } from "antd";
 
-const mapStateToProps = createStructuredSelector({});
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
   setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
 });
 
-export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
+export function AllJobs({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
   const searchParams = queryString.parse(useLocation().search);
   const { page, sortcolumn, sortorder, searchObj } = searchParams;
 
@@ -54,15 +60,25 @@ export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
 
   if (error) return <AlertComponent message={error.message} type="error" />;
   return (
-    <RbacWrapper action="payments:list">
-      <PaymentsListPaginated
-        refetch={refetch}
-        loading={loading}
-        searchParams={searchParams}
-        total={data ? data.payments_aggregate.aggregate.count : 0}
-        payments={data ? data.payments : []}
-      />
-    </RbacWrapper>
+    <FeatureWrapperComponent
+      featureName="payments"
+      noauth={
+        <Card>
+          <UpsellComponent upsell={upsellEnum().payments.general} />
+        </Card>
+      }
+      z
+    >
+      <RbacWrapper action="payments:list">
+        <PaymentsListPaginated
+          refetch={refetch}
+          loading={loading}
+          searchParams={searchParams}
+          total={data ? data.payments_aggregate.aggregate.count : 0}
+          payments={data ? data.payments : []}
+        />
+      </RbacWrapper>
+    </FeatureWrapperComponent>
   );
 }
 

hasura/migrations/1741904378259_create_index_notificiations_idx_jobs/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."notificiations_idx_jobs";

hasura/migrations/1741904378259_create_index_notificiations_idx_jobs/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "notificiations_idx_jobs" on
+  "public"."notifications" using btree ("jobid");

hasura/migrations/1741904395934_create_index_notifications_idx_associations/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."notifications_idx_associations";

hasura/migrations/1741904395934_create_index_notifications_idx_associations/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "notifications_idx_associations" on
+  "public"."notifications" using btree ("associationid");

hasura/migrations/1741904614090_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_notifications_created_at_not_read ON notifications(created_at desc, read) where read is null;

hasura/migrations/1741904614090_run_sql_migration/up.sql

@@ -0,0 +1 @@
+CREATE INDEX idx_notifications_created_at_not_read ON notifications(created_at desc, read) where read is null;

hasura/migrations/1741904805838_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_notifications_associations_not_read ON notifications(associationid, read) where read is null;

hasura/migrations/1741904805838_run_sql_migration/up.sql

@@ -0,0 +1 @@
+CREATE INDEX idx_notifications_associations_not_read ON notifications(associationid, read) where read is null;

server/email/generateTemplate.js

@@ -20,6 +20,11 @@ const defaultFooter = () => {
 
 const now = () => moment().format("MM/DD/YYYY @ hh:mm a");
 
+/**
+ * Generate the email template
+ * @param strings
+ * @returns {string}
+ */
 const generateEmailTemplate = (strings) => {
   return (
     `

server/notifications/queues/emailQueue.js

@@ -5,6 +5,7 @@ const { InstanceEndpoints } = require("../../utils/instanceMgr");
 const { registerCleanupTask } = require("../../utils/cleanupManager");
 const getBullMQPrefix = require("../../utils/getBullMQPrefix");
 const devDebugLogger = require("../../utils/devDebugLogger");
+const moment = require("moment-timezone");
 
 const EMAIL_CONSOLIDATION_DELAY_IN_MINS = (() => {
   const envValue = process.env?.EMAIL_CONSOLIDATION_DELAY_IN_MINS;
@@ -59,7 +60,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
     emailAddWorker = new Worker(
       "emailAdd",
       async (job) => {
-        const { jobId, jobRoNumber, bodyShopName, body, recipients } = job.data;
+        const { jobId, jobRoNumber, bodyShopName, bodyShopTimezone, body, recipients } = job.data;
         devDebugLogger(`Adding email notifications for jobId ${jobId}`);
 
         const redisKeyPrefix = `email:${devKey}:notifications:${jobId}`;
@@ -72,6 +73,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
           const detailsKey = `email:${devKey}:recipientDetails:${jobId}:${user}`;
           await pubClient.hsetnx(detailsKey, "firstName", firstName || "");
           await pubClient.hsetnx(detailsKey, "lastName", lastName || "");
+          await pubClient.hsetnx(detailsKey, "bodyShopTimezone", bodyShopTimezone);
           await pubClient.expire(detailsKey, NOTIFICATION_EXPIRATION / 1000);
           await pubClient.sadd(`email:${devKey}:recipients:${jobId}`, user);
           devDebugLogger(`Stored message for ${user} under ${userKey}: ${body}`);
@@ -82,7 +84,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
         if (flagSet) {
           await emailConsolidateQueue.add(
             "consolidate-emails",
-            { jobId, jobRoNumber, bodyShopName },
+            { jobId, jobRoNumber, bodyShopName, bodyShopTimezone },
             {
               jobId: `consolidate:${jobId}`,
               delay: EMAIL_CONSOLIDATION_DELAY,
@@ -125,9 +127,11 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
                 const firstName = details.firstName || "User";
                 const multipleUpdateString = messages.length > 1 ? "Updates" : "Update";
                 const subject = `${multipleUpdateString} for job ${jobRoNumber || "N/A"} at ${bodyShopName}`;
+                const timezone = moment.tz.zone(details?.bodyShopTimezone) ? details.bodyShopTimezone : "UTC";
                 const emailBody = generateEmailTemplate({
                   header: `${multipleUpdateString} for Job ${jobRoNumber || "N/A"}`,
                   subHeader: `Dear ${firstName},`,
+                  dateLine: moment().tz(timezone).format("MM/DD/YYYY hh:mm a"),
                   body: `
                     <p>There have been updates to job ${jobRoNumber || "N/A"} at ${bodyShopName}:</p><br/>
                     <ul>
@@ -226,10 +230,10 @@ const dispatchEmailsToQueue = async ({ emailsToDispatch, logger }) => {
   const emailAddQueue = getQueue();
 
   for (const email of emailsToDispatch) {
-    const { jobId, jobRoNumber, bodyShopName, body, recipients } = email;
+    const { jobId, jobRoNumber, bodyShopName, bodyShopTimezone, body, recipients } = email;
 
     if (!jobId || !jobRoNumber || !bodyShopName || !body || !recipients.length) {
-      logger.logger.warn(
+      devDebugLogger(
         `Skipping email dispatch for jobId ${jobId} due to missing data: ` +
           `jobRoNumber=${jobRoNumber || "N/A"}, bodyShopName=${bodyShopName}, body=${body}, recipients=${recipients.length}`
       );
@@ -238,7 +242,7 @@ const dispatchEmailsToQueue = async ({ emailsToDispatch, logger }) => {
 
     await emailAddQueue.add(
       "add-email-notification",
-      { jobId, jobRoNumber, bodyShopName, body, recipients },
+      { jobId, jobRoNumber, bodyShopName, bodyShopTimezone, body, recipients },
       { jobId: `${jobId}:${Date.now()}` }
     );
     devDebugLogger(`Added email notification to queue for jobId ${jobId} with ${recipients.length} recipients`);

server/notifications/scenarioBuilders.js

@@ -28,6 +28,7 @@ const buildNotification = (data, key, body, variables = {}) => {
       jobId: data.jobId,
       jobRoNumber: data.jobRoNumber,
       bodyShopName: data.bodyShopName,
+      bodyShopTimezone: data.bodyShopTimezone,
       body,
       recipients: []
     },

server/opensearch/os-handler.js

@@ -248,8 +248,7 @@ async function OpenSearchSearchHandler(req, res) {
                           "*ownr_fn^8",
                           "*ownr_co_nm^8",
                           "*ownr_ph1^8",
-                          "*ownr_ph2^8",
-                          "*comment^6"
+                          "*ownr_ph2^8"
                           //  "*"
                         ]
                       }