From 42552e4f4f0cf2d3f6fdd1cd7cd9ddff00f89f04 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Mon, 22 Apr 2024 14:03:29 -0700 Subject: [PATCH] Promanager resolution & remove product fruit dev items. --- .../jobs-list/jobs-list.component.jsx | 28 ------------------- .../pages/manage/manage.page.component.jsx | 25 +---------------- server/email/tasksEmails.js | 20 +++++++++---- 3 files changed, 16 insertions(+), 57 deletions(-) diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx index 591bcae8b..81273a7e5 100644 --- a/client/src/components/jobs-list/jobs-list.component.jsx +++ b/client/src/components/jobs-list/jobs-list.component.jsx @@ -315,34 +315,6 @@ export function JobsList({ bodyshop, setJoyRideSteps }) { title={t("titles.bc.jobs-active")} extra={ - {InstanceRenderManager({ - promanager: ( - - ) - })} - diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx index d8b41b7c6..1fe0a053b 100644 --- a/client/src/pages/manage/manage.page.component.jsx +++ b/client/src/pages/manage/manage.page.component.jsx @@ -1,4 +1,4 @@ -import { Button, Collapse, FloatButton, Layout, Space, Spin, Tag } from "antd"; +import { FloatButton, Layout, Spin } from "antd"; // import preval from "preval.macro"; import React, { lazy, Suspense, useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; @@ -117,7 +117,6 @@ const mapDispatchToProps = (dispatch) => ({ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoyRideFinished }) { const { t } = useTranslation(); const [chatVisible] = useState(false); - const [tours, setTours] = useState([]); useEffect(() => { const widgetId = InstanceRenderManager({ @@ -630,28 +629,6 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy Disclaimer & Notices - {InstanceRenderManager({ - promanager: ( - - - - - {tours.map((tour) => ( - window.productFruits.api.tours.tryStartTour(tour.id)}> - {tour.name} - - ))} - - - - ) - })} diff --git a/server/email/tasksEmails.js b/server/email/tasksEmails.js index 8c6f7c624..aac9ebf4f 100644 --- a/server/email/tasksEmails.js +++ b/server/email/tasksEmails.js @@ -189,6 +189,8 @@ const taskAssignedEmail = async (req, res) => { newTask.id ) ), + null, + null, tasks_by_pk.bodyshop.convenient_company ); @@ -303,11 +305,19 @@ const tasksRemindEmail = async (req, res) => { if (emailData?.subject && emailData?.html) { // Send Email - sendMail("remind", emailData.to, emailData.subject, emailData.html, taskIds, (taskIds) => { - for (const taskId of taskIds) { - tasksEmailQueue.push(taskId); - } - }); + sendMail( + "remind", + emailData.to, + emailData.subject, + emailData.html, + taskIds, + (taskIds) => { + for (const taskId of taskIds) { + tasksEmailQueue.push(taskId); + } + }, + allTasks[0].bodyshop.convenient_company + ); } });