@@ -45,17 +33,15 @@ export function PrintCenterJobsComponent({ bodyshop, printCenterModal }) {
-
- {JobsReportsList.filter((t) => t.drivingId === "job").map(
- (item) => (
-
- )
- )}
+
+ {JobsReportsList.map((item) => (
+
+ ))}
diff --git a/client/src/components/print-center-modal/print-center-modal.container.jsx b/client/src/components/print-center-modal/print-center-modal.container.jsx
index 0d53b1e65..b812e62ef 100644
--- a/client/src/components/print-center-modal/print-center-modal.container.jsx
+++ b/client/src/components/print-center-modal/print-center-modal.container.jsx
@@ -3,47 +3,37 @@ import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
-import { setEmailOptions } from "../../redux/email/email.actions";
import { toggleModalVisible } from "../../redux/modals/modals.actions";
import { selectPrintCenter } from "../../redux/modals/modals.selectors";
-import {
- selectBodyshop,
- selectCurrentUser,
-} from "../../redux/user/user.selectors";
import PrintCenterModalComponent from "./print-center-modal.component";
import "./print-center-modal.styles.scss";
const mapStateToProps = createStructuredSelector({
- currentUser: selectCurrentUser,
- bodyshop: selectBodyshop,
printCenterModal: selectPrintCenter,
});
const mapDispatchToProps = (dispatch) => ({
- setEmailOptions: (e) => dispatch(setEmailOptions(e)),
toggleModalVisible: () => dispatch(toggleModalVisible("printCenter")),
});
export function PrintCenterModalContainer({
printCenterModal,
toggleModalVisible,
- currentUser,
- bodyshop,
- setEmailOptions,
}) {
const { t } = useTranslation();
const { visible, context } = printCenterModal;
- const { type, id } = context;
+ const { type } = context;
// const { refetch } = actions;
return (
toggleModalVisible()}
- width='90%'
- title={` ${t("printcenter.labels.title")} ${type} - ${id}`}
- destroyOnClose>
+ width="90%"
+ title={` ${t("printcenter.labels.title")} - ${type}`}
+ destroyOnClose
+ >
);
diff --git a/client/src/components/print-center-speed-print/print-center-speed-print.component.jsx b/client/src/components/print-center-speed-print/print-center-speed-print.component.jsx
index 7319e4f3e..ac12718f0 100644
--- a/client/src/components/print-center-speed-print/print-center-speed-print.component.jsx
+++ b/client/src/components/print-center-speed-print/print-center-speed-print.component.jsx
@@ -66,14 +66,18 @@ export function PrintCenterSpeedPrint({ bodyshop, jobId }) {
);
}
-const renderTemplateList = (templates) => (
-
- {templates.map((template, idx) => {
- if (idx === templates.length - 1) return TemplateList()[template].title;
- return `${TemplateList()[template].title}, `;
- })}
-
-);
+const renderTemplateList = (templates) => {
+ const TemplateListGenerated = TemplateList();
+ return (
+
+ {templates.map((template, idx) => {
+ if (idx === templates.length - 1)
+ return TemplateListGenerated[template].title;
+ return `${TemplateListGenerated[template].title}, `;
+ })}
+
+ );
+};
export default connect(
mapStateToProps,
diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
index 97fca225d..ff051e291 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
@@ -139,10 +139,10 @@ export function ScheduleJobModalContainer({
messageOptions: {
to: [values.email],
replyTo: bodyshop.email,
- subject: TemplateList().appointment_confirmation.subject,
+ subject: TemplateList("appointment").appointment_confirmation.subject,
},
template: {
- name: TemplateList().appointment_confirmation.key,
+ name: TemplateList("appointment").appointment_confirmation.key,
variables: {
id: appt.data.insert_appointments.returning[0].id,
},
diff --git a/client/src/components/shop-info/shop-info.intake.component.jsx b/client/src/components/shop-info/shop-info.intake.component.jsx
index d53907020..ef38f181c 100644
--- a/client/src/components/shop-info/shop-info.intake.component.jsx
+++ b/client/src/components/shop-info/shop-info.intake.component.jsx
@@ -16,6 +16,7 @@ const SelectorDiv = styled.div`
export default function ShopInfoIntakeChecklistComponent({ form }) {
const { t } = useTranslation();
+ const TemplateListGenerated = TemplateList();
return (
@@ -128,12 +129,12 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
]}
>
@@ -250,12 +251,12 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
]}
>
diff --git a/client/src/components/shop-info/shop-info.speedprint.component.jsx b/client/src/components/shop-info/shop-info.speedprint.component.jsx
index df3bf9201..c754f3abe 100644
--- a/client/src/components/shop-info/shop-info.speedprint.component.jsx
+++ b/client/src/components/shop-info/shop-info.speedprint.component.jsx
@@ -4,10 +4,12 @@ import React from "react";
import { useTranslation } from "react-i18next";
import { TemplateList } from "../../utils/TemplateConstants";
import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
export default function ShopInfoSpeedPrint({ bodyshop, form }) {
const { t } = useTranslation();
-
+ const TemplateListGenerated = TemplateList();
+ console.log("TemplateListGenerated", TemplateListGenerated);
return (
@@ -16,7 +18,7 @@ export default function ShopInfoSpeedPrint({ bodyshop, form }) {
{fields.map((field, index) => (
-
+
@@ -81,7 +83,7 @@ export default function ShopInfoSpeedPrint({ bodyshop, form }) {
index={index}
total={fields.length}
/>
-
+
))}
diff --git a/client/src/components/shop-template-add/shop-template-add.component.jsx b/client/src/components/shop-template-add/shop-template-add.component.jsx
index 47a071652..619e70f4e 100644
--- a/client/src/components/shop-template-add/shop-template-add.component.jsx
+++ b/client/src/components/shop-template-add/shop-template-add.component.jsx
@@ -7,14 +7,14 @@ import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useHistory, useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
import {
INSERT_TEMPLATE,
QUERY_TEMPLATES_BY_NAME_FOR_DUPE,
} from "../../graphql/templates.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
-import { TemplateList } from "../../utils/TemplateConstants";
-import { logImEXEvent } from "../../firebase/firebase.utils";
import client from "../../utils/GraphQLClient";
+import { TemplateList } from "../../utils/TemplateConstants";
const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser
@@ -67,12 +67,12 @@ export function ShopTemplateAddComponent({
history.push({ search: queryString.stringify(search) });
if (!!refetch) refetch();
};
-
+ const TemplateListGenerated = TemplateList();
const menu = (