diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.addevent.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.addevent.jsx index 164769063..0c7ad08dc 100644 --- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.addevent.jsx +++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.addevent.jsx @@ -1,5 +1,15 @@ import { useMutation } from "@apollo/client"; -import { Button, Card, Form, Input, Menu, Popover, Select, Space } from "antd"; +import { + Button, + Card, + Form, + Input, + Menu, + notification, + Popover, + Select, + Space, +} from "antd"; import moment from "moment"; import React, { useState } from "react"; import { useTranslation } from "react-i18next"; @@ -40,6 +50,10 @@ export function JobsDetailHeaderAddEvent({ bodyshop, jobid, ...props }) { }, refetchQueries: ["QUERY_ALL_ACTIVE_APPOINTMENTS"], }); + notification.open({ + type: "success", + message: t("appointments.successes.created"), + }); } catch (error) { console.log(error); } finally { diff --git a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js index 9f41906db..e312ebe03 100644 --- a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js +++ b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js @@ -40,7 +40,10 @@ export function ScheduleCalendarHeaderComponent({ if (!events) return []; return _.groupBy( events.filter( - (e) => !e.vacation && moment(date).isSame(moment(e.start), "day") + (e) => + !e.vacation && + e.isintake && + moment(date).isSame(moment(e.start), "day") ), "job.alt_transport" ); diff --git a/server/email/sendemail.js b/server/email/sendemail.js index f913911e0..40f5ecf79 100644 --- a/server/email/sendemail.js +++ b/server/email/sendemail.js @@ -180,15 +180,25 @@ async function getImage(imageUrl) { } async function logEmail(req, email) { - await client.request(queries.INSERT_EMAIL_AUDIT, { - email: { - to: email.to, - cc: email.cc, - subject: email.subject, - bodyshopid: req.body.bodyshopid, - useremail: req.user.email, - contents: req.body.html, - jobid: req.body.jobid, - }, - }); + try { + await client.request(queries.INSERT_EMAIL_AUDIT, { + email: { + to: email.to, + cc: email.cc, + subject: email.subject, + bodyshopid: req.body.bodyshopid, + useremail: req.user.email, + contents: req.body.html, + jobid: req.body.jobid, + }, + }); + } catch (error) { + logger.log("email-log-error", "error", req.user.email, null, { + from: `${req.body.from.name} <${req.body.from.address}>`, + to: req.body.to, + cc: req.body.cc, + subject: req.body.subject, + // info, + }); + } }