);
}
-
-export default JobLifecycleComponent;
+export default connect(mapStateToProps, mapDispatchToProps)(JobLifecycleComponent);
diff --git a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx
index 2bf99c1a9..b00ff0c36 100644
--- a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx
+++ b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx
@@ -13,12 +13,12 @@ import { selectScheduleLoad, selectScheduleLoadCalculating } from "../../redux/a
import { selectBodyshop } from "../../redux/user/user.selectors";
import { DateTimeFormatter } from "../../utils/DateFormatter";
import { default as BlurWrapper, default as BlurWrapperComponent } from "../feature-wrapper/blur-wrapper.component";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
import ScheduleBlockDay from "../schedule-block-day/schedule-block-day.component";
+import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
import ScheduleCalendarHeaderGraph from "./schedule-calendar-header-graph.component";
-import UpsellComponent, { upsellEnum, UpsellMaskWrapper } from "../upsell/upsell.component";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
diff --git a/client/src/components/upsell/upsell.component.jsx b/client/src/components/upsell/upsell.component.jsx
index 8857a278d..652cbeab9 100644
--- a/client/src/components/upsell/upsell.component.jsx
+++ b/client/src/components/upsell/upsell.component.jsx
@@ -13,6 +13,9 @@ import { Button, Card, Result } from "antd";
import i18n from "i18next";
import React, { useEffect, useRef } from "react";
import { useTranslation } from "react-i18next";
+import { Link } from "react-router-dom";
+import { store } from "../../redux/store.js";
+import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
import "./upsell.styles.scss";
export default function UpsellComponent({ featureName, subFeatureName, upsell, disableMask }) {
@@ -64,174 +67,275 @@ export function UpsellMaskWrapper({ children, upsell, featureName, subFeatureNam
);
}
+
//This is kept in this function as pulling it out into it's own util/enum prevents passing JSX as an `extra` prop
-export const upsellEnum = () => ({
- bills: {
- autoreconcile: {
- //icon: null,
- title: i18n.t("upsell.messages.bills.autoreconcile.title"),
- subTitle: i18n.t("upsell.messages.bills.autoreconcile.subtitle"),
- extra:
- //status: null
+export const upsellEnum = () => {
+ const { currentUser, bodyshop } = store.getState().user;
+
+ const [first_name, ...last_name] = currentUser?.displayName ? currentUser.displayName.split(" ") : [];
+ const LearnMoreLink = encodeURI(
+ InstanceRenderManager({
+ imex: `https://imexsystems.ca/schedule-a-demo/`,
+ rome: `https://forms.zohopublic.com/rometech/form/ROLearnMore/formperma/0G29z8LgLlvKK8nno-b7s-GHgNXwIFlrMeE0mC394L4?first_name=${first_name || ""}&last_name=${last_name.join(" ") || ""}&shop_name=${bodyshop?.shopname || ""}&email=${currentUser?.email || ""}&shop_phone=${bodyshop?.phone || ""}`
+ })
+ );
+
+ return {
+ bills: {
+ autoreconcile: {
+ //icon: null,
+ title: i18n.t("upsell.messages.bills.autoreconcile.title"),
+ subTitle: i18n.t("upsell.messages.bills.autoreconcile.subtitle"),
+ extra: (
+
+
+
+ )
+ //status: null
+ },
+ general: {
+ //icon: null,
+ title: i18n.t("upsell.messages.bills.general.title"),
+ subTitle: i18n.t("upsell.messages.bills.general.subtitle"),
+ extra: (
+
+
+
+ )
+ //status: null
+ }
},
- general: {
- //icon: null,
- title: i18n.t("upsell.messages.bills.general.title"),
- subTitle: i18n.t("upsell.messages.bills.general.subtitle"),
- extra:
- //status: null
- }
- },
- checklist: {
- general: {
- //icon: null,
- title: i18n.t("upsell.messages.checklist.general.title"),
- subTitle: i18n.t("upsell.messages.checklist.general.subtitle"),
- extra:
- //status: null
- }
- },
- payments: {
- general: {
- //icon: null,
- title: i18n.t("upsell.messages.payments.general.title"),
- subTitle: i18n.t("upsell.messages.payments.general.subtitle"),
- extra:
- //status: null
- }
- },
- audit: {
- general: {
- //icon: null,
- title: i18n.t("upsell.messages.audit.general.title"),
- subTitle: i18n.t("upsell.messages.audit.general.subtitle"),
- extra:
- //status: null
- }
- },
- lifecycle: {
- general: {
- //icon: null,
- title: i18n.t("upsell.messages.lifecycle.general.title"),
- subTitle: i18n.t("upsell.messages.lifecycle.general.subtitle"),
- extra:
- //status: null }
- }
- },
- media: {
- general: {
- //icon: null,
- title: i18n.t("upsell.messages.media.general.title"),
- subTitle: i18n.t("upsell.messages.media.general.subtitle"),
- extra:
- //status: null }
- },
- mobile: {
- icon: ,
- title: i18n.t("upsell.messages.media.mobile.title"),
- subTitle: i18n.t("upsell.messages.media.mobile.subtitle"),
- extra:
- //status: null }
- }
- },
- timetickets: {
- allocations: {
- title: i18n.t("upsell.messages.timetickets.allocations.title"),
- subTitle: i18n.t("upsell.messages.timetickets.allocations.subtitle"),
- extra:
- },
- general: {
- title: i18n.t("upsell.messages.timetickets.general.title"),
- subTitle: i18n.t("upsell.messages.timetickets.general.subtitle"),
- extra:
- }
- },
- smartscheduling: {
- general: {
- icon: ,
- title: i18n.t("upsell.messages.smartscheduling.general.title"),
- subTitle: i18n.t("upsell.messages.smartscheduling.general.subtitle"),
- extra:
- },
- hrsdelta: {
- icon: ,
- title: i18n.t("upsell.messages.smartscheduling.hrsdelta.title"),
- subTitle: i18n.t("upsell.messages.smartscheduling.hrsdelta.subtitle"),
- extra:
- },
- datepicker: {
- icon: ,
- title: i18n.t("upsell.messages.smartscheduling.datepicker.title"),
- subTitle: i18n.t("upsell.messages.smartscheduling.datepicker.subtitle"),
- extra:
- }
- },
- accounting: {
- payables: {
- icon: ,
- title: i18n.t("upsell.messages.accounting.payables.title"),
- subTitle: i18n.t("upsell.messages.accounting.payables.subtitle"),
- extra:
- },
- receivables: {
- icon: ,
- title: i18n.t("upsell.messages.accounting.receivables.title"),
- subTitle: i18n.t("upsell.messages.accounting.receivables.subtitle"),
- extra:
+ checklist: {
+ general: {
+ //icon: null,
+ title: i18n.t("upsell.messages.checklist.general.title"),
+ subTitle: i18n.t("upsell.messages.checklist.general.subtitle"),
+ extra: (
+
+
+
+ )
+ //status: null
+ }
},
payments: {
- icon: ,
- title: i18n.t("upsell.messages.accounting.payments.title"),
- subTitle: i18n.t("upsell.messages.accounting.payments.subtitle"),
- extra:
+ general: {
+ //icon: null,
+ title: i18n.t("upsell.messages.payments.general.title"),
+ subTitle: i18n.t("upsell.messages.payments.general.subtitle"),
+ extra: (
+
+
+
+ )
+ //status: null
+ }
+ },
+ audit: {
+ general: {
+ //icon: null,
+ title: i18n.t("upsell.messages.audit.general.title"),
+ subTitle: i18n.t("upsell.messages.audit.general.subtitle"),
+ extra: (
+
+
+
+ )
+ //status: null
+ }
+ },
+ lifecycle: {
+ general: {
+ //icon: null,
+ title: i18n.t("upsell.messages.lifecycle.general.title"),
+ subTitle: i18n.t("upsell.messages.lifecycle.general.subtitle"),
+ extra: (
+
+
+
+ )
+ //status: null }
+ }
+ },
+ media: {
+ general: {
+ //icon: null,
+ title: i18n.t("upsell.messages.media.general.title"),
+ subTitle: i18n.t("upsell.messages.media.general.subtitle"),
+ extra: (
+
+
+
+ )
+ //status: null }
+ },
+ mobile: {
+ icon: ,
+ title: i18n.t("upsell.messages.media.mobile.title"),
+ subTitle: i18n.t("upsell.messages.media.mobile.subtitle"),
+ extra: (
+
+
+
+ )
+ //status: null }
+ }
+ },
+ timetickets: {
+ allocations: {
+ title: i18n.t("upsell.messages.timetickets.allocations.title"),
+ subTitle: i18n.t("upsell.messages.timetickets.allocations.subtitle"),
+ extra: (
+
+
+
+ )
+ },
+ general: {
+ title: i18n.t("upsell.messages.timetickets.general.title"),
+ subTitle: i18n.t("upsell.messages.timetickets.general.subtitle"),
+ extra: (
+
+
+
+ )
+ }
+ },
+ smartscheduling: {
+ general: {
+ icon: ,
+ title: i18n.t("upsell.messages.smartscheduling.general.title"),
+ subTitle: i18n.t("upsell.messages.smartscheduling.general.subtitle"),
+ extra: (
+
+
+
+ )
+ },
+ hrsdelta: {
+ icon: ,
+ title: i18n.t("upsell.messages.smartscheduling.hrsdelta.title"),
+ subTitle: i18n.t("upsell.messages.smartscheduling.hrsdelta.subtitle"),
+ extra: (
+
+
+
+ )
+ },
+ datepicker: {
+ icon: ,
+ title: i18n.t("upsell.messages.smartscheduling.datepicker.title"),
+ subTitle: i18n.t("upsell.messages.smartscheduling.datepicker.subtitle"),
+ extra: (
+
+
+
+ )
+ }
+ },
+ accounting: {
+ payables: {
+ icon: ,
+ title: i18n.t("upsell.messages.accounting.payables.title"),
+ subTitle: i18n.t("upsell.messages.accounting.payables.subtitle"),
+ extra: (
+
+
+
+ )
+ },
+ receivables: {
+ icon: ,
+ title: i18n.t("upsell.messages.accounting.receivables.title"),
+ subTitle: i18n.t("upsell.messages.accounting.receivables.subtitle"),
+ extra: (
+
+
+
+ )
+ },
+ payments: {
+ icon: ,
+ title: i18n.t("upsell.messages.accounting.payments.title"),
+ subTitle: i18n.t("upsell.messages.accounting.payments.subtitle"),
+ extra: (
+
+
+
+ )
+ }
+ },
+ courtesycars: {
+ general: {
+ icon: ,
+ title: i18n.t("upsell.messages.courtesycars.general.title"),
+ subTitle: i18n.t("upsell.messages.courtesycars.general.subtitle"),
+ extra: (
+
+
+
+ )
+ }
+ },
+ dashboard: {
+ general: {
+ icon: ,
+ title: i18n.t("upsell.messages.dashboard.general.title"),
+ subTitle: i18n.t("upsell.messages.dashboard.general.subtitle"),
+ extra: (
+
+
+
+ )
+ }
+ },
+ visualboard: {
+ general: {
+ icon: ,
+ title: i18n.t("upsell.messages.visualboard.general.title"),
+ subTitle: i18n.t("upsell.messages.visualboard.general.subtitle"),
+ extra: (
+
+
+
+ )
+ }
+ },
+ scoreboard: {
+ general: {
+ icon: ,
+ title: i18n.t("upsell.messages.scoreboard.general.title"),
+ subTitle: i18n.t("upsell.messages.scoreboard.general.subtitle"),
+ extra: (
+
+
+
+ )
+ }
+ },
+ techconsole: {
+ general: {
+ icon: ,
+ title: i18n.t("upsell.messages.techconsole.general.title"),
+ subTitle: i18n.t("upsell.messages.techconsole.general.subtitle"),
+ extra: (
+
+
+
+ )
+ }
+ },
+ csi: {
+ general: {
+ icon: ,
+ title: i18n.t("upsell.messages.csi.general.title"),
+ subTitle: i18n.t("upsell.messages.csi.general.subtitle"),
+ extra: (
+
+
+
+ )
+ }
}
- },
- courtesycars: {
- general: {
- icon: ,
- title: i18n.t("upsell.messages.courtesycars.general.title"),
- subTitle: i18n.t("upsell.messages.courtesycars.general.subtitle"),
- extra:
- }
- },
- dashboard: {
- general: {
- icon: ,
- title: i18n.t("upsell.messages.dashboard.general.title"),
- subTitle: i18n.t("upsell.messages.dashboard.general.subtitle"),
- extra:
- }
- },
- visualboard: {
- general: {
- icon: ,
- title: i18n.t("upsell.messages.visualboard.general.title"),
- subTitle: i18n.t("upsell.messages.visualboard.general.subtitle"),
- extra:
- }
- },
- scoreboard: {
- general: {
- icon: ,
- title: i18n.t("upsell.messages.scoreboard.general.title"),
- subTitle: i18n.t("upsell.messages.scoreboard.general.subtitle"),
- extra:
- }
- },
- techconsole: {
- general: {
- icon: ,
- title: i18n.t("upsell.messages.techconsole.general.title"),
- subTitle: i18n.t("upsell.messages.techconsole.general.subtitle"),
- extra:
- }
- },
- csi: {
- general: {
- icon: ,
- title: i18n.t("upsell.messages.csi.general.title"),
- subTitle: i18n.t("upsell.messages.csi.general.subtitle"),
- extra:
- }
- }
-});
+ };
+};
diff --git a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
index 320c2903c..eded63067 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -20,7 +20,6 @@ import { FaHardHat, FaRegStickyNote, FaShieldAlt, FaTasks } from "react-icons/fa
import { connect } from "react-redux";
import { useLocation, useNavigate } from "react-router-dom";
import { createStructuredSelector } from "reselect";
-import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
import FormFieldsChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
@@ -42,6 +41,7 @@ import JobsDetailTotals from "../../components/jobs-detail-totals/jobs-detail-to
import JobsDocumentsGalleryContainer from "../../components/jobs-documents-gallery/jobs-documents-gallery.container";
import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
import JobNotesContainer from "../../components/jobs-notes/jobs-notes.container";
+import LockWrapperComponent from "../../components/lock-wrapper/lock-wrapper.component.jsx";
import NoteUpsertModalComponent from "../../components/note-upsert-modal/note-upsert-modal.container";
import ScheduleJobModalContainer from "../../components/schedule-job-modal/schedule-job-modal.container";
import TaskListContainer from "../../components/task-list/task-list.container.jsx";
@@ -54,9 +54,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
import AuditTrailMapping from "../../utils/AuditTrailMappings";
import { DateTimeFormat } from "../../utils/DateFormatter";
import dayjs from "../../utils/day";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
import UndefinedToNull from "../../utils/undefinedtonull";
-import LockWrapperComponent from "../../components/lock-wrapper/lock-wrapper.component.jsx";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
@@ -403,7 +401,9 @@ export function JobsDetailPage({
icon: ,
id: "job-details-lifecycle",
label: (
- {t("menus.jobsdetail.lifecycle")}
+
+ {t("menus.jobsdetail.lifecycle")}
+
),
children:
},
@@ -438,7 +438,11 @@ export function JobsDetailPage({
key: "audit",
icon: ,
id: "job-details-audit",
- label: {t("jobs.labels.audit")},
+ label: (
+
+ {t("jobs.labels.audit")}
+
+ ),
children:
},
{