From dc234e4d72a3d8b3fee177a8d11bfc5c24f49475 Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Tue, 11 Mar 2025 13:57:05 -0400 Subject: [PATCH] IO-3166-Global-Notifications-Part-2: checkpoint --- client/src/contexts/Notifications/notificationContext.jsx | 1 + server/notifications/scenarioBuilders.js | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/src/contexts/Notifications/notificationContext.jsx b/client/src/contexts/Notifications/notificationContext.jsx index 52fd4eeeb..e2dda9db8 100644 --- a/client/src/contexts/Notifications/notificationContext.jsx +++ b/client/src/contexts/Notifications/notificationContext.jsx @@ -23,6 +23,7 @@ export const useNotification = () => { export const NotificationProvider = ({ children }) => { const [api, contextHolder] = notification.useNotification({ placement: "bottomRight", + bottom: 70, showProgress: true }); diff --git a/server/notifications/scenarioBuilders.js b/server/notifications/scenarioBuilders.js index 276cff882..a9dd54d2d 100644 --- a/server/notifications/scenarioBuilders.js +++ b/server/notifications/scenarioBuilders.js @@ -261,12 +261,13 @@ const newMediaAddedReassignedBuilder = (data) => { // Determine the action let action; + if (data?.data?._documentMoved) { - action = "moved to another Job"; // Special case for document moved from this job + action = "moved to another job"; // Special case for document moved from this job } else if (data.isNew) { action = "added"; // New media } else if (data.changedFields?.jobid && data.changedFields.jobid.old !== data.changedFields.jobid.new) { - action = "moved to this Job"; + action = "moved to this job"; } else { action = "updated"; } @@ -416,7 +417,6 @@ const partMarkedBackOrderedBuilder = (data) => { */ const paymentCollectedCompletedBuilder = (data) => { const momentFormat = "MM/DD/YYYY"; - const timezone = data.bodyShopTimezone; // Format amount using Dinero.js const amountDinero = Dinero({ @@ -427,7 +427,7 @@ const paymentCollectedCompletedBuilder = (data) => { const payer = data.data.payer; const paymentType = data.data.type; - const paymentDate = moment(data.data.date).tz(timezone).format(momentFormat); + const paymentDate = moment(data.data.date).format(momentFormat); const body = `Payment of ${amountFormatted} has been collected from ${payer} via ${paymentType} on ${paymentDate}`;