Merged in feature/2021-06-25 (pull request #118)

Added missing template.

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2021-06-25 19:07:29 +00:00
9 changed files with 75 additions and 34 deletions

View File

@@ -32403,6 +32403,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>production_by_csr</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>production_by_last_name</name>
<definition_loaded>false</definition_loaded>

View File

@@ -8,7 +8,17 @@
<meta name="description" content="ImEX Online" />
<!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
<link rel="apple-touch-icon" href="logo192.png" />
<script type="text/javascript">
window.$crisp = [];
window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
(function () {
d = document;
s = d.createElement("script");
s.src = "https://client.crisp.chat/l.js";
s.async = 1;
d.getElementsByTagName("head")[0].appendChild(s);
})();
</script>
<script>
!(function () {
"use strict";

View File

@@ -3,12 +3,12 @@ import { ConfigProvider } from "antd";
import enLocale from "antd/es/locale/en_US";
import LogRocket from "logrocket";
import moment from "moment";
import React, { useEffect } from "react";
import React from "react";
import { useTranslation } from "react-i18next";
import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
import JiraSupportComponent from "../components/jira-support-widget/jira-support-widget.component";
import client from "../utils/GraphQLClient";
import App from "./App";
import { useTranslation } from "react-i18next";
import JiraSupportComponent from "../components/jira-support-widget/jira-support-widget.component";
moment.locale("en-US");
if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");
@@ -16,20 +16,20 @@ if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");
export default function AppContainer() {
const { t } = useTranslation();
useEffect(() => {
// Include the Crisp code here, without the <script></script> tags
window.$crisp = [];
window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
var d = document;
var s = d.createElement("script");
s.src = "https://client.crisp.chat/l.js";
s.async = 1;
d.getElementsByTagName("head")[0].appendChild(s);
// useEffect(() => {
// // Include the Crisp code here, without the <script></script> tags
// window.$crisp = [];
// window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
// var d = document;
// var s = d.createElement("script");
// s.src = "https://client.crisp.chat/l.js";
// s.async = 1;
// d.getElementsByTagName("head")[0].appendChild(s);
return () => {
d.getElementsByTagName("head")[0].removeChild(s);
};
}, []);
// return () => {
// d.getElementsByTagName("head")[0].removeChild(s);
// };
// }, []);
return (
<ApolloProvider client={client}>

View File

@@ -26,7 +26,9 @@ export function PrintCenterJobsComponent({ printCenterModal }) {
const filteredJobsReportsList =
search !== ""
? JobsReportsList.filter((r) => r.title.toLowerCase().includes(search))
? JobsReportsList.filter((r) =>
r.title.toLowerCase().includes(search.toLowerCase())
)
: JobsReportsList;
//Group it, create cards, and then filter out.

View File

@@ -1935,6 +1935,7 @@
"parts_backorder": "Backordered Parts",
"payments_by_date": "Payments by Date",
"payments_by_date_type": "Payments by Date and Type",
"production_by_csr": "Production by CSR",
"production_by_last_name": "Production by Last Name",
"production_by_repair_status": "Production by Status",
"production_by_ro": "Production by RO",

View File

@@ -1935,6 +1935,7 @@
"parts_backorder": "",
"payments_by_date": "",
"payments_by_date_type": "",
"production_by_csr": "",
"production_by_last_name": "",
"production_by_repair_status": "",
"production_by_ro": "",

View File

@@ -1935,6 +1935,7 @@
"parts_backorder": "",
"payments_by_date": "",
"payments_by_date_type": "",
"production_by_csr": "",
"production_by_last_name": "",
"production_by_repair_status": "",
"production_by_ro": "",

View File

@@ -328,6 +328,14 @@ export const TemplateList = (type, context) => {
disabled: false,
group: "ro",
},
parts_label_multi: {
title: i18n.t("printcenter.jobs.parts_label_multi"),
description: "Thank You Letter by RO",
key: "parts_label_multi",
subject: i18n.t("printcenter.jobs.parts_label_multi"),
disabled: false,
group: "ro",
},
}
: {}),
...(!type || type === "job_special"
@@ -1150,10 +1158,6 @@ export const TemplateList = (type, context) => {
key: "production_by_last_name",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"),
},
},
production_by_repair_status: {
title: i18n.t("reportcenter.templates.production_by_repair_status"),
@@ -1164,10 +1168,6 @@ export const TemplateList = (type, context) => {
key: "production_by_repair_status",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"),
},
},
production_by_target_date: {
title: i18n.t("reportcenter.templates.production_by_target_date"),
@@ -1176,10 +1176,6 @@ export const TemplateList = (type, context) => {
key: "production_by_target_date",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"),
},
},
production_by_ro: {
title: i18n.t("reportcenter.templates.production_by_ro"),
@@ -1188,10 +1184,14 @@ export const TemplateList = (type, context) => {
key: "production_by_ro",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"),
},
},
production_by_csr: {
title: i18n.t("reportcenter.templates.production_by_csr"),
description: "",
subject: i18n.t("reportcenter.templates.production_by_csr"),
key: "production_by_csr",
//idtype: "vendor",
disabled: false,
},
}
: {}),

View File

@@ -0,0 +1,5 @@
import React from "react";
export function PartsLabelMulti() {
return <div></div>;
}