IO-1267 missing query info in detail cards.

This reverts commit a8ad65000d.

client/craco.config.js

@@ -12,7 +12,9 @@ module.exports = {
             modifyVars: {
               ...(process.env.NODE_ENV === "development"
                 ? { "@primary-color": "#a51d1d" }
-                : { "@primary-color": "#1DA57A" }),
+                : {
+                    //"@primary-color": "#1DA57A"
+                  }),
               // "@primary-color": " #1890ff", // primary color for all components
               // "@link-color": "#1890ff", // link color
               // "@success-color": "#52c41a", // success state color

client/package.json

@@ -19,6 +19,7 @@
     "craco-less": "^1.17.1",
     "dinero.js": "^1.8.1",
     "dotenv": "^9.0.2",
+    "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
     "exifr": "^7.0.0",
     "firebase": "^8.6.0",
@@ -35,6 +36,8 @@
     "preval.macro": "^5.0.0",
     "prop-types": "^15.7.2",
     "query-string": "^7.0.0",
+    "rc-queue-anim": "^1.8.5",
+    "rc-scroll-anim": "^2.7.6",
     "react": "^17.0.1",
     "react-big-calendar": "^0.33.2",
     "react-color": "^2.19.3",
@@ -49,6 +52,7 @@
     "react-resizable": "^3.0.1",
     "react-router-dom": "^5.2.0",
     "react-scripts": "^4.0.3",
+    "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.3",
     "recharts": "^2.0.7",
     "redux": "^4.1.0",
@@ -57,6 +61,7 @@
     "redux-state-sync": "^3.1.2",
     "reselect": "^4.0.0",
     "sass": "^1.32.13",
+    "socket.io-client": "^4.1.2",
     "styled-components": "^5.3.0",
     "subscriptions-transport-ws": "^0.9.18",
     "web-vitals": "^1.1.2",

client/public/index.html

@@ -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";

client/src/App/App.container.jsx

@@ -3,12 +3,11 @@ 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 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,21 +15,6 @@ 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);
-
-    return () => {
-      d.getElementsByTagName("head")[0].removeChild(s);
-    };
-  }, []);
-
   return (
     <ApolloProvider client={client}>
       <ConfigProvider
@@ -46,7 +30,6 @@ export default function AppContainer() {
       >
         <GlobalLoadingBar />
         <App />
-        <JiraSupportComponent />
       </ConfigProvider>
     </ApolloProvider>
   );

client/src/App/App.jsx

@@ -8,7 +8,7 @@ import DocumentEditorContainer from "../components/document-editor/document-edit
 import ErrorBoundary from "../components/error-boundary/error-boundary.component";
 //Component Imports
 import LoadingSpinner from "../components/loading-spinner/loading-spinner.component";
-import AboutPage from "../pages/about/about.page";
+import DisclaimerPage from "../pages/disclaimer/disclaimer.page";
 import TechPageContainer from "../pages/tech/tech.page.container";
 import { setOnline } from "../redux/application/application.actions";
 import { selectOnline } from "../redux/application/application.selectors";
@@ -17,7 +17,7 @@ import { selectCurrentUser } from "../redux/user/user.selectors";
 import PrivateRoute from "../utils/private-route";
 import "./App.styles.scss";
 
-const LandingPage = lazy(() => import("../pages/landing/landing.page"));
+import LandingPage from "../pages/landing/landing.page";
 const ResetPassword = lazy(() =>
   import("../pages/reset-password/reset-password.component")
 );
@@ -100,7 +100,7 @@ export function App({ checkUserSession, currentUser, online, setOnline }) {
           <Route exact path="/csi/:surveyId" component={CsiPage} />
         </ErrorBoundary>
         <ErrorBoundary>
-          <Route exact path="/about" component={AboutPage} />
+          <Route exact path="/disclaimer" component={DisclaimerPage} />
         </ErrorBoundary>
         <ErrorBoundary>
           <Route

client/src/assets/icons/technology.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" ?><svg style="enable-background:new 0 0 128 128;" version="1.1" viewBox="0 0 128 128" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><style type="text/css">
+	.st0{fill:none;stroke:#000000;stroke-width:8;stroke-miterlimit:10;}
+	.st1{display:none;}
+	.st2{display:inline;opacity:0.25;fill:#F45EFD;}
+</style><g id="_x31_2_3D_Printing"/><g id="_x31_1_VR_Gear"/><g id="_x31_0_Virtual_reality"/><g id="_x39__Augmented_reality"/><g id="_x38__Teleport"/><g id="_x37__Glassess"/><g id="_x36__Folding_phone"/><g id="_x35__Drone"/><g id="_x34__Retina_scan"/><g id="_x33__Smartwatch"/><g id="_x32__Bionic_Arm"/><g id="_x31__Chip"><g><path d="M108,40c-5.2,0-9.6,3.3-11.3,8H84V32h-8V20h-8v12h-8V20h-8v12h-8v16H24v-8.7c4.7-1.7,8-6.1,8-11.3c0-6.6-5.4-12-12-12    S8,21.4,8,28c0,5.2,3.3,9.6,8,11.3V56h28v8H16v16.7c-4.7,1.7-8,6.1-8,11.3c0,6.6,5.4,12,12,12s12-5.4,12-12c0-5.2-3.3-9.6-8-11.3    V72h20v16h8v12h8V88h8v12h8V88h8V72h8v16.7c-4.7,1.7-8,6.1-8,11.3c0,6.6,5.4,12,12,12s12-5.4,12-12c0-5.2-3.3-9.6-8-11.3V64H84v-8    h12.7c1.7,4.7,6.1,8,11.3,8c6.6,0,12-5.4,12-12S114.6,40,108,40z M20,32c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S22.2,32,20,32z     M20,96c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S22.2,96,20,96z M76,80H52V40h24V80z M96,96c2.2,0,4,1.8,4,4s-1.8,4-4,4s-4-1.8-4-4    S93.8,96,96,96z M108,56c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S110.2,56,108,56z"/><rect height="8" width="8" x="56" y="64"/></g></g><g class="st1" id="Guide"><path class="st2" d="M120,8v112H8V8H120 M128,0H0v128h128V0L128,0z"/></g></svg>

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -81,6 +81,7 @@ function BillEnterModalContainer({
           },
         ],
       },
+      refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
     });
     console.log("adjustmentsToInsert", adjustmentsToInsert);
     const adjKeys = Object.keys(adjustmentsToInsert);

client/src/components/bill-reexport-button/bill-reexport-button.component.jsx

@@ -47,7 +47,9 @@ export function BillMarkForReexportButton({ bodyshop, authLevel, bill }) {
     });
 
     if (!result.errors) {
-      notification["success"]({ message: t("bills.successes.save") });
+      notification["success"]({
+        message: t("bills.successes.reexport"),
+      });
     } else {
       notification["error"]({
         message: t("bills.errors.saving", {

client/src/components/breadcrumbs/breadcrumbs.component.jsx

@@ -1,5 +1,5 @@
 import { HomeFilled } from "@ant-design/icons";
-import { Breadcrumb } from "antd";
+import { Breadcrumb, Row, Col } from "antd";
 import React from "react";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
@@ -14,27 +14,29 @@ const mapStateToProps = createStructuredSelector({
 
 export function BreadCrumbs({ breadcrumbs }) {
   return (
-    <div className="breadcrumb-container imex-flex-row">
-      <Breadcrumb separator=">" style={{ flex: 1 }}>
-        <Breadcrumb.Item>
-          <Link to={`/manage`}>
-            <HomeFilled />
-          </Link>
-        </Breadcrumb.Item>
-        {breadcrumbs.map((item) =>
-          item.link ? (
-            <Breadcrumb.Item key={item.label}>
-              <Link to={item.link}>{item.label} </Link>
-            </Breadcrumb.Item>
-          ) : (
-            <Breadcrumb.Item key={item.label}>{item.label}</Breadcrumb.Item>
-          )
-        )}
-      </Breadcrumb>
-      <div>
+    <Row className="breadcrumb-container">
+      <Col xs={24} sm={24} md={16}>
+        <Breadcrumb separator=">">
+          <Breadcrumb.Item>
+            <Link to={`/manage`}>
+              <HomeFilled />
+            </Link>
+          </Breadcrumb.Item>
+          {breadcrumbs.map((item) =>
+            item.link ? (
+              <Breadcrumb.Item key={item.label}>
+                <Link to={item.link}>{item.label} </Link>
+              </Breadcrumb.Item>
+            ) : (
+              <Breadcrumb.Item key={item.label}>{item.label}</Breadcrumb.Item>
+            )
+          )}
+        </Breadcrumb>
+      </Col>
+      <Col xs={24} sm={24} md={8}>
         <GlobalSearch />
-      </div>
-    </div>
+      </Col>
+    </Row>
   );
 }
 export default connect(mapStateToProps, null)(BreadCrumbs);

client/src/components/chat-archive-button/chat-archive-button.component.jsx

@@ -5,10 +5,6 @@ import { useTranslation } from "react-i18next";
 import { TOGGLE_CONVERSATION_ARCHIVE } from "../../graphql/conversations.queries";
 
 export default function ChatArchiveButton({ conversation }) {
-  console.log(
-    "🚀  ~ file: chat-archive-button.component.jsx  ~ line 6  ~ conversation",
-    conversation
-  );
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [updateConversation] = useMutation(TOGGLE_CONVERSATION_ARCHIVE);

client/src/components/dashboard-components/monthly-revenue-graph/monthly-revenue-graph.component.jsx

@@ -63,7 +63,9 @@ export default function DashboardMonthlyRevenueGraph({ data, ...cardProps }) {
             <CartesianGrid stroke="#f5f5f5" />
             <XAxis dataKey="date" />
             <YAxis />
-            <Tooltip />
+            <Tooltip
+              formatter={(value, name, props) => value && value.toFixed(2)}
+            />
             <Legend />
             <Area
               type="monotone"

client/src/components/email-overlay/email-overlay.container.jsx

@@ -43,6 +43,10 @@ export function EmailOverlayContainer({
   const [loading, setLoading] = useState(false);
   const [sending, setSending] = useState(false);
   const [rawHtml, setRawHtml] = useState("");
+  const [pdfCopytoAttach, setPdfCopytoAttach] = useState({
+    filename: null,
+    pdf: null,
+  });
   const [selectedMedia, setSelectedMedia] = useState([]);
 
   const defaultEmailFrom = {
@@ -59,17 +63,17 @@ export function EmailOverlayContainer({
   const handleFinish = async (values) => {
     logImEXEvent("email_send_from_modal");
 
-    const attachments = [];
+    //const attachments = [];
 
-    if (values.fileList)
-      await asyncForEach(values.fileList, async (f) => {
-        const t = {
-          ContentType: f.type,
-          Filename: f.name,
-          Base64Content: (await toBase64(f.originFileObj)).split(",")[1],
-        };
-        attachments.push(t);
-      });
+    // if (values.fileList)
+    //   await asyncForEach(values.fileList, async (f) => {
+    //     const t = {
+    //       ContentType: f.type,
+    //       Filename: f.name,
+    //       Base64Content: (await toBase64(f.originFileObj)).split(",")[1],
+    //     };
+    //     attachments.push(t);
+    //   });
 
     setSending(true);
     try {
@@ -77,11 +81,28 @@ export function EmailOverlayContainer({
         ...defaultEmailFrom,
         ...values,
         html: rawHtml,
-        attachments:
-          values.fileList &&
-          (await Promise.all(
-            values.fileList.map(async (f) => await toBase64(f.originFileObj))
-          )),
+        attachments: [
+          ...(values.fileList
+            ? await Promise.all(
+                values.fileList.map(async (f) => {
+                  return {
+                    filename: f.name,
+                    path: await toBase64(f.originFileObj),
+                  };
+                })
+              )
+            : []),
+          ...(pdfCopytoAttach.pdf
+            ? [
+                {
+                  path: pdfCopytoAttach.pdf,
+                  filename:
+                    pdfCopytoAttach.filename &&
+                    `${pdfCopytoAttach.filename}.pdf`,
+                },
+              ]
+            : []),
+        ],
         media: selectedMedia.filter((m) => m.isSelected).map((m) => m.src),
         //attachments,
       });
@@ -99,13 +120,22 @@ export function EmailOverlayContainer({
   const render = async () => {
     logImEXEvent("email_render_template", { template: emailConfig.template });
     setLoading(true);
-    let html = await RenderTemplate(emailConfig.template, bodyshop, true);
+    let { html, pdf, filename } = await RenderTemplate(
+      emailConfig.template,
+      bodyshop,
+      true
+    );
 
     const response = await axios.post("/render/inlinecss", {
       html: html,
       url: `${window.location.protocol}://${window.location.host}/`,
     });
     setRawHtml(response.data);
+
+    if (pdf) {
+      setPdfCopytoAttach({ pdf, filename });
+    }
+
     form.setFieldsValue({
       ...emailConfig.messageOptions,
       cc:
@@ -166,8 +196,8 @@ const toBase64 = (file) =>
     reader.onerror = (error) => reject(error);
   });
 
-const asyncForEach = async (array, callback) => {
-  for (let index = 0; index < array.length; index++) {
-    await callback(array[index], index, array);
-  }
-};
+// const asyncForEach = async (array, callback) => {
+//   for (let index = 0; index < array.length; index++) {
+//     await callback(array[index], index, array);
+//   }
+// };

client/src/components/error-boundary/error-boundary.component.jsx

@@ -73,7 +73,6 @@ class ErrorBoundary extends React.Component {
   };
 
   render() {
-    console.log("this.props :>> ", this.props);
     const { t } = this.props;
     const { error, info } = this.state;
     if (this.state.hasErrored === true) {

client/src/components/feature-wrapper/feature-wrapper.component.jsx

@@ -0,0 +1,50 @@
+import moment from "moment";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import AlertComponent from "../alert/alert.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+function FeatureWrapper({
+  bodyshop,
+  featureName,
+  noauth,
+  children,
+  ...restProps
+}) {
+  const { t } = useTranslation();
+
+  if (HasFeatureAccess({ featureName, bodyshop })) return children;
+
+  return (
+    noauth || (
+      <AlertComponent
+        message={t("general.messages.nofeatureaccess")}
+        type="warning"
+      />
+    )
+  );
+}
+
+export function HasFeatureAccess({ featureName, bodyshop }) {
+  return (
+    bodyshop.features.allAccess ||
+    moment(bodyshop.features[featureName]).isAfter(moment())
+  );
+}
+
+export default connect(mapStateToProps, null)(FeatureWrapper);
+
+/* 
+dashboard
+production-board
+scoreboard
+csi
+tech-console
+mobile-imaging
+*/

client/src/components/global-search/global-search.component.jsx

@@ -37,7 +37,7 @@ export default function GlobalSearch() {
               value: job.ro_number,
               label: (
                 <Link to={`/manage/jobs/${job.id}`}>
-                  <Space wrap split={<Divider type="vertical" />}>
+                  <Space size="small" split={<Divider type="vertical" />}>
                     <strong>{job.ro_number || t("general.labels.na")}</strong>
                     <span>{`${job.ownr_fn || ""} ${job.ownr_ln || ""} ${
                       job.ownr_co_nm || ""
@@ -45,7 +45,7 @@ export default function GlobalSearch() {
                     <span>{`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${
                       job.v_model_desc || ""
                     }`}</span>
-                    <span>{`${job.clm_no}`}</span>
+                    <span>{`${job.clm_no || ""}`}</span>
                   </Space>
                 </Link>
               ),
@@ -62,7 +62,7 @@ export default function GlobalSearch() {
               }`,
               label: (
                 <Link to={`/manage/owners/${owner.id}`}>
-                  <Space wrap split={<Divider type="vertical" />}>
+                  <Space size="small" split={<Divider type="vertical" />}>
                     <span>{`${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${
                       owner.ownr_co_nm || ""
                     }`}</span>
@@ -85,14 +85,14 @@ export default function GlobalSearch() {
               } ${vehicle.v_model_desc || ""}`,
               label: (
                 <Link to={`/manage/vehicles/${vehicle.id}`}>
-                  <Space wrap split={<Divider type="vertical" />}>
+                  <Space size="small" split={<Divider type="vertical" />}>
                     <span>
                       {`${vehicle.v_model_yr || ""} ${
                         vehicle.v_make_desc || ""
                       } ${vehicle.v_model_desc || ""}`}
                     </span>
-                    <span>{vehicle.plate_no}</span>
-                    <span> {vehicle.v_vin}</span>
+                    <span>{vehicle.plate_no || ""}</span>
+                    <span> {vehicle.v_vin || ""}</span>
                   </Space>
                 </Link>
               ),
@@ -107,11 +107,12 @@ export default function GlobalSearch() {
               value: `${payment.job.ro_number} ${payment.payer} ${payment.amount}`,
               label: (
                 <Link to={`/manage/jobs/${payment.job.id}`}>
-                  <Space wrap split={<Divider type="vertical" />}>
+                  <Space size="small" split={<Divider type="vertical" />}>
+                    <span>{payment.paymentnum}</span>
                     <span>{payment.job.ro_number}</span>
-                    <span>{payment.job.memo}</span>
-                    <span>{payment.job.amount}</span>
-                    <span>{payment.job.transactionid}</span>
+                    <span>{payment.memo || ""}</span>
+                    <span>{payment.amount || ""}</span>
+                    <span>{payment.transactionid || ""}</span>
                   </Space>
                 </Link>
               ),
@@ -126,7 +127,7 @@ export default function GlobalSearch() {
               value: `${bill.invoice_number} - ${bill.vendor.name}`,
               label: (
                 <Link to={`/manage/bills?billid=${bill.id}`}>
-                  <Space wrap split={<Divider type="vertical" />}>
+                  <Space size="small" split={<Divider type="vertical" />}>
                     <span>{bill.invoice_number}</span>
                     <span>{bill.vendor.name}</span>
                     <span>{bill.date}</span>
@@ -146,7 +147,7 @@ export default function GlobalSearch() {
               }`,
               label: (
                 <Link to={`/manage/phonebook?phonebookentry=${pb.id}`}>
-                  <Space wrap split={<Divider type="vertical" />}>
+                  <Space size="small" split={<Divider type="vertical" />}>
                     <span>{`${pb.firstname || ""} ${pb.lastname || ""} ${
                       pb.company || ""
                     }`}</span>
@@ -165,8 +166,6 @@ export default function GlobalSearch() {
 
   return (
     <AutoComplete
-      key="globalsearch"
-      dropdownMatchSelectWidth={"false"}
       options={options}
       onSearch={handleSearch}
       allowClear

client/src/components/header/header.component.jsx

@@ -202,8 +202,8 @@ function Header({
                 context: null,
               });
             }}
+            icon={<Icon component={FaCreditCard} />}
           >
-            <Icon component={FaCreditCard} />
             {t("menus.header.enterpayment")}
           </Menu.Item>
           <Menu.Divider key="div5" />

client/src/components/jira-support-widget/jira-support-widget.component.jsx

@@ -1,28 +0,0 @@
-import React from "react";
-
-export default function JiraSupportComponent() {
-  //useScript();
-
-  return <div></div>;
-}
-
-// const useScript = () => {
-//   useEffect(() => {
-//     const script = document.createElement("script");
-//     script.src = "https://jsd-widget.atlassian.com/assets/embed.js";
-//     script.setAttribute("data-jsd-embedded", true);
-//     script.setAttribute("data-key", "d69bb65c-1dd3-483f-b109-66a970d03f44");
-//     script.setAttribute("data-base-url", "https://jsd-widget.atlassian.com");
-//     //script.async = true;
-//     script.onload = () => {
-//       var DOMContentLoaded_event = document.createEvent("Event");
-//       DOMContentLoaded_event.initEvent("DOMContentLoaded", true, true);
-//       window.document.dispatchEvent(DOMContentLoaded_event);
-//     };
-//     document.head.appendChild(script);
-
-//     return () => {
-//       document.head.removeChild(script);
-//     };
-//   }, []);
-// };

client/src/components/job-at-change/schedule-event.component.jsx

@@ -2,7 +2,7 @@ import { Button, Popover, Space } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { Link } from "react-router-dom";
+import { Link, useHistory, useLocation } from "react-router-dom";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
@@ -11,6 +11,8 @@ import { TemplateList } from "../../utils/TemplateConstants";
 import DataLabel from "../data-label/data-label.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
+import queryString from "query-string";
+
 const mapDispatchToProps = (dispatch) => ({
   setScheduleContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "schedule" })),
@@ -24,6 +26,8 @@ export function ScheduleEventComponent({
 }) {
   const { t } = useTranslation();
   const [visible, setVisible] = useState(false);
+  const history = useHistory();
+  const searchParams = queryString.parse(useLocation().search);
 
   const blockContent = (
     <div>
@@ -88,6 +92,20 @@ export function ScheduleEventComponent({
             <Button>{t("appointments.actions.viewjob")}</Button>
           </Link>
         ) : null}
+        {event.job ? (
+          <Button
+            onClick={() => {
+              history.push({
+                search: queryString.stringify({
+                  ...searchParams,
+                  selected: event.job.id,
+                }),
+              });
+            }}
+          >
+            {t("appointments.actions.preview")}
+          </Button>
+        ) : null}
         <Button
           onClick={() => {
             const Template = TemplateList("job").appointment_reminder;

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -16,6 +16,7 @@ import {
   Table,
   Tag,
 } from "antd";
+import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -291,23 +292,27 @@ export function JobLinesComponent({
               </Button>
               <Button
                 disabled={jobRO}
-                onClick={() =>
-                  deleteJobLine({
+                onClick={async () => {
+                  await deleteJobLine({
                     variables: { joblineId: record.id },
-                    update(cache) {
-                      cache.modify({
-                        id: cache.identify(job),
-                        fields: {
-                          joblines(existingJobLines, { readField }) {
-                            return existingJobLines.filter(
-                              (jlRef) => record.id !== readField("id", jlRef)
-                            );
-                          },
-                        },
-                      });
-                    },
-                  })
-                }
+                    // update(cache) {
+                    //   cache.modify({
+                    //     id: cache.identify(job),
+                    //     fields: {
+                    //       joblines(existingJobLines, { readField }) {
+                    //         return existingJobLines.filter(
+                    //           (jlRef) => record.id !== readField("id", jlRef)
+                    //         );
+                    //       },
+                    //     },
+                    //   });
+                    // },
+                  });
+                  await axios.post("/job/totalsssu", {
+                    id: job.id,
+                  });
+                  refetch && refetch();
+                }}
               >
                 <DeleteFilled />
               </Button>
@@ -395,7 +400,7 @@ export function JobLinesComponent({
                 setState({
                   ...state,
                   filteredInfo: {
-                    part_type: ["PAN,PAL,PAA,PAP,PAS,PASL"],
+                    part_type: ["PAN,PAC,PAR,PAL,PAA,PAM,PAP,PAS,PASL"],
                   },
                 });
               }}

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx

@@ -12,7 +12,7 @@ import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectJobLineEditModal } from "../../redux/modals/modals.selectors";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import JobLinesUpdsertModal from "./job-lines-upsert-modal.component";
-
+import Axios from "axios";
 const mapStateToProps = createStructuredSelector({
   jobLineEditModal: selectJobLineEditModal,
 });
@@ -29,10 +29,10 @@ function JobLinesUpsertModalContainer({
   const [updateJobLine] = useMutation(UPDATE_JOB_LINE);
   const [loading, setLoading] = useState(false);
 
-  const handleFinish = (values) => {
+  const handleFinish = async (values) => {
     setLoading(true);
     if (!jobLineEditModal.context.id) {
-      insertJobLine({
+      const r = await insertJobLine({
         variables: {
           lineInput: [
             {
@@ -44,42 +44,44 @@ function JobLinesUpsertModalContainer({
             },
           ],
         },
-      })
-        .then((r) => {
-          if (jobLineEditModal.actions.refetch)
-            jobLineEditModal.actions.refetch();
-          //Need to recalcuate totals.
-          toggleModalVisible();
-          notification["success"]({
-            message: t("joblines.successes.created"),
-          });
-        })
-        .catch((error) => {
-          notification["error"]({
-            message: t("joblines.errors.creating", {
-              message: error.message,
-            }),
-          });
+      });
+      if (!r.errors) {
+        await Axios.post("/job/totalsssu", {
+          id: jobLineEditModal.context.jobid,
         });
+        if (jobLineEditModal.actions.refetch)
+          jobLineEditModal.actions.refetch();
+        //Need to recalcuate totals.
+        toggleModalVisible();
+        notification["success"]({
+          message: t("joblines.successes.created"),
+        });
+      } else {
+        notification["error"]({
+          message: t("joblines.errors.creating", {
+            message: JSON.stringify(r.errors.message),
+          }),
+        });
+      }
     } else {
-      updateJobLine({
+      const r = await updateJobLine({
         variables: {
           lineId: jobLineEditModal.context.id,
           line: values,
         },
-      })
-        .then((r) => {
-          notification["success"]({
-            message: t("joblines.successes.updated"),
-          });
-        })
-        .catch((error) => {
-          notification["success"]({
-            message: t("joblines.errors.updating", {
-              message: error.message,
-            }),
-          });
+      });
+      if (!r.errors) {
+        notification["success"]({
+          message: t("joblines.successes.updated"),
         });
+      } else {
+        notification["success"]({
+          message: t("joblines.errors.updating", {
+            message: JSON.stringify(r.errors.message),
+          }),
+        });
+      }
+
       if (jobLineEditModal.actions.submit) {
         jobLineEditModal.actions.submit();
       } else {

client/src/components/job-payments/job-payments.component.jsx

@@ -1,4 +1,5 @@
 import { Button, Card, Space, Table } from "antd";
+import { EditFilled } from "@ant-design/icons";
 import Dinero from "dinero.js";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -115,16 +116,29 @@ export function JobPayments({
       dataIndex: "actions",
       key: "actions",
       render: (text, record) => (
-        <PrintWrapperComponent
-          templateObject={{
-            name: TemplateList("payment").payment_receipt.key,
-            variables: { id: record.id },
-          }}
-          messageObject={{
-            to: job.ownr_ea,
-          }}
-          id={job.id}
-        />
+        <Space wrap>
+          <Button
+            disabled={record.exportedat}
+            onClick={() => {
+              setPaymentContext({
+                actions: { refetch: refetch },
+                context: record,
+              });
+            }}
+          >
+            <EditFilled />
+          </Button>
+          <PrintWrapperComponent
+            templateObject={{
+              name: TemplateList("payment").payment_receipt.key,
+              variables: { id: record.id },
+            }}
+            messageObject={{
+              to: job.ownr_ea,
+            }}
+            id={job.id}
+          />
+        </Space>
       ),
     },
   ];

client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx

@@ -1,4 +1,4 @@
-import { Checkbox, PageHeader, Table } from "antd";
+import { Checkbox, Table, Typography } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -21,6 +21,7 @@ export default function JobReconciliationBillsTable({
       title: t("billlines.fields.line_desc"),
       dataIndex: "line_desc",
       key: "line_desc",
+      width: "35%",
       sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
       sortOrder:
         state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
@@ -29,6 +30,8 @@ export default function JobReconciliationBillsTable({
       title: t("billlines.labels.from"),
       dataIndex: "from",
       key: "from",
+      width: "20%",
+      ellipsis: true,
       render: (text, record) =>
         `${record.bill.vendor && record.bill.vendor.name} / ${
           record.bill.invoice_number
@@ -57,7 +60,7 @@ export default function JobReconciliationBillsTable({
       ),
     },
     {
-      title: t("billlines.fields.quantity"),
+      title: t("joblines.fields.part_qty"),
       dataIndex: "quantity",
       key: "quantity",
       sorter: (a, b) => a.quantity - b.quantity,
@@ -86,10 +89,12 @@ export default function JobReconciliationBillsTable({
   };
 
   return (
-    <PageHeader title={t("bills.labels.bills")}>
+    <div>
+      <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
       <Table
         pagination={false}
-        scroll={{ y: "40vh", x: true }}
+        size="small"
+        scroll={{ y: "80vh", x: true }}
         columns={columns}
         rowKey="id"
         dataSource={invoiceLineData}
@@ -99,6 +104,6 @@ export default function JobReconciliationBillsTable({
           selectedRowKeys: selectedLines,
         }}
       />
-    </PageHeader>
+    </div>
   );
 }

client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx

@@ -22,21 +22,23 @@ export default function JobReconciliationModalComponent({ job, bills }) {
   );
 
   return (
-    <div>
-      <Row gutter={[16, 16]}>
-        <Col span={12}>
-          <JobReconciliationPartsTable
-            jobLineData={jobLineData}
-            jobLineState={jobLineState}
-          />
-        </Col>
-        <Col span={12}>
-          <JobReconciliationBillsTable
-            invoiceLineData={invoiceLineData}
-            billLineState={billLineState}
-          />
-        </Col>
-      </Row>
+    <div style={{ flex: 1, display: "flex", flexDirection: "column" }}>
+      <div style={{ flex: 1 }}>
+        <Row gutter={8}>
+          <Col span={12}>
+            <JobReconciliationPartsTable
+              jobLineData={jobLineData}
+              jobLineState={jobLineState}
+            />
+          </Col>
+          <Col span={12}>
+            <JobReconciliationBillsTable
+              invoiceLineData={invoiceLineData}
+              billLineState={billLineState}
+            />
+          </Col>
+        </Row>
+      </div>
       <Row>
         <JobReconciliationTotals
           jobLines={jobLineData}

client/src/components/job-reconciliation-modal/job-reconciliation-modal.styles.scss

@@ -0,0 +1,12 @@
+.imex-reconciliation-modal {
+  top: 20px;
+  .ant-modal-content {
+    height: 95vh;
+    display: flex;
+    flex-direction: column;
+    .ant-modal-body {
+      display: flex;
+      flex: 1;
+    }
+  }
+}

client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx

@@ -10,6 +10,7 @@ import { selectReconciliation } from "../../redux/modals/modals.selectors";
 import JobReconciliationModalComponent from "./job-reconciliation-modal.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import AlertComponent from "../alert/alert.component";
+import "./job-reconciliation-modal.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
   reconciliationModal: selectReconciliation,
@@ -38,23 +39,23 @@ function JobReconciliationModalContainer({
   return (
     <Modal
       title={t("jobs.labels.reconciliationheader")}
-      width={"90%"}
+      width={"95%"}
       visible={visible}
       okText={t("general.actions.close")}
       onOk={handleCancel}
       onCancel={handleCancel}
       cancelButtonProps={{ display: "none" }}
       destroyOnClose
+      className="imex-reconciliation-modal"
     >
-      <LoadingSpinner loading={loading}>
-        {error && <AlertComponent message={error.message} type="error" />}
-        {data && (
-          <JobReconciliationModalComponent
-            job={data && data.jobs_by_pk}
-            bills={data && data.bills}
-          />
-        )}
-      </LoadingSpinner>
+      {loading && <LoadingSpinner loading={loading} />}
+      {error && <AlertComponent message={error.message} type="error" />}
+      {data && (
+        <JobReconciliationModalComponent
+          job={data && data.jobs_by_pk}
+          bills={data && data.bills}
+        />
+      )}
     </Modal>
   );
 }

client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx

@@ -1,4 +1,4 @@
-import { PageHeader, Table } from "antd";
+import { Table, Typography } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -102,11 +102,13 @@ export default function JobReconcilitionPartsTable({
   };
 
   return (
-    <PageHeader title={t("jobs.labels.lines")}>
+    <div>
+      <Typography.Title level={4}>{t("jobs.labels.lines")}</Typography.Title>
       <Table
         pagination={false}
         columns={columns}
-        scroll={{ y: "40vh", x: true }}
+        size="small"
+        scroll={{ y: "80vh", x: true }}
         rowKey="id"
         dataSource={jobLineData}
         onChange={handleTableChange}
@@ -122,6 +124,6 @@ export default function JobReconcilitionPartsTable({
       <div style={{ fontStyle: "italic", margin: "4px" }}>
         {t("jobs.labels.reconciliation.removedpartsstrikethrough")}
       </div>
-    </PageHeader>
+    </div>
   );
 }

client/src/components/job-search-select/job-search-select.component.jsx

@@ -1,6 +1,6 @@
 import { LoadingOutlined } from "@ant-design/icons";
 import { useLazyQuery } from "@apollo/client";
-import { Empty, Select } from "antd";
+import { Empty, Select, Space, Tag } from "antd";
 import _ from "lodash";
 import React, { forwardRef, useEffect } from "react";
 import { useTranslation } from "react-i18next";
@@ -80,13 +80,20 @@ const JobSearchSelect = (
         {theOptions
           ? theOptions.map((o) => (
               <Option key={o.id} value={o.id} status={o.status}>
-                {`${clm_no ? `${o.clm_no} | ` : ""}${
-                  o.ro_number || t("general.labels.na")
-                } | ${o.ownr_ln || ""} ${o.ownr_fn || ""} ${
-                  o.ownr_co_nm ? ` ${o.ownr_co_num}` : ""
-                }| ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${
-                  o.v_model_desc || ""
-                }`}
+                <Space align="center">
+                  <span>
+                    {`${clm_no && o.clm_no ? `${o.clm_no} | ` : ""}${
+                      o.ro_number || t("general.labels.na")
+                    } | ${o.ownr_ln || ""} ${o.ownr_fn || ""} ${
+                      o.ownr_co_nm ? ` ${o.ownr_co_num}` : ""
+                    }| ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${
+                      o.v_model_desc || ""
+                    }`}
+                  </span>
+                  <Tag>
+                    <strong>{o.status}</strong>
+                  </Tag>
+                </Space>
               </Option>
             ))
           : null}

client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx

@@ -0,0 +1,57 @@
+import { DownCircleFilled } from "@ant-design/icons";
+import { useMutation } from "@apollo/client";
+import { Button, Dropdown, Menu, notification } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminStatus);
+
+export function JobsAdminStatus({ bodyshop, job }) {
+  const { t } = useTranslation();
+
+  const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
+  const updateJobStatus = (status) => {
+    mutationUpdateJobstatus({
+      variables: { jobId: job.id, status: status },
+    })
+      .then((r) => {
+        notification["success"]({ message: t("jobs.successes.save") });
+        // refetch();
+      })
+      .catch((error) => {
+        notification["error"]({ message: t("jobs.errors.saving") });
+      });
+  };
+
+  const statusmenu = (
+    <Menu
+      onClick={(e) => {
+        updateJobStatus(e.key);
+      }}
+    >
+      {bodyshop.md_ro_statuses.statuses.map((item) => (
+        <Menu.Item key={item}>{item}</Menu.Item>
+      ))}
+    </Menu>
+  );
+
+  return (
+    <Dropdown overlay={statusmenu} trigger={["click"]} key="changestatus">
+      <Button shape="round">
+        <span>{job.status}</span>
+
+        <DownCircleFilled />
+      </Button>
+    </Dropdown>
+  );
+}

client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js

@@ -11,6 +11,7 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
     query: GET_ALL_JOBLINES_BY_PK,
     variables: { id: jobId },
   });
+
   const existingLines = _.cloneDeep(existingLinesFromDb);
   const linesToInsert = [];
   const linesToUpdate = [];
@@ -19,11 +20,14 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
     const matchingIndex = existingLines.findIndex(
       (eL) => eL.unq_seq === newLine.unq_seq
     );
+
+    //Should do a check to make sure there is only 1 matching unq sequence number.
+
     if (matchingIndex >= 0) {
       //Found a relevant matching line. Add it to lines to update.
       linesToUpdate.push({
         id: existingLines[matchingIndex].id,
-        newData: newLine,
+        newData: { ...newLine, removed: false },
       });
 
       //Splice out item we found for performance.

client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx

@@ -11,7 +11,8 @@ import FormItemPhone, {
   PhoneItemFormatterValidation,
 } from "../form-items-formatted/phone-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
-import { JobsDetailRatesParts } from "../jobs-detail-rates/jobs-detail-rates.parts.component";
+import JobsDetailRatesParts from "../jobs-detail-rates/jobs-detail-rates.parts.component";
+import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -187,7 +188,7 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
           header={t("menus.jobsdetail.financials")}
         >
           <JobsDetailRatesChangeButton form={form} />
-
+          <JobsMarkPstExempt form={form} />
           <LayoutFormRow>
             <Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
               <CurrencyInput />

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -17,6 +17,7 @@ import {
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import JobsDetaiLheaderCsi from "./jobs-detail-header-actions.csi.component";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
+import JobsDetailHeaderActionsExportcustdataComponent from "./jobs-detail-header-actions.exportcustdata.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -180,7 +181,7 @@ export function JobsDetailHeaderActions({
       {job.inproduction ? (
         <Menu.Item
           key="addtoproduction"
-          disabled={!!!job.converted || jobRO}
+          disabled={!job.converted}
           onClick={() => AddToProduction(client, job.id, refetch, true)}
         >
           {t("jobs.actions.removefromproduction")}
@@ -188,7 +189,7 @@ export function JobsDetailHeaderActions({
       ) : (
         <Menu.Item
           key="addtoproduction"
-          disabled={!!!job.converted || !!job.inproduction || jobRO}
+          disabled={!job.converted}
           onClick={() => AddToProduction(client, job.id, refetch)}
         >
           {t("jobs.actions.addtoproduction")}
@@ -316,6 +317,7 @@ export function JobsDetailHeaderActions({
           {t("menus.jobsactions.admin")}
         </Link>
       </Menu.Item>
+      <JobsDetailHeaderActionsExportcustdataComponent job={job} />
       <JobsDetaiLheaderCsi job={job} />
       <Menu.Item
         key="jobcosting"

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.csi.component.jsx

@@ -19,6 +19,7 @@ import {
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser'
@@ -179,6 +180,8 @@ export function JobsDetailHeaderCsi({
     }
   };
 
+  if (!HasFeatureAccess({ featureName: "csi", bodyshop })) return <></>;
+
   return (
     <Menu.SubMenu
       key="sendcsi"

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.exportcustdata.component.jsx

@@ -0,0 +1,107 @@
+import { Menu, notification } from "antd";
+import axios from "axios";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { auth, logImEXEvent } from "../../firebase/firebase.utils";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({});
+
+export function JobsDetailHeaderActionexportCustomerData({
+  bodyshop,
+  job,
+  ...props
+}) {
+  const { t } = useTranslation();
+
+  const handleExportCustData = async (e) => {
+    logImEXEvent("job_export_cust_data");
+    let QbXmlResponse;
+    try {
+      QbXmlResponse = await axios.post(
+        "/accounting/qbxml/receivables",
+        { jobIds: [job.id], custDataOnly: true },
+        {
+          headers: {
+            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
+          },
+        }
+      );
+      console.log("handle -> XML", QbXmlResponse);
+    } catch (error) {
+      console.log("Error getting QBXML from Server.", error);
+      notification["error"]({
+        message: t("jobs.errors.exporting", {
+          error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
+        }),
+      });
+
+      return;
+    }
+
+    let PartnerResponse;
+    try {
+      PartnerResponse = await axios.post(
+        "http://localhost:1337/qb/",
+        QbXmlResponse.data,
+        {
+          headers: {
+            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
+          },
+        }
+      );
+    } catch (error) {
+      console.log("Error connecting to quickbooks or partner.", error);
+      notification["error"]({
+        message: t("jobs.errors.exporting-partner"),
+      });
+
+      return;
+    }
+    //Check to see if any of them failed. If they didn't don't execute the update.
+    const failedTransactions = PartnerResponse.data.filter((r) => !r.success);
+    if (failedTransactions.length > 0) {
+      //Uh oh. At least one was no good.
+      failedTransactions.forEach((ft) => {
+        //insert failed export log
+        notification.open({
+          // key: "failedexports",
+          type: "error",
+          message: t("jobs.errors.exporting", {
+            error: ft.errorMessage || "",
+          }),
+        });
+      });
+
+      //Handle Failures.
+    } else {
+      //Insert success export log.
+
+      notification.open({
+        type: "success",
+        key: "jobsuccessexport",
+        message: t("jobs.successes.exported"),
+      });
+    }
+  };
+
+  return (
+    <Menu.Item
+      {...props}
+      onClick={handleExportCustData}
+      key="exportcustdata"
+      disabled={!job.converted}
+    >
+      {t("jobs.actions.exportcustdata")}
+    </Menu.Item>
+  );
+}
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsDetailHeaderActionexportCustomerData);

client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx

@@ -1,4 +1,13 @@
-import { Form, Input, InputNumber, Select, Space, Switch, Tooltip } from "antd";
+import {
+  Divider,
+  Form,
+  Input,
+  InputNumber,
+  Select,
+  Space,
+  Switch,
+  Tooltip,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -7,6 +16,7 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
 import CABCpvrtCalculator from "../ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
+import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
 import FormRow from "../layout-form-row/layout-form-row.component";
 import JobsDetailRatesParts from "./jobs-detail-rates.parts.component";
 
@@ -103,8 +113,19 @@ export function JobsDetailRates({ jobRO, form, job }) {
           <Switch disabled={jobRO} />
         </Form.Item>
       </FormRow>
-      <JobsDetailRatesChangeButton form={form} disabled={jobRO} />
-      <FormRow header={t("jobs.forms.laborrates")}>
+      <Divider
+        orientation="left"
+        type="horizontal"
+        style={{ marginTop: ".8rem", float: "right" }}
+      >
+        {t("jobs.forms.laborrates")}
+      </Divider>
+      <Space>
+        <div></div>
+        <JobsDetailRatesChangeButton form={form} disabled={jobRO} />
+        <JobsMarkPstExempt form={form} />
+      </Space>
+      <FormRow noDivider>
         <Form.Item
           label={t("jobs.fields.labor_rate_desc")}
           name="labor_rate_desc"
@@ -180,7 +201,6 @@ export function JobsDetailRates({ jobRO, form, job }) {
           <CurrencyInput disabled={jobRO} />
         </Form.Item>
       </FormRow>
-
       <JobsDetailRatesParts form={form} />
     </div>
   );

client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx

@@ -19,7 +19,11 @@ export function JobsDetailRatesParts({
 
   return (
     <Collapse defaultActiveKey={expanded && "rates"}>
-      <Collapse.Panel header={t("jobs.labels.parts_tax_rates")} key="rates">
+      <Collapse.Panel
+        forceRender
+        header={t("jobs.labels.parts_tax_rates")}
+        key="rates"
+      >
         <LayoutFormRow header={t("joblines.fields.part_types.PAA")}>
           <Form.Item
             label={t("jobs.fields.parts_tax_rates.prt_discp")}

client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx

@@ -50,8 +50,8 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       width: "25%",
       //sortOrder: sortcolumn === "ownr_ln" && sortorder,
       render: (text, record) => {
-        return record.owner ? (
-          <Link to={"/manage/owners/" + record.owner.id}>
+        return record.ownerid ? (
+          <Link to={"/manage/owners/" + record.ownerid}>
             {`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
               record.ownr_co_nm || ""
             }`}

client/src/components/jobs-mark-pst-exempt/jobs-mark-pst-exempt.component.jsx

@@ -0,0 +1,55 @@
+import { Popconfirm, Button } from "antd";
+import React from "react";
+import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import _ from "lodash";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly,
+});
+
+export function JobsMarkPstExempt({ jobRO, form }) {
+  const { t } = useTranslation();
+
+  const handleConfirm = () => {
+    const newPartRates = _.cloneDeep(form.getFieldValue("parts_tax_rates"));
+
+    Object.keys(newPartRates).forEach((key) => {
+      newPartRates[key] = {
+        ...newPartRates[key],
+        prt_tax_in: false,
+        prt_tax_rt: 0,
+      };
+    });
+
+    form.setFieldsValue({
+      state_tax_rate: 0,
+      tax_lbr_rt: 0,
+      tax_levies_rt: 0,
+      tax_sub_rt: 0,
+      tax_shop_mat_rt: 0,
+      tax_paint_mat_rt: 0,
+      tax_str_rt: 0,
+      tax_tow_rt: 0,
+      parts_tax_rates: newPartRates,
+    });
+  };
+
+  return (
+    <Popconfirm
+      onConfirm={handleConfirm}
+      disabled={jobRO}
+      okText={t("general.labels.yes")}
+      cancelText={t("general.labels.no")}
+      title={t("jobs.actions.markpstexemptconfirm")}
+    >
+      <Button type="link" disabled={jobRO}>
+        {t("jobs.actions.markpstexempt")}
+      </Button>
+    </Popconfirm>
+  );
+}
+export default connect(mapStateToProps, null)(JobsMarkPstExempt);

client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx

@@ -31,11 +31,14 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       title: t("jobs.fields.vehicle"),
       dataIndex: "vehicleid",
       key: "vehicleid",
-      render: (text, record) => (
-        <Link to={`/manage/vehicles/${record.vehicleid}`}>
-          {`${record.v_model_yr} ${record.v_make_desc} ${record.v_model_desc}`}
-        </Link>
-      ),
+      render: (text, record) =>
+        record.vehicleid ? (
+          <Link to={`/manage/vehicles/${record.vehicleid}`}>
+            {`${record.v_model_yr} ${record.v_make_desc} ${record.v_model_desc}`}
+          </Link>
+        ) : (
+          t("jobs.errors.novehicle")
+        ),
     },
     {
       title: t("jobs.fields.clm_no"),

client/src/components/parts-order-list-table/parts-order-list-table.component.jsx

@@ -90,7 +90,11 @@ export function PartsOrderListTableComponent({
         </Button>
       )}
       <Button
-        disabled={jobRO || record.return}
+        disabled={
+          jobRO ||
+          record.return ||
+          record.vendor.id === bodyshop.inhousevendorid
+        }
         onClick={() => {
           logImEXEvent("parts_order_receive_bill");
           setPartsReceiveContext({
@@ -139,7 +143,10 @@ export function PartsOrderListTableComponent({
         </Button>
       </Popconfirm>
       <Button
-        disabled={jobRO ? !record.return : jobRO}
+        disabled={
+          (jobRO ? !record.return : jobRO) ||
+          record.vendor.id === bodyshop.inhousevendorid
+        }
         onClick={() => {
           logImEXEvent("parts_order_receive_bill");
 
@@ -157,7 +164,7 @@ export function PartsOrderListTableComponent({
                     quantity: pol.quantity,
 
                     actual_price: pol.act_price,
-                    cost_center: pol.jobline.part_type
+                    cost_center: pol.jobline?.part_type
                       ? responsibilityCenters.defaults.costs[
                           pol.jobline.part_type
                         ] || null

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -101,7 +101,9 @@ export function PartsOrderModalContainer({
 
     const jobLinesResult = await updateJobLines({
       variables: {
-        ids: values.parts_order_lines.data.map((item) => item.job_line_id),
+        ids: values.parts_order_lines.data
+          .filter((item) => item.job_line_id)
+          .map((item) => item.job_line_id),
         status: isReturn
           ? bodyshop.md_order_statuses.default_returned || "Returned*"
           : bodyshop.md_order_statuses.default_ordered || "Ordered*",

client/src/components/payments-list-paginated/payment-list-paginated.component.jsx

@@ -15,6 +15,8 @@ import { TemplateList } from "../../utils/TemplateConstants";
 import CaBcEtfTableModalContainer from "../ca-bc-etf-table-modal/ca-bc-etf-table-modal.container";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
 
+const stripeTestEnv = process.env.REACT_APP_STRIPE_PUBLIC_KEY; //.includes("test");
+
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
@@ -128,6 +130,18 @@ export function PaymentsListPaginated({
       title: t("payments.fields.stripeid"),
       dataIndex: "stripeid",
       key: "stripeid",
+      render: (text, record) =>
+        record.stripeid ? (
+          <a
+            href={
+              stripeTestEnv
+                ? `https://dashboard.stripe.com/${bodyshop.stripe_acct_id}/test/payments/${record.stripeid}`
+                : `https://dashboard.stripe.com/${bodyshop.stripe_acct_id}/payments/${record.stripeid}`
+            }
+          >
+            {record.stripeid}
+          </a>
+        ) : null,
     },
     {
       title: t("payments.fields.created_at"),

client/src/components/print-center-jobs/print-center-jobs.component.jsx

@@ -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.

client/src/components/production-list-table/production-list-print.component.jsx

@@ -0,0 +1,42 @@
+import { Button, Dropdown, Menu } from "antd";
+import React, { useState } from "react";
+import { TemplateList } from "../../utils/TemplateConstants";
+import { useTranslation } from "react-i18next";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+
+const ProdTemplates = TemplateList("production");
+
+export default function ProductionListPrint() {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+  return (
+    <Dropdown
+      trigger="click"
+      overlay={
+        <Menu>
+          {Object.keys(ProdTemplates).map((key) => (
+            <Menu.Item
+              key={key}
+              onClick={async () => {
+                setLoading(true);
+                await GenerateDocument(
+                  {
+                    name: ProdTemplates[key].key,
+                    // variables: { id: contract.id },
+                  },
+                  {},
+                  "p"
+                );
+                setLoading(false);
+              }}
+            >
+              {ProdTemplates[key].title}
+            </Menu.Item>
+          ))}
+        </Menu>
+      }
+    >
+      <Button loading={loading}>{t("general.labels.print")}</Button>
+    </Dropdown>
+  );
+}

client/src/components/production-list-table/production-list-table.component.jsx

@@ -13,6 +13,7 @@ import ProductionListColumnsAdd from "../production-list-columns/production-list
 import ProductionListColumns from "../production-list-columns/production-list-columns.data";
 import ProductionListDetail from "../production-list-detail/production-list-detail.component";
 import ProductionListSaveConfigButton from "../production-list-save-config-button/production-list-save-config-button.component";
+import ProductionListPrint from "./production-list-print.component";
 import ProductionListTableViewSelect from "./production-list-table-view-select.component";
 import ResizeableTitle from "./production-list-table.resizeable.component";
 
@@ -88,14 +89,16 @@ export function ProductionListTable({
     setColumns(columns.filter((i) => i.key !== key));
   };
 
-  const handleResize = (index) => (e, { size }) => {
-    const nextColumns = [...columns];
-    nextColumns[index] = {
-      ...nextColumns[index],
-      width: size.width,
+  const handleResize =
+    (index) =>
+    (e, { size }) => {
+      const nextColumns = [...columns];
+      nextColumns[index] = {
+        ...nextColumns[index],
+        width: size.width,
+      };
+      setColumns(nextColumns);
     };
-    setColumns(nextColumns);
-  };
 
   const headerItem = (col) => (
     <Dropdown
@@ -178,6 +181,7 @@ export function ProductionListTable({
               placeholder={t("general.labels.search")}
               value={searchText}
             />
+            <ProductionListPrint />
           </Space>
         }
       />

client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx

@@ -9,6 +9,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import Event from "../job-at-change/schedule-event.container";
 import HeaderComponent from "./schedule-calendar-header.component";
 import "./schedule-calendar.styles.scss";
+import JobDetailCards from "../job-detail-cards/job-detail-cards.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -45,45 +46,48 @@ export function ScheduleCalendarWrapperComponent({
   const selectedDate = new Date(date || moment(search.date) || Date.now());
 
   return (
-    <Calendar
-      events={data}
-      defaultView={search.view || defaultView || "week"}
-      date={selectedDate}
-      onNavigate={(date, view, action) => {
-        search.date = date.toISOString().substr(0, 10);
-        history.push({ search: queryString.stringify(search) });
-      }}
-      onRangeChange={(start, end) => {
-        if (setDateRangeCallback) setDateRangeCallback({ start, end });
-      }}
-      onView={(view) => {
-        search.view = view;
-        history.push({ search: queryString.stringify(search) });
-      }}
-      step={15}
-      // timeslots={1}
-      showMultiDayTimes
-      localizer={localizer}
-      min={
-        bodyshop.schedule_start_time
-          ? new Date(bodyshop.schedule_start_time)
-          : new Date("2020-01-01T06:00:00")
-      }
-      max={
-        bodyshop.schedule_end_time
-          ? new Date(bodyshop.schedule_end_time)
-          : new Date("2020-01-01T20:00:00")
-      }
-      eventPropGetter={handleEventPropStyles}
-      components={{
-        event: (e) =>
-          Event({ bodyshop: bodyshop, event: e.event, refetch: refetch }),
-        header: (p) => (
-          <HeaderComponent {...p} events={data} refetch={refetch} />
-        ),
-      }}
-      {...otherProps}
-    />
+    <>
+      <JobDetailCards />
+      <Calendar
+        events={data}
+        defaultView={search.view || defaultView || "week"}
+        date={selectedDate}
+        onNavigate={(date, view, action) => {
+          search.date = date.toISOString().substr(0, 10);
+          history.push({ search: queryString.stringify(search) });
+        }}
+        onRangeChange={(start, end) => {
+          if (setDateRangeCallback) setDateRangeCallback({ start, end });
+        }}
+        onView={(view) => {
+          search.view = view;
+          history.push({ search: queryString.stringify(search) });
+        }}
+        step={15}
+        // timeslots={1}
+        showMultiDayTimes
+        localizer={localizer}
+        min={
+          bodyshop.schedule_start_time
+            ? new Date(bodyshop.schedule_start_time)
+            : new Date("2020-01-01T06:00:00")
+        }
+        max={
+          bodyshop.schedule_end_time
+            ? new Date(bodyshop.schedule_end_time)
+            : new Date("2020-01-01T20:00:00")
+        }
+        eventPropGetter={handleEventPropStyles}
+        components={{
+          event: (e) =>
+            Event({ bodyshop: bodyshop, event: e.event, refetch: refetch }),
+          header: (p) => (
+            <HeaderComponent {...p} events={data} refetch={refetch} />
+          ),
+        }}
+        {...otherProps}
+      />
+    </>
   );
 }
 

client/src/components/schedule-calendar/schedule-calendar.component.jsx

@@ -9,6 +9,7 @@ export default function ScheduleCalendarComponent({ data, refetch }) {
   return (
     <Row gutter={[16, 16]}>
       <ScheduleModal />
+
       <Col span={24}>
         <PageHeader
           extra={

client/src/components/schedule-job-modal/schedule-job-modal.component.jsx

@@ -12,7 +12,7 @@ import EmailInput from "../form-items-formatted/email-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import ScheduleDayViewContainer from "../schedule-day-view/schedule-day-view.container";
 import ScheduleExistingAppointmentsList from "../schedule-existing-appointments-list/schedule-existing-appointments-list.component";
-
+import "./schedule-job-modal.scss";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -170,7 +170,7 @@ export function ScheduleJobModalComponent({
             const values = form.getFieldsValue();
 
             return (
-              <div style={{ height: "70vh" }}>
+              <div className="schedule-job-modal">
                 <ScheduleDayViewContainer day={values.start} />
               </div>
             );

client/src/components/schedule-job-modal/schedule-job-modal.scss

@@ -0,0 +1,10 @@
+.schedule-job-modal {
+  height: 70vh;
+  .rbc-calendar {
+    .rbc-toolbar {
+      .rbc-btn-group {
+        display: none;
+      }
+    }
+  }
+}

client/src/components/shop-info/shop-info.general.component.jsx

@@ -436,6 +436,14 @@ export default function ShopInfoGeneral({ form }) {
         >
           <CurrencyInput />
         </Form.Item>
+
+        <Form.Item
+          name={["attach_pdf_to_email"]}
+          label={t("bodyshop.fields.attach_pdf_to_email")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow grow header={t("bodyshop.labels.messagingpresets")}>
         <Form.List name={["md_messaging_presets"]}>

client/src/graphql/bodyshop.queries.js

@@ -89,6 +89,9 @@ export const QUERY_BODYSHOP = gql`
       website
       jc_hourly_rates
       md_jobline_presets
+      cdk_dealerid
+      features
+      attach_pdf_to_email
       employees {
         id
         active
@@ -175,6 +178,8 @@ export const UPDATE_SHOP = gql`
         website
         jc_hourly_rates
         md_jobline_presets
+        cdk_dealerid
+        attach_pdf_to_email
         employees {
           id
           first_name

client/src/graphql/jobs-lines.queries.js

@@ -23,19 +23,6 @@ export const GET_ALL_JOBLINES_BY_PK = gql`
       notes
       location
       tax_part
-      parts_order_lines {
-        id
-        parts_order {
-          id
-          order_number
-          order_date
-          user_email
-          vendor {
-            id
-            name
-          }
-        }
-      }
     }
   }
 `;
@@ -228,7 +215,11 @@ export const generateJobLinesUpdatesForInvoicing = (joblines) => {
 
 export const DELETE_JOB_LINE_BY_PK = gql`
   mutation DELETE_JOB_LINE_BY_PK($joblineId: uuid!) {
-    delete_joblines_by_pk(id: $joblineId) {
+    update_joblines_by_pk(
+      pk_columns: { id: $joblineId }
+      _set: { removed: true }
+    ) {
+      removed
       id
     }
   }

client/src/graphql/jobs.queries.js

@@ -559,6 +559,7 @@ export const GET_JOB_BY_PK = gql`
       }
       payments {
         id
+        jobid
         amount
         payer
         created_at
@@ -566,6 +567,8 @@ export const GET_JOB_BY_PK = gql`
         transactionid
         memo
         date
+        type
+        exportedat
       }
       cccontracts {
         id
@@ -686,6 +689,8 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       v_make_desc
       v_model_desc
       v_color
+      v_vin
+      plate_st
       plate_no
       vehicle {
         id
@@ -1040,6 +1045,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
       v_make_desc
       v_model_desc
       v_model_yr
+      status
     }
   }
 `;
@@ -1611,6 +1617,7 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
     ) {
       ownr_fn
       ownr_ln
+      ownerid
       ownr_ph1
       ownr_ea
       plate_no

client/src/graphql/search.queries.js

@@ -36,6 +36,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
     search_payments(args: { search: $search }) {
       id
       amount
+      paymentnum
       job {
         ro_number
         id

client/src/index.js

@@ -1,10 +1,7 @@
-import { AlertOutlined } from "@ant-design/icons";
 import * as Sentry from "@sentry/react";
-import { Button, notification, Space } from "antd";
 //import "antd/dist/antd.css";
 import "antd/dist/antd.less";
 import Dinero from "dinero.js";
-import i18n from "i18next";
 import React from "react";
 import ReactDOM from "react-dom";
 import { Provider } from "react-redux";
@@ -15,7 +12,6 @@ import LoadingSpinner from "./components/loading-spinner/loading-spinner.compone
 import "./index.css";
 import { persistor, store } from "./redux/store";
 import reportWebVitals from "./reportWebVitals";
-import * as serviceWorkerRegistration from "./serviceWorkerRegistration";
 import "./translations/i18n";
 import "./utils/CleanAxios";
 require("dotenv").config();
@@ -52,44 +48,44 @@ ReactDOM.render(
   document.getElementById("root")
 );
 
-const onServiceWorkerUpdate = (registration) => {
-  console.log("onServiceWorkerUpdate", registration);
+// const onServiceWorkerUpdate = (registration) => {
+//   console.log("onServiceWorkerUpdate", registration);
 
-  const btn = (
-    <Space flex>
-      <Button
-        onClick={async () => {
-          window.open("https://imex-online.noticeable.news/", "_blank");
-        }}
-      >
-        {i18n.t("general.actions.viewreleasenotes")}
-      </Button>
-      <Button
-        type="primary"
-        onClick={async () => {
-          if (registration && registration.waiting) {
-            await registration.unregister();
-            // Makes Workbox call skipWaiting()
-            registration.waiting.postMessage({ type: "SKIP_WAITING" });
-            // Once the service worker is unregistered, we can reload the page to let
-            // the browser download a fresh copy of our app (invalidating the cache)
-            window.location.reload();
-          }
-        }}
-      >
-        {i18n.t("general.actions.refresh")}
-      </Button>
-    </Space>
-  );
-  notification.open({
-    icon: <AlertOutlined />,
-    message: i18n.t("general.messages.newversiontitle"),
-    description: i18n.t("general.messages.newversionmessage"),
-    duration: 0,
-    btn,
-    key: "updateavailable",
-  });
-};
+//   const btn = (
+//     <Space flex>
+//       <Button
+//         onClick={async () => {
+//           window.open("https://imex-online.noticeable.news/", "_blank");
+//         }}
+//       >
+//         {i18n.t("general.actions.viewreleasenotes")}
+//       </Button>
+//       <Button
+//         type="primary"
+//         onClick={async () => {
+//           if (registration && registration.waiting) {
+//             await registration.unregister();
+//             // Makes Workbox call skipWaiting()
+//             registration.waiting.postMessage({ type: "SKIP_WAITING" });
+//             // Once the service worker is unregistered, we can reload the page to let
+//             // the browser download a fresh copy of our app (invalidating the cache)
+//             window.location.reload();
+//           }
+//         }}
+//       >
+//         {i18n.t("general.actions.refresh")}
+//       </Button>
+//     </Space>
+//   );
+//   notification.open({
+//     icon: <AlertOutlined />,
+//     message: i18n.t("general.messages.newversiontitle"),
+//     description: i18n.t("general.messages.newversionmessage"),
+//     duration: 0,
+//     btn,
+//     key: "updateavailable",
+//   });
+// };
 
-serviceWorkerRegistration.register({ onUpdate: onServiceWorkerUpdate });
+// serviceWorkerRegistration.register({ onUpdate: onServiceWorkerUpdate });
 reportWebVitals();

client/src/landing/Banner0.jsx

@@ -0,0 +1,53 @@
+import React from 'react';
+import { Button } from 'antd';
+import { DownOutlined } from '@ant-design/icons';
+import QueueAnim from 'rc-queue-anim';
+import TweenOne from 'rc-tween-one';
+import { isImg } from './utils';
+
+class Banner extends React.PureComponent {
+  render() {
+    const { ...currentProps } = this.props;
+    const { dataSource } = currentProps;
+    delete currentProps.dataSource;
+    delete currentProps.isMobile;
+    return (
+      <div {...currentProps} {...dataSource.wrapper}>
+        <QueueAnim
+          key="QueueAnim"
+          type={['bottom', 'top']}
+          delay={200}
+          {...dataSource.textWrapper}
+        >
+          <div key="title" {...dataSource.title}>
+            {typeof dataSource.title.children === 'string' &&
+            dataSource.title.children.match(isImg) ? (
+              <img src={dataSource.title.children} width="100%" alt="img" />
+            ) : (
+              dataSource.title.children
+            )}
+          </div>
+          <div key="content" {...dataSource.content}>
+            {dataSource.content.children}
+          </div>
+          <Button ghost key="button" {...dataSource.button}>
+            {dataSource.button.children}
+          </Button>
+        </QueueAnim>
+        <TweenOne
+          animation={{
+            y: '-=20',
+            yoyo: true,
+            repeat: -1,
+            duration: 1000,
+          }}
+          className="banner0-icon"
+          key="icon"
+        >
+          <DownOutlined />
+        </TweenOne>
+      </div>
+    );
+  }
+}
+export default Banner;

client/src/landing/Content0.jsx

@@ -0,0 +1,49 @@
+import React from 'react';
+import QueueAnim from 'rc-queue-anim';
+import { Row, Col } from 'antd';
+import OverPack from 'rc-scroll-anim/lib/ScrollOverPack';
+import { getChildrenToRender } from './utils';
+
+class Content extends React.PureComponent {
+  render() {
+    const { dataSource, isMobile, ...props } = this.props;
+    const {
+      wrapper,
+      titleWrapper,
+      page,
+      OverPack: overPackData,
+      childWrapper,
+    } = dataSource;
+    return (
+      <div {...props} {...wrapper}>
+        <div {...page}>
+          <div {...titleWrapper}>
+            {titleWrapper.children.map(getChildrenToRender)}
+          </div>
+          <OverPack {...overPackData}>
+            <QueueAnim
+              type="bottom"
+              key="block"
+              leaveReverse
+              component={Row}
+              componentProps={childWrapper}
+            >
+              {childWrapper.children.map((block, i) => {
+                const { children: item, ...blockProps } = block;
+                return (
+                  <Col key={i.toString()} {...blockProps}>
+                    <div {...item}>
+                      {item.children.map(getChildrenToRender)}
+                    </div>
+                  </Col>
+                );
+              })}
+            </QueueAnim>
+          </OverPack>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default Content;

client/src/landing/Content1.jsx

@@ -0,0 +1,70 @@
+import React from 'react';
+import QueueAnim from 'rc-queue-anim';
+import TweenOne from 'rc-tween-one';
+import { Row, Col } from 'antd';
+import OverPack from 'rc-scroll-anim/lib/ScrollOverPack';
+
+function Content1(props) {
+  const { ...tagProps } = props;
+  const { dataSource, isMobile } = tagProps;
+  delete tagProps.dataSource;
+  delete tagProps.isMobile;
+  const animType = {
+    queue: isMobile ? 'bottom' : 'right',
+    one: isMobile
+      ? {
+          scaleY: '+=0.3',
+          opacity: 0,
+          type: 'from',
+          ease: 'easeOutQuad',
+        }
+      : {
+          x: '-=30',
+          opacity: 0,
+          type: 'from',
+          ease: 'easeOutQuad',
+        },
+  };
+  return (
+    <div {...tagProps} {...dataSource.wrapper}>
+      <OverPack {...dataSource.OverPack} component={Row}>
+        <TweenOne
+          key="img"
+          animation={animType.one}
+          resetStyle
+          {...dataSource.imgWrapper}
+          component={Col}
+          componentProps={{
+            md: dataSource.imgWrapper.md,
+            xs: dataSource.imgWrapper.xs,
+          }}
+        >
+          <span {...dataSource.img}>
+            <img src={dataSource.img.children} width="100%" alt="img" />
+          </span>
+        </TweenOne>
+        <QueueAnim
+          key="text"
+          type={animType.queue}
+          leaveReverse
+          ease={['easeOutQuad', 'easeInQuad']}
+          {...dataSource.textWrapper}
+          component={Col}
+          componentProps={{
+            md: dataSource.textWrapper.md,
+            xs: dataSource.textWrapper.xs,
+          }}
+        >
+          <h2 key="h1" {...dataSource.title}>
+            {dataSource.title.children}
+          </h2>
+          <div key="p" {...dataSource.content}>
+            {dataSource.content.children}
+          </div>
+        </QueueAnim>
+      </OverPack>
+    </div>
+  );
+}
+
+export default Content1;

client/src/landing/Content12.jsx

@@ -0,0 +1,60 @@
+import React from 'react';
+import { Row, Col } from 'antd';
+import { TweenOneGroup } from 'rc-tween-one';
+import OverPack from 'rc-scroll-anim/lib/ScrollOverPack';
+import { getChildrenToRender } from './utils';
+
+class Content12 extends React.PureComponent {
+  getChildrenToRender = (data) =>
+    data.map((item) => {
+      return (
+        <Col key={item.name} {...item}>
+          <div {...item.children.wrapper}>
+            <span {...item.children.img}>
+              <img src={item.children.img.children} alt="img" />
+            </span>
+          </div>
+        </Col>
+      );
+    });
+
+  render() {
+    const { ...props } = this.props;
+    const { dataSource } = props;
+    delete props.dataSource;
+    delete props.isMobile;
+    const childrenToRender = this.getChildrenToRender(
+      dataSource.block.children
+    );
+    return (
+      <div {...props} {...dataSource.wrapper}>
+        <div {...dataSource.page}>
+          <div key="title" {...dataSource.titleWrapper}>
+            {dataSource.titleWrapper.children.map(getChildrenToRender)}
+          </div>
+          <OverPack
+            className={`content-template ${props.className}`}
+            {...dataSource.OverPack}
+          >
+            <TweenOneGroup
+              component={Row}
+              key="ul"
+              enter={{
+                y: '+=30',
+                opacity: 0,
+                type: 'from',
+                ease: 'easeOutQuad',
+              }}
+              leave={{ y: '+=30', opacity: 0, ease: 'easeOutQuad' }}
+              {...dataSource.block}
+            >
+              {childrenToRender}
+            </TweenOneGroup>
+          </OverPack>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default Content12;

client/src/landing/Content3.jsx

@@ -0,0 +1,94 @@
+import React from 'react';
+import QueueAnim from 'rc-queue-anim';
+import TweenOne from 'rc-tween-one';
+import { Row, Col } from 'antd';
+import OverPack from 'rc-scroll-anim/lib/ScrollOverPack';
+import { getChildrenToRender } from './utils';
+
+class Content3 extends React.PureComponent {
+  getDelay = (e, b) => (e % b) * 100 + Math.floor(e / b) * 100 + b * 100;
+
+  render() {
+    const { ...props } = this.props;
+    const { dataSource, isMobile } = props;
+    delete props.dataSource;
+    delete props.isMobile;
+    let clearFloatNum = 0;
+    const children = dataSource.block.children.map((item, i) => {
+      const childObj = item.children;
+      const delay = isMobile ? i * 50 : this.getDelay(i, 24 / item.md);
+      const liAnim = {
+        opacity: 0,
+        type: 'from',
+        ease: 'easeOutQuad',
+        delay,
+      };
+      const childrenAnim = { ...liAnim, x: '+=10', delay: delay + 100 };
+      clearFloatNum += item.md;
+      clearFloatNum = clearFloatNum > 24 ? 0 : clearFloatNum;
+      return (
+        <TweenOne
+          component={Col}
+          animation={liAnim}
+          key={item.name}
+          {...item}
+          componentProps={{ md: item.md, xs: item.xs }}
+          className={
+            !clearFloatNum
+              ? `${item.className || ''} clear-both`.trim()
+              : item.className
+          }
+        >
+          <TweenOne
+            animation={{
+              x: '-=10',
+              opacity: 0,
+              type: 'from',
+              ease: 'easeOutQuad',
+            }}
+            key="img"
+            {...childObj.icon}
+          >
+            <img src={childObj.icon.children} width="100%" alt="img" />
+          </TweenOne>
+          <div {...childObj.textWrapper}>
+            <TweenOne
+              key="h2"
+              animation={childrenAnim}
+              component="h2"
+              {...childObj.title}
+            >
+              {childObj.title.children}
+            </TweenOne>
+            <TweenOne
+              key="p"
+              animation={{ ...childrenAnim, delay: delay + 200 }}
+              component="div"
+              {...childObj.content}
+            >
+              {childObj.content.children}
+            </TweenOne>
+          </div>
+        </TweenOne>
+      );
+    });
+    return (
+      <div {...props} {...dataSource.wrapper}>
+        <div {...dataSource.page}>
+          <div {...dataSource.titleWrapper}>
+            {dataSource.titleWrapper.children.map(getChildrenToRender)}
+          </div>
+          <OverPack {...dataSource.OverPack}>
+            <QueueAnim key="u" type="bottom">
+              <Row key="row" {...dataSource.block}>
+                {children}
+              </Row>
+            </QueueAnim>
+          </OverPack>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default Content3;

client/src/landing/Content4.jsx

@@ -0,0 +1,59 @@
+import React from 'react';
+import TweenOne from 'rc-tween-one';
+import OverPack from 'rc-scroll-anim/lib/ScrollOverPack';
+import VideoPlay from 'react-sublime-video';
+import { getChildrenToRender } from './utils';
+
+function Content4(props) {
+  const { ...tagProps } = props;
+  const { dataSource, isMobile } = tagProps;
+  delete tagProps.dataSource;
+  delete tagProps.isMobile;
+  const animation = {
+    y: '+=30',
+    opacity: 0,
+    type: 'from',
+    ease: 'easeOutQuad',
+  };
+  const videoChildren = dataSource.video.children.video;
+  const videoNameArray = videoChildren.split('.');
+  const type = videoNameArray[videoNameArray.length - 1];
+  return (
+    <div {...tagProps} {...dataSource.wrapper}>
+      <div {...dataSource.page}>
+        <div key="title" {...dataSource.titleWrapper}>
+          {dataSource.titleWrapper.children.map(getChildrenToRender)}
+        </div>
+        <OverPack {...dataSource.OverPack}>
+          <TweenOne
+            key="video"
+            animation={{ ...animation, delay: 300 }}
+            {...dataSource.video}
+          >
+            {isMobile ? (
+              <video
+                width="100%"
+                loop
+                controls
+                poster={dataSource.video.children.image}
+              >
+                <source src={videoChildren} type={`video/${type}`} />
+                <track kind="captions" />
+              </video>
+            ) : (
+              <VideoPlay
+                loop
+                width="100%"
+                poster={dataSource.video.children.image}
+              >
+                <source src={videoChildren} type={`video/${type}`} />
+              </VideoPlay>
+            )}
+          </TweenOne>
+        </OverPack>
+      </div>
+    </div>
+  );
+}
+
+export default Content4;

client/src/landing/Footer1.jsx

@@ -0,0 +1,69 @@
+import React from 'react';
+import TweenOne from 'rc-tween-one';
+import OverPack from 'rc-scroll-anim/lib/ScrollOverPack';
+import QueueAnim from 'rc-queue-anim';
+import { Row, Col } from 'antd';
+import { getChildrenToRender } from './utils';
+import { isImg } from './utils';
+
+class Footer extends React.Component {
+  static defaultProps = {
+    className: 'footer1',
+  };
+
+  getLiChildren = (data) =>
+    data.map((item, i) => {
+      const { title, childWrapper, ...itemProps } = item;
+      return (
+        <Col key={i.toString()} {...itemProps} title={null} content={null}>
+          <h2 {...title}>
+            {typeof title.children === 'string' &&
+            title.children.match(isImg) ? (
+              <img src={title.children} width="100%" alt="img" />
+            ) : (
+              title.children
+            )}
+          </h2>
+          <div {...childWrapper}>
+            {childWrapper.children.map(getChildrenToRender)}
+          </div>
+        </Col>
+      );
+    });
+
+  render() {
+    const { ...props } = this.props;
+    const { dataSource } = props;
+    delete props.dataSource;
+    delete props.isMobile;
+    const childrenToRender = this.getLiChildren(dataSource.block.children);
+    return (
+      <div {...props} {...dataSource.wrapper}>
+        <OverPack {...dataSource.OverPack}>
+          <QueueAnim
+            type="bottom"
+            key="ul"
+            leaveReverse
+            component={Row}
+            {...dataSource.block}
+          >
+            {childrenToRender}
+          </QueueAnim>
+          <TweenOne
+            animation={{ y: '+=30', opacity: 0, type: 'from' }}
+            key="copyright"
+            {...dataSource.copyrightWrapper}
+          >
+            <div {...dataSource.copyrightPage}>
+              <div {...dataSource.copyright}>
+                {dataSource.copyright.children}
+              </div>
+            </div>
+          </TweenOne>
+        </OverPack>
+      </div>
+    );
+  }
+}
+
+export default Footer;

client/src/landing/Nav0.jsx

@@ -0,0 +1,135 @@
+import React from 'react';
+import TweenOne from 'rc-tween-one';
+import { Menu } from 'antd';
+import { getChildrenToRender } from './utils';
+
+const { Item, SubMenu } = Menu;
+
+class Header extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      phoneOpen: undefined,
+    };
+  }
+
+  phoneClick = () => {
+    const phoneOpen = !this.state.phoneOpen;
+    this.setState({
+      phoneOpen,
+    });
+  };
+
+  render() {
+    const { dataSource, isMobile, ...props } = this.props;
+    const { phoneOpen } = this.state;
+    const navData = dataSource.Menu.children;
+    const navChildren = navData.map((item) => {
+      const { children: a, subItem, ...itemProps } = item;
+      if (subItem) {
+        return (
+          <SubMenu
+            key={item.name}
+            {...itemProps}
+            title={
+              <div
+                {...a}
+                className={`header0-item-block ${a.className}`.trim()}
+              >
+                {a.children.map(getChildrenToRender)}
+              </div>
+            }
+            popupClassName="header0-item-child"
+          >
+            {subItem.map(($item, ii) => {
+              const { children: childItem } = $item;
+              const child = childItem.href ? (
+                <a {...childItem}>
+                  {childItem.children.map(getChildrenToRender)}
+                </a>
+              ) : (
+                <div {...childItem}>
+                  {childItem.children.map(getChildrenToRender)}
+                </div>
+              );
+              return (
+                <Item key={$item.name || ii.toString()} {...$item}>
+                  {child}
+                </Item>
+              );
+            })}
+          </SubMenu>
+        );
+      }
+      return (
+        <Item key={item.name} {...itemProps}>
+          <a {...a} className={`header0-item-block ${a.className}`.trim()}>
+            {a.children.map(getChildrenToRender)}
+          </a>
+        </Item>
+      );
+    });
+    const moment = phoneOpen === undefined ? 300 : null;
+    return (
+      <TweenOne
+        component="header"
+        animation={{ opacity: 0, type: 'from' }}
+        {...dataSource.wrapper}
+        {...props}
+      >
+        <div
+          {...dataSource.page}
+          className={`${dataSource.page.className}${phoneOpen ? ' open' : ''}`}
+        >
+          <TweenOne
+            animation={{ x: -30, type: 'from', ease: 'easeOutQuad' }}
+            {...dataSource.logo}
+          >
+            <img width="100%" src={dataSource.logo.children} alt="img" />
+          </TweenOne>
+          {isMobile && (
+            <div
+              {...dataSource.mobileMenu}
+              onClick={() => {
+                this.phoneClick();
+              }}
+            >
+              <em />
+              <em />
+              <em />
+            </div>
+          )}
+          <TweenOne
+            {...dataSource.Menu}
+            animation={
+              isMobile
+                ? {
+                    height: 0,
+                    duration: 300,
+                    onComplete: (e) => {
+                      if (this.state.phoneOpen) {
+                        e.target.style.height = 'auto';
+                      }
+                    },
+                    ease: 'easeInOutQuad',
+                  }
+                : null
+            }
+            moment={moment}
+            reverse={!!phoneOpen}
+          >
+            <Menu
+              mode={isMobile ? 'inline' : 'horizontal'}
+              defaultSelectedKeys={['sub0']}
+              theme="dark"
+            >
+              {navChildren}
+            </Menu>
+          </TweenOne>
+        </div>
+      </TweenOne>
+    );
+  }
+}
+
+export default Header;

client/src/landing/Pricing1.jsx

@@ -0,0 +1,73 @@
+import React from 'react';
+import OverPack from 'rc-scroll-anim/lib/ScrollOverPack';
+import QueueAnim from 'rc-queue-anim';
+import { Row, Col, Button } from 'antd';
+import { getChildrenToRender } from './utils';
+
+class Pricing1 extends React.PureComponent {
+  getChildrenToRender = (item) => {
+    const {
+      wrapper,
+      topWrapper,
+      name,
+      buttonWrapper,
+      line,
+      content,
+      money,
+    } = item.children;
+    return (
+      <Col key={item.name} {...item}>
+        <QueueAnim type="bottom" {...wrapper}>
+          <div {...topWrapper}>
+            <div {...name} key="name">
+              {name.children}
+            </div>
+            <h1 {...money} key="money">
+              {money.children}
+            </h1>
+          </div>
+          <div {...content} key="content">
+            {content.children}
+          </div>
+          <i {...line} key="line" />
+          <div {...buttonWrapper} key="button">
+            <Button {...buttonWrapper.children.a}>
+              {buttonWrapper.children.a.children}
+            </Button>
+          </div>
+        </QueueAnim>
+      </Col>
+    );
+  };
+
+  render() {
+    const { ...props } = this.props;
+    const { dataSource } = props;
+    delete props.dataSource;
+    delete props.isMobile;
+    const { block } = dataSource;
+    const childrenToRender = block.children.map(this.getChildrenToRender);
+    return (
+      <div {...props} {...dataSource.wrapper}>
+        <div {...dataSource.page}>
+          <div key="title" {...dataSource.titleWrapper}>
+            {dataSource.titleWrapper.children.map(getChildrenToRender)}
+          </div>
+          <OverPack {...dataSource.OverPack}>
+            <QueueAnim
+              type="bottom"
+              component={Row}
+              leaveReverse
+              ease={['easeOutQuad', 'easeInOutQuad']}
+              key="content"
+            >
+              {childrenToRender}
+            </QueueAnim>
+          </OverPack>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default Pricing1;

client/src/landing/Pricing2.jsx

@@ -0,0 +1,114 @@
+import React from 'react';
+import OverPack from 'rc-scroll-anim/lib/ScrollOverPack';
+import QueueAnim from 'rc-queue-anim';
+import { Table } from 'antd';
+import { getChildrenToRender, isImg } from './utils';
+
+class Pricing2 extends React.PureComponent {
+  getColumns = (columns) => {
+    return columns.map((item) => {
+      const { childWrapper, ...$item } = item;
+      return {
+        align: 'center',
+        ...$item,
+        title: (
+          <div {...childWrapper}>
+            {childWrapper.children.map(getChildrenToRender)}
+          </div>
+        ),
+      };
+    });
+  };
+
+  getDataSource = (dataSource, columns) =>
+    dataSource.map((item, i) => {
+      const obj = { key: i.toString() };
+      item.children.forEach(($item, ii) => {
+        if (columns[ii]) {
+          obj[columns[ii].key] = (
+            <div {...$item}>
+              {typeof $item.children === 'string' &&
+              $item.children.match(isImg) ? (
+                <img src={$item.children} alt="img" />
+              ) : (
+                $item.children
+              )}
+            </div>
+          );
+        }
+      });
+      return obj;
+    });
+
+  getMobileChild = (table) => {
+    const { columns, dataSource, ...tableProps } = table;
+    const names = columns.children.filter(
+      (item) => item.key.indexOf('name') >= 0
+    );
+    const newColumns = columns.children.filter(
+      (item) => item.key.indexOf('name') === -1
+    );
+    return newColumns.map((item, i) => {
+      const items = [].concat(names[0], item).filter((c) => c);
+      if (items.length > 1) {
+        items[0].colSpan = 0;
+        items[1].colSpan = 2;
+      }
+      const dataSources = dataSource.children.map(($item) => {
+        const child = $item.children.filter(
+          (c) => c.name.indexOf('name') === -1
+        );
+        const n = $item.children.filter((c) => c.name.indexOf('name') >= 0);
+        return {
+          ...$item,
+          children: [].concat(n[0], child[i]).filter((c) => c),
+        };
+      });
+      const props = {
+        ...tableProps,
+        columns: this.getColumns(items),
+        dataSource: this.getDataSource(dataSources, items),
+      };
+      return (
+        <Table key={i.toString()} {...props} pagination={false} bordered />
+      );
+    });
+  };
+
+  render() {
+    const { dataSource, isMobile, ...props } = this.props;
+    const { Table: table, wrapper, page, titleWrapper } = dataSource;
+    const { columns, dataSource: tableData, ...$table } = table;
+    const tableProps = {
+      ...$table,
+      columns: this.getColumns(columns.children),
+      dataSource: this.getDataSource(tableData.children, columns.children),
+    };
+    const childrenToRender = isMobile ? (
+      this.getMobileChild(table)
+    ) : (
+      <Table key="table" {...tableProps} pagination={false} bordered />
+    );
+    return (
+      <div {...props} {...wrapper}>
+        <div {...page}>
+          <div key="title" {...titleWrapper}>
+            {titleWrapper.children.map(getChildrenToRender)}
+          </div>
+          <OverPack {...dataSource.OverPack}>
+            <QueueAnim
+              type="bottom"
+              leaveReverse
+              ease={['easeOutQuad', 'easeInOutQuad']}
+              key="content"
+            >
+              {childrenToRender}
+            </QueueAnim>
+          </OverPack>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default Pricing2;

client/src/landing/documentation.md

@@ -0,0 +1,4 @@
+# 如何使用：
+
+- umi 里如何使用[请查看](https://landing.ant.design/docs/use/umi)。
+- 其它脚手架使用[请查看](https://landing.ant.design/docs/use/getting-started)。

client/src/landing/index.jsx

@@ -0,0 +1,150 @@
+/* eslint no-undef: 0 */
+/* eslint arrow-parens: 0 */
+import { enquireScreen } from "enquire-js";
+import React from "react";
+import Banner0 from "./Banner0";
+// import Content4 from "./Content4";
+import Content0 from "./Content0";
+import Content1 from "./Content1";
+import {
+  Banner00DataSource,
+  // Content40DataSource,
+  Content00DataSource,
+  Content10DataSource,
+  // Pricing11DataSource,
+  // Content30DataSource,
+  // Content120DataSource,
+  Footer10DataSource,
+  Nav00DataSource,
+  Pricing20DataSource,
+} from "./data.source";
+// import Pricing1 from "./Pricing1";
+// import Content3 from "./Content3";
+// import Content12 from "./Content12";
+import Footer1 from "./Footer1";
+import "./less/antMotionStyle.less";
+import Nav0 from "./Nav0";
+import Pricing2 from "./Pricing2";
+
+let isMobile;
+enquireScreen((b) => {
+  isMobile = b;
+});
+
+const { location = {} } = typeof window !== "undefined" ? window : {};
+
+export default class Home extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      isMobile,
+      show: !location.port, // 如果不是 dva 2.0 请删除
+    };
+  }
+
+  componentDidMount() {
+    // 适配手机屏幕;
+    enquireScreen((b) => {
+      this.setState({ isMobile: !!b });
+    });
+    // dva 2.0 样式在组件渲染之后动态加载，导致滚动组件不生效；线上不影响；
+    /* 如果不是 dva 2.0 请删除 start */
+    if (location.port) {
+      // 样式 build 时间在 200-300ms 之间;
+      setTimeout(() => {
+        this.setState({
+          show: true,
+        });
+      }, 500);
+    }
+    /* 如果不是 dva 2.0 请删除 end */
+    console.log("Setting $crisp segments", ["lead"]);
+    window.$crisp.push(["set", "session:segments", [["lead"]]]);
+    window.$crisp.push([
+      "set",
+      "session:event",
+      [[["landing-page", {}, "green"]]],
+    ]);
+  }
+
+  render() {
+    const children = [
+      <Nav0
+        id="Nav0_0"
+        key="Nav0_0"
+        dataSource={Nav00DataSource}
+        isMobile={this.state.isMobile}
+      />,
+      <Banner0
+        id="Banner0_0"
+        key="Banner0_0"
+        dataSource={Banner00DataSource}
+        isMobile={this.state.isMobile}
+      />,
+      ...(process.env.NODE_ENV !== "production"
+        ? [
+            // <Content4
+            //   id="Content4_0"
+            //   key="Content4_0"
+            //   dataSource={Content40DataSource}
+            //   isMobile={this.state.isMobile}
+            // />,
+            <Content1
+              id="Content1_0"
+              key="Content1_0"
+              dataSource={Content10DataSource}
+              isMobile={this.state.isMobile}
+            />,
+            <Content0
+              id="Content0_0"
+              key="Content0_0"
+              dataSource={Content00DataSource}
+              isMobile={this.state.isMobile}
+            />,
+            <Pricing2
+              id="Pricing2_0"
+              key="Pricing2_0"
+              dataSource={Pricing20DataSource}
+              isMobile={this.state.isMobile}
+            />,
+            // <Pricing1
+            //   id="Pricing1_1"
+            //   key="Pricing1_1"
+            //   dataSource={Pricing11DataSource}
+            //   isMobile={this.state.isMobile}
+            // />,
+            // <Content3
+            //   id="Content3_0"
+            //   key="Content3_0"
+            //   dataSource={Content30DataSource}
+            //   isMobile={this.state.isMobile}
+            // />,
+            // <Content12
+            //   id="Content12_0"
+            //   key="Content12_0"
+            //   dataSource={Content120DataSource}
+            //   isMobile={this.state.isMobile}
+            // />,
+          ]
+        : []),
+      <Footer1
+        id="Footer1_0"
+        key="Footer1_0"
+        dataSource={Footer10DataSource}
+        isMobile={this.state.isMobile}
+      />,
+    ];
+    return (
+      <div
+        className="templates-wrapper"
+        ref={(d) => {
+          this.dom = d;
+        }}
+      >
+        {/* 如果不是 dva 2.0 替换成 {children} start */}
+        {this.state.show && children}
+        {/* 如果不是 dva 2.0 替换成 {children} end */}
+      </div>
+    );
+  }
+}

client/src/landing/less/antMotionStyle.less

@@ -0,0 +1,14 @@
+@import './common.less';
+@import './custom.less';
+@import './content.less';
+@import './nav0.less';
+@import './banner0.less';
+@import './content4.less';
+@import './content0.less';
+@import './content1.less';
+@import './pricing2.less';
+@import './pricing1.less';
+@import './content3.less';
+@import './content12.less';
+@import './footer1.less';
+@import './edit.less';

client/src/landing/less/banner0.less

@@ -0,0 +1,84 @@
+@banner0: banner0;
+.@{banner0} {
+  // 如果在第一屏且导航位置为 relative, 一屏为 height: calc(~"100vh - 64px");
+  width: 100%;
+  height: 100vh;
+  position: relative;
+  text-align: center;
+  border-color: #666;
+  background-image: url("../../assets/banner1.jpeg");
+  background-size: cover;
+  background-attachment: fixed;
+  background-position: center;
+  & &-text-wrapper {
+    display: inline-block;
+    position: absolute;
+    top: 20%;
+    margin: auto;
+    left: 0;
+    right: 0;
+    font-size: 14px;
+    color: @template-text-color-light;
+    width: 550px;
+    > .queue-anim-leaving {
+      position: relative !important;
+    }
+  }
+  & &-title {
+    width: 350px;
+    //left: 30px;
+    min-height: 60px;
+    margin: auto;
+    display: inline-block;
+    font-size: 40px;
+    position: relative;
+  }
+  & &-content {
+    margin-bottom: 20px;
+    word-wrap: break-word;
+    min-height: 24px;
+  }
+  & &-button {
+    border: 1px solid #fff;
+    color: #fff;
+    background: transparent;
+    box-shadow: 0 0 0 transparent;
+    font-size: 16px;
+    height: 40px;
+    transition: background 0.45s @ease-out, box-shadow 0.45s @ease-out;
+    &:hover {
+      color: #fff;
+      border-color: #fff;
+      background: rgba(255, 255, 255, 0.1);
+      box-shadow: 0 0 10px rgba(50, 250, 255, 0.75);
+    }
+    &:focus {
+      color: #fff;
+      border-color: #fff;
+    }
+    &.queue-anim-leaving {
+      width: auto;
+    }
+  }
+  & &-icon {
+    bottom: 20px;
+    font-size: 24px;
+    position: absolute;
+    left: 50%;
+    margin-left: -12px;
+    color: @template-text-color-light;
+  }
+}
+
+@media screen and (max-width: 767px) {
+  .@{banner0} {
+    background-attachment: inherit;
+    & &-text-wrapper {
+      width: 90%;
+    }
+    & &-title {
+      width: 90%;
+      left: 0;
+    }
+  }
+}

client/src/landing/less/common.less

@@ -0,0 +1,42 @@
+
+// @import "~antd/lib/style/v2-compatible-reset.less";
+
+body {
+  word-wrap: break-word;
+}
+
+body,
+div,
+dl,
+dt,
+dd,
+ul,
+ol,
+li,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 0;
+  padding: 0;
+}
+
+/* .content-wrapper > .tween-one-leaving,
+.queue-anim-leaving {
+  // position: absolute !important;
+  // width: 100%;
+} */
+
+.video {
+  max-width: 800px;
+}
+
+#react-content {
+  min-height: 100%;
+}
+.home-page-wrapper p {
+  padding: 0;
+  margin: 0;
+}

client/src/landing/less/content.less

@@ -0,0 +1,44 @@
+@homepage: home-page;
+.@{homepage}-wrapper {
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+  .@{homepage} {
+    height: 100%;
+    max-width: 1200px;
+    position: relative;
+    margin: auto;
+    will-change: transform;
+  }
+  .title-wrapper > h1, > h1 {
+    font-size: 32px;
+    color: @text-color;
+    margin-bottom: 16px;
+  }
+  .title-wrapper {
+    margin: 0 auto 64px;
+    text-align: center;
+  }
+}
+
+.@{homepage} {
+  padding: 128px 24px;
+}
+
+@media screen and (max-width: 767px) {
+  .@{homepage}-wrapper {
+    .@{homepage} {
+      padding: 56px 24px;
+      >h1 {
+        font-size: 24px;
+        margin: 0 auto 32px;
+        &.title-h1 {
+          margin-bottom: 8px;
+        }
+      }
+      >p {
+        margin-bottom: 32px;
+      }
+    }
+  }
+}

client/src/landing/less/content0.less

@@ -0,0 +1,55 @@
+@content0: content0;
+
+.@{content0}-wrapper {
+  min-height: 446px;
+  overflow: hidden;
+
+  .@{content0} {
+    height: 100%;
+    padding: 64px 24px;
+
+    >.title-wrapper {
+      margin: 0 auto 48px;
+    }
+
+    &-block {
+      padding: 0 4%;
+      display: inline-block;
+      text-align: center;
+      min-height: 200px;
+      margin-bottom: 24px;
+      img {
+        width: 100%;
+      }
+
+      &-wrapper {
+        position: relative;
+        height: 100%;
+        top: 25%;
+        padding: 20px 0;
+      }
+
+      &.queue-anim-leaving {
+        position: relative !important;
+      }
+
+      &-icon {
+        width: 100px;
+        height: 100px;
+        margin: auto;
+      }
+
+      &-title {
+        line-height: 32px;
+        margin: 10px auto;
+        font-size: 24px;
+      }
+    }
+  }
+}
+
+@media screen and (max-width: 767px) {
+  .@{content0}-wrapper {
+    min-height: 880px;
+  }
+}

client/src/landing/less/content1.less

@@ -0,0 +1,76 @@
+@content1: content1;
+.@{content1}-wrapper {
+  height: 360px;
+  .@{content1} {
+    height: 100%;
+    padding: 0 24px;
+    &-img {
+      height: 100%;
+      transform-origin: top;
+      padding: 0 32px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      span {
+        display: block;
+        width: 250px;
+        img {
+          display: block;
+        }
+      }
+    }
+    &-text {
+      padding: 0 32px;
+      height: 100%;
+      .@{content1}-content,
+      .@{content1}-title {
+        position: relative !important;
+      }
+      .@{content1}-title {
+        font-size: 32px;
+        font-weight: normal;
+        color: #404040;
+        margin-top: 120px;
+      }
+      .content {
+        margin-top: 20px;
+      }
+    }
+  }
+}
+
+@media screen and (max-width: 767px) {
+  .@{content1}-wrapper {
+    height: 600px;
+    .@{content1} {
+      &-img {
+        height: 200px;
+        padding: 0;
+        text-align: center;
+        margin-top: 64px;
+        span {
+          display: inline-block;
+          width: 180px;
+          height: 200px;
+          line-height: 200px;
+          margin: auto;
+        }
+      }
+      &-text {
+        height: auto;
+        margin-bottom: 20px;
+        text-align: center;
+        padding: 0;
+        .@{content1}-content,
+        .@{content1}-title {
+          width: 100%;
+          top: auto;
+        }
+        .@{content1}-title {
+          margin: 32px auto 16px;
+          font-size: 24px;
+        }
+      }
+    }
+  }
+}

client/src/landing/less/content12.less

@@ -0,0 +1,52 @@
+@content12: content12;
+.@{content12}-wrapper {
+  background-color: #fafafa;
+  min-height: 470px;
+  .@{content12} {
+    padding: 64px 24px;
+    >p {
+      text-align: center;
+    }
+  }
+  .img-wrapper {
+    margin: 0 auto;
+    left: 0;
+    right: 0;
+    .block {
+      margin-bottom: 40px;
+      .block-content {
+        display: flex;
+        border-radius: 4px;
+        text-align: center;
+        position: relative;
+        overflow: hidden;
+        border: none;
+        height: 64px;
+        align-items: center;
+        transition: box-shadow .3s @ease-out, transform .3s @ease-out;
+        & > span {
+          width: 100%;
+          display: block;
+        }
+      }
+    }
+  }
+}
+
+@media screen and (max-width: 767px) {
+  .@{content12}-wrapper {
+    overflow: hidden;
+    .@{content12} {
+      ul {
+        li {
+          display: block;
+          width: 100%;
+          padding: 2%;
+          span {
+            height: 168px;
+          }
+        }
+      }
+    }
+  }
+}

client/src/landing/less/content3.less

@@ -0,0 +1,52 @@
+@content3: content3;
+.@{content3}-wrapper {
+  min-height: 764px;
+  .@{content3} {
+    height: 100%;
+    overflow: hidden;
+    & .title-content {
+      text-align: center;
+    }
+    &-block-wrapper {
+      position: relative;
+      .@{content3}-block {
+        display: inline-block;
+        padding: 48px 24px;
+        vertical-align: top;
+        .@{content3}-icon {
+          display: inline-block;
+          width: 15%;
+          vertical-align: top;
+        }
+        .@{content3}-text {
+          width: 85%;
+          display: inline-block;
+          padding-left: 8%;
+        }
+        &.clear-both {
+          clear: both;
+        }
+      }
+    }
+  }
+}
+
+@media screen and (max-width: 767px) {
+  .@{content3}-wrapper {
+    min-height: 1080px;
+    .@{content3} {
+      &-block-wrapper {
+        margin: 20px auto;
+        height: auto;
+        .@{content3}-block {
+          .@{content3}-title {
+            font-size: 20px;
+          }
+          &.queue-anim-leaving {
+            position: relative !important;
+          }
+        }
+      }
+    }
+  }
+}

client/src/landing/less/content4.less

@@ -0,0 +1,37 @@
+@content4: content4;
+.@{content4}-wrapper {
+  min-height: 720px;
+  background: #fafafa;
+  .@{content4} {
+    height: 100%;
+    overflow: hidden;
+    &-video {
+      border-radius: 4px;
+      overflow: hidden;
+      max-width: 800px;
+      margin: auto;
+      background: #fff;
+      box-shadow: 0 4px 8px rgba(0, 0, 0, .15);
+      video {
+        display: block;
+        margin: auto;
+      }
+    }
+  }
+}
+
+@media screen and (max-width: 767px) {
+  .@{content4}-wrapper {
+    min-height: 350px;
+    .@{content4} {
+      overflow: hidden;
+      width: 90%;
+      margin: auto;
+      &-video {
+        top: 15%;
+        background: url("https://zos.alipayobjects.com/rmsportal/HZgzhugQZkqUwBVeNyfz.jpg") no-repeat center;
+        background-size: cover;
+      }
+    }
+  }
+}

client/src/landing/less/custom.less

@@ -0,0 +1,35 @@
+@import "~antd/lib/style/themes/default.less";
+
+@line-color: #e9e9e9;
+
+@shadow-color: rgba(0, 0, 0, 0.15);
+
+@bottom-bar-bg-color: #262626;
+@bottom-bar-line-color: #000;
+
+@template-bg-color: #001529;
+@template-bg-color-light: #ececec;
+@template-nav-bg-color: #001529;
+@template-text-color: #ccc;
+@template-text-title-color: #bcbcbc;
+@template-text-color-light: #fff;
+@template-footer-text-color: #999;
+
+@animate-duration: .45s;
+
+/* 详细页图片或框框的样式;
+*/
+.page-shadow() {
+  box-shadow: 0 5px 8px @shadow-color;
+}
+
+.page-pro() {
+  border-radius: 6px;
+  border: 1px solid @line-color;
+  transform: translateY(0);
+  transition: transform .3s @ease-out, box-shadow .3s @ease-out;
+  &:hover {
+    .page-shadow();
+    transform: translateY(-5px);
+  }
+}

client/src/landing/less/footer1.less

@@ -0,0 +1,98 @@
+.footer1-wrapper {
+  background: @template-bg-color;
+  overflow: hidden;
+  position: relative;
+  min-height: 360px;
+  color: @template-footer-text-color;
+  .footer1 {
+    .home-page {
+      padding: 64px 24px 80px;
+    }
+  }
+  .block {
+    padding: 0 32px;
+    .logo {
+      max-width: 180px;
+    }
+    .slogan {
+      font-size: 12px;
+      margin-top: -20px;
+    }
+    >h2 {
+      margin-bottom: 24px;
+      color: @template-text-color;
+    }
+    a {
+      color: @template-footer-text-color;
+      margin-bottom: 12px;
+      float: left;
+      clear: both;
+      &:hover {
+        color: @primary-color;
+      }
+    }
+  }
+  .copyright-wrapper {
+    width: 100%;
+    border-top: 1px solid fade(@line-color, 10);
+    .home-page {
+      padding: 0 24px;
+      overflow: hidden;
+    }
+    .copyright {
+      height: 80px;
+      text-align: center;
+      line-height: 80px;
+    }
+  }
+}
+
+@media screen and (max-width: 767px) {
+  .footer1 {
+    min-height: 550px;
+    &-wrapper {
+      .footer1 {
+        .home-page {
+          padding: 64px 24px 32px;
+        }
+      }
+    }
+    .logo {
+      margin: 0 auto 24px;
+    }
+    .block {
+      text-align: center;
+      margin-bottom: 32px;
+      padding: 0;
+    }
+    >ul {
+      width: 90%;
+      margin: 20px auto 0;
+      padding: 10px 0;
+      >li {
+        width: 100%;
+        h2 {
+          margin-bottom: 10px;
+        }
+        li {
+          display: inline-block;
+          margin-right: 10px;
+        }
+      }
+    }
+    .copyright {
+      &-wrapper {
+        .home-page {
+          padding: 0;
+          .copyright {
+            font-size: 12px;
+          }
+        }
+      }
+
+      span {
+        width: 90%;
+      }
+    }
+  }
+}

client/src/landing/less/nav0.less

@@ -0,0 +1,187 @@
+@header0: header0;
+
+.@{header0} {
+  background: @template-nav-bg-color;
+  width: 100%;
+  z-index: 1;
+  box-shadow: 0 5px 8px fade(#000, 15);
+  position: relative;
+  top: 0;
+
+  .home-page {
+    padding: 0 24px;
+  }
+
+  &-logo {
+    display: inline-block;
+    position: relative;
+    width: 150px;
+    line-height: 64px;
+
+    & img {
+      vertical-align: middle;
+      display: inline-block;
+    }
+
+    & a {
+      display: block;
+    }
+  }
+
+  &-menu {
+    float: right;
+
+    .ant-menu {
+      line-height: 62px;
+      height: 64px;
+
+      a {
+        display: block;
+      }
+    }
+  }
+
+  &-item {
+    &-block {
+      padding: 0 8px;
+
+      >* {
+        display: inline-block;
+      }
+    }
+  }
+
+  &-item,
+  &-item-child,
+  &-menu {
+
+    .ant-menu-sub .ant-menu-item,
+    .ant-menu-inline .ant-menu-item {
+      height: auto;
+      line-height: 1.5;
+    }
+
+    .item {
+      &-sub-item {
+        display: block;
+        padding: 8px 24px;
+      }
+
+      &-image {
+        float: left;
+        margin-right: 16px;
+        margin-top: 4px;
+        position: relative;
+        z-index: 1;
+      }
+
+      &-title {
+        font-size: 14px;
+        color: #fff;
+        margin-left: 46px;
+      }
+
+      &-content {
+        font-size: 12px;
+        color: fade(#fff, 75);
+        margin-left: 46px;
+      }
+    }
+  }
+}
+
+@media screen and (max-width: 767px) {
+  .@{header0} {
+    &-logo {
+      z-index: 101;
+    }
+
+    &.home-page-wrapper .home-page {
+      padding: 0 24px;
+    }
+
+    &-menu {
+      height: auto;
+      float: inherit;
+      position: relative;
+      left: -24px;
+      width: ~"calc(100% + 48px)";
+      opacity: 0;
+      transition: opacity .3s @ease-in-out;
+
+      & li {
+        padding: 0 24px;
+
+        &.ant-menu-submenu {
+          padding: 0;
+        }
+      }
+      .item {
+        &-sub-item {
+          padding: 8px 0;
+        }
+      }
+    }
+
+    &-mobile-menu {
+      width: 16px;
+      height: 14px;
+      cursor: pointer;
+      position: absolute;
+      top: 24px;
+      right: 24px;
+      z-index: 100;
+
+      em {
+        display: block;
+        width: 100%;
+        height: 2px;
+        background: #fff;
+        margin-top: 4px;
+        transition: transform .3s @ease-in-out, opacity .3s @ease-in-out;
+      }
+
+      :first-child {
+        margin-top: 0;
+      }
+    }
+
+    .ant-menu {
+      height: auto;
+      overflow: hidden;
+
+      .ant-menu-item-selected {
+        border: none;
+      }
+    }
+
+    & .open {
+      height: auto;
+
+      .@{header0}-mobile-menu {
+        em {
+          &:nth-child(1) {
+            transform: translateY(6px) rotate(45deg);
+          }
+
+          &:nth-child(2) {
+            opacity: 0;
+          }
+
+          &:nth-child(3) {
+            transform: translateY(-6px) rotate(-45deg);
+          }
+        }
+      }
+
+      >.@{header0}-menu {
+        opacity: 1;
+        pointer-events: auto;
+      }
+    }
+    &-item-block {
+      height: 40px;
+      line-height: 40px;
+    }
+  }
+}

client/src/landing/less/pricing1.less

@@ -0,0 +1,85 @@
+@pricing1: pricing1;
+.@{pricing1}-wrapper {
+  min-height: 760px;
+  .@{pricing1} {
+    >p {
+      text-align: center;
+    }
+    &-content-wrapper {
+      min-height: 400px;
+    }
+    &-block-box {
+      width: 260px;
+      border-radius: 4px;
+      background: #eef0f3;
+      text-align: center;
+      color: #666;
+      min-height: 400px;
+      margin: auto;
+      border: 1px solid transparent;
+      .page-pro();
+      &.active {
+        border-color: @primary-color;
+        background: #fff;
+        .@{pricing1} {
+          &-top-wrapper {
+            background: @primary-color;
+          }
+          &-name,
+          &-money,
+          &-button {
+            color: #fff;
+          }
+          &-button {
+            background: @primary-color;
+          }
+        }
+      }
+    }
+    &-block {
+      margin-bottom: 24px;
+    }
+    &-top-wrapper {
+      width: 100%;
+      padding: 16px 24px;
+    }
+    &-name {
+      font-size: 14px;
+    }
+    &-money {
+      font-family: 'Helvetica Neue', sans-serif;
+      font-size: 32px;
+      color: #666;
+    }
+    &-content {
+      font-size: 12px;
+      line-height: 2;
+      font-weight: 300;
+      margin: 32px 24px 48px;
+    }
+    &-line {
+      display: block;
+      height: 1px;
+      background: #d9d9d9;
+      margin: 0 24px;
+    }
+    &-button-wrapper {
+      margin: 18px 24px;
+    }
+    &-button {
+      padding: 0 24px;
+    }
+  }
+  &.home-page-wrapper {
+    .@{pricing1}-title-wrapper {
+      margin-bottom: 64px;
+      text-align: center;
+    }
+  }
+}
+
+@media screen and (max-width: 767px) {
+  .@{pricing1}-wrapper {
+    padding-bottom: 0;
+  }
+}

client/src/landing/less/pricing2.less

@@ -0,0 +1,59 @@
+@pricing2: pricing2;
+
+.@{pricing2}-wrapper {
+  min-height: 760px;
+
+  .@{pricing2} {
+    >p {
+      text-align: center;
+    }
+
+    &-content-wrapper {
+      min-height: 400px;
+    }
+
+    &-table-name-block {
+      text-align: center;
+      color: #666;
+      width: 100%;
+    }
+
+    &-table-name {
+      font-size: 24px;
+    }
+
+    &-table-money {
+      font-size: 16px;
+      margin: 8px 0 16px;
+    }
+
+    &-table-content {
+      text-align: center;
+      color: #666;
+
+      &-name {
+        color: #666;
+        text-align: center;
+      }
+    }
+  }
+
+  &.home-page-wrapper {
+    .@{pricing2}-title-wrapper {
+      margin-bottom: 64px;
+      text-align: center;
+    }
+  }
+}
+
+@media screen and (max-width: 767px) {
+  .@{pricing2} {
+    &-wrapper {
+      padding-bottom: 0;
+    }
+
+    &-table {
+      margin-bottom: 24px;
+    }
+  }
+}

client/src/landing/utils.js

@@ -0,0 +1,18 @@
+
+import React from 'react';
+import { Button } from 'antd';
+
+export const isImg = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w-./?%&=]*)?/;
+export const getChildrenToRender = (item, i) => {
+  let tag = item.name.indexOf('title') === 0 ? 'h1' : 'div';
+  tag = item.href ? 'a' : tag;
+  let children = typeof item.children === 'string' && item.children.match(isImg)
+    ? React.createElement('img', { src: item.children, alt: 'img' })
+    : item.children;
+  if (item.name.indexOf('button') === 0 && typeof item.children === 'object') {
+    children = React.createElement(Button, {
+      ...item.children
+    });
+  }
+  return React.createElement(tag, { key: i.toString(), ...item }, children);
+};

client/src/pages/contract-detail/contract-detail.page.component.jsx

@@ -110,6 +110,23 @@ export function ContractDetailPage({
                             "printcenter.courtesycarcontract.courtesy_car_terms"
                           )}
                         </Menu.Item>
+                        <Menu.Item
+                          onClick={() =>
+                            GenerateDocument(
+                              {
+                                name: TemplateList("courtesycarcontract")
+                                  .courtesy_car_impound.key,
+                                variables: { id: contract.id },
+                              },
+                              {},
+                              "p"
+                            )
+                          }
+                        >
+                          {t(
+                            "printcenter.courtesycarcontract.courtesy_car_impound"
+                          )}
+                        </Menu.Item>
                       </Menu>
                     }
                   >

client/src/pages/dashboard/dashboard.container.jsx

@@ -7,6 +7,7 @@ import {
   setBreadcrumbs,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
+import FeatureWrapper from "../../components/feature-wrapper/feature-wrapper.component";
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -28,9 +29,11 @@ export function ExportsLogPageContainer({ setBreadcrumbs, setSelectedHeader }) {
   }, [setBreadcrumbs, t, setSelectedHeader]);
 
   return (
-    <RbacWrapper action="shop:dashboard">
-      <DashboardGridComponent />
-    </RbacWrapper>
+    <FeatureWrapper featureName="dashboard">
+      <RbacWrapper action="shop:dashboard">
+        <DashboardGridComponent />
+      </RbacWrapper>
+    </FeatureWrapper>
   );
 }
 export default connect(null, mapDispatchToProps)(ExportsLogPageContainer);

client/src/pages/dms/dms.container.jsx

@@ -0,0 +1,139 @@
+import { Result, Timeline, Space, Tag, Divider, Button } from "antd";
+import React, { useEffect, useState } from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  setBreadcrumbs,
+  setSelectedHeader,
+} from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
+import SocketIO from "socket.io-client";
+import { auth } from "../../firebase/firebase.utils";
+import moment from "moment";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
+  setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
+
+export const socket = SocketIO(
+  process.env.NODE_ENV === "production"
+    ? process.env.REACT_APP_AXIOS_BASE_API_URL
+    : window.location.origin,
+  {
+    path: "/ws",
+    auth: async (callback) => {
+      const token = auth.currentUser && (await auth.currentUser.getIdToken());
+      callback({ token });
+    },
+  }
+);
+
+export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
+  const { t } = useTranslation();
+  const [logs, setLogs] = useState([]);
+
+  useEffect(() => {
+    document.title = t("titles.dms");
+    setSelectedHeader("dms");
+    setBreadcrumbs([
+      {
+        link: "/manage/dms",
+        label: t("titles.bc.dms"),
+      },
+    ]);
+  }, [t, setBreadcrumbs, setSelectedHeader]);
+
+  useEffect(() => {
+    socket.on("connected", () => {
+      console.log("Connected again.");
+    });
+
+    socket.on("log-event", (payload) => {
+      setLogs((logs) => {
+        return [...logs, payload];
+      });
+    });
+
+    socket.connect();
+    socket.emit("set-log-level", "TRACE");
+
+    return () => {
+      socket.removeAllListeners();
+      socket.disconnect();
+    };
+  }, []);
+
+  if (!bodyshop.cdk_dealerid) return <Result status="404" />;
+
+  const dmsType = determineDmsType(bodyshop);
+
+  return (
+    <div>
+      <Button
+        onClick={() => {
+          socket.emit(
+            `${dmsType}-export-job`,
+            "752a4f5f-22ab-414b-b182-98d4e62227ef"
+          );
+        }}
+      >
+        Export
+      </Button>
+
+      <Button
+        onClick={() => {
+          setLogs([]);
+          socket.disconnect();
+          socket.connect();
+        }}
+      >
+        reconnect
+      </Button>
+
+      <Timeline pending={socket.connected && "Processing..."} reverse={true}>
+        {logs.map((log, idx) => (
+          <Timeline.Item key={idx} color={LogLevelHierarchy(log.level)}>
+            <Space wrap align="start" style={{}}>
+              <Tag color={LogLevelHierarchy(log.level)}>{log.level}</Tag>
+              <span>{moment(log.timestamp).format("MM/DD/YYYY HH:MM:ss")}</span>
+              <Divider type="vertical" />
+              <span>{log.message}</span>
+            </Space>
+          </Timeline.Item>
+        ))}
+      </Timeline>
+    </div>
+  );
+}
+
+function LogLevelHierarchy(level) {
+  switch (level) {
+    case "TRACE":
+      return "pink";
+    case "DEBUG":
+      return "orange";
+    case "INFO":
+      return "blue";
+    case "WARNING":
+      return "yellow";
+    case "ERROR":
+      return "red";
+    default:
+      return 0;
+  }
+}
+
+const determineDmsType = (bodyshop) => {
+  if (bodyshop.cdk_dealerid) return "cdk";
+  else {
+    return "pbs";
+  }
+};

client/src/pages/export-logs/export-logs.page.component.jsx

@@ -12,7 +12,6 @@ import AlertComponent from "../../components/alert/alert.component";
 import { QUERY_EXPORT_LOG_PAGINATED } from "../../graphql/accounting.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
-import { alphaSort } from "../../utils/sorters";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -79,12 +78,10 @@ export function ExportLogsPageComponent({ bodyshop }) {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
-      sortOrder: sortcolumn === "ro_number" && sortorder,
 
       render: (text, record) =>
         record.job && (
-          <Link to={"/manage/jobs/" + record.job && record.job.id}>
+          <Link to={`/manage/jobs/${record.job.id}`}>
             {(record.job && record.job.ro_number) || t("general.labels.na")}
           </Link>
         ),

client/src/pages/jobs-admin/jobs-admin.page.jsx

@@ -15,6 +15,8 @@ import JobAdminOwnerReassociate from "../../components/jobs-admin-owner-reassoci
 import JobsAdminUnvoid from "../../components/jobs-admin-unvoid/jobs-admin-unvoid.component";
 import JobAdminVehicleReassociate from "../../components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
+import JobsAdminStatus from "../../components/jobs-admin-change-status/jobs-admin-change.status.component";
+
 import NotFound from "../../components/not-found/not-found.component";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { GET_JOB_BY_PK } from "../../graphql/jobs.queries";
@@ -96,6 +98,7 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
               <JobsAdminDeleteIntake job={data ? data.jobs_by_pk : {}} />
               <JobsAdminMarkReexport job={data ? data.jobs_by_pk : {}} />
               <JobsAdminUnvoid job={data ? data.jobs_by_pk : {}} />
+              <JobsAdminStatus job={data ? data.jobs_by_pk : {}} />
             </Space>
           </Card>
         </Col>

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -42,9 +42,26 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
     setLoading(true);
     const result = await client.mutate({
       mutation: generateJobLinesUpdatesForInvoicing(values.joblines),
+    });
+    if (result.errors) {
+      return; // Abandon the rest of the close.
+    }
+
+    const closeResult = await closeJob({
+      variables: {
+        jobId: job.id,
+        job: {
+          status: bodyshop.md_ro_statuses.default_invoiced || "",
+          date_invoiced: new Date(),
+          actual_in: values.actual_in,
+          actual_completion: values.actual_completion,
+          actual_delivery: values.actual_delivery,
+        },
+      },
       refetchQueries: ["QUERY_JOB_CLOSE_DETAILS"],
       awaitRefetchQueries: true,
     });
+
     if (!result.errors) {
       notification["success"]({ message: t("jobs.successes.save") });
       //  form.resetFields();
@@ -56,18 +73,6 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
       });
       return; // Abandon the rest of the close.
     }
-    form.resetFields();
-    form.resetFields();
-
-    const closeResult = await closeJob({
-      variables: {
-        jobId: job.id,
-        job: {
-          status: bodyshop.md_ro_statuses.default_invoiced || "",
-          date_invoiced: new Date(),
-        },
-      },
-    });
 
     if (!closeResult.errors) {
       setLoading(false);
@@ -84,6 +89,8 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
         }),
       });
     }
+    form.resetFields();
+    form.resetFields();
 
     setLoading(false);
   };

client/src/pages/landing/landing.page.jsx

@@ -3,6 +3,7 @@ import { connect } from "react-redux";
 import { Redirect } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
+import LandingPageStatic from "../../landing/index";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -13,5 +14,6 @@ export default connect(mapStateToProps, null)(LandingPage);
 export function LandingPage({ currentUser }) {
   if (currentUser.authorized) return <Redirect to={"/manage"} />;
 
-  return <Redirect to={"/signin"} />;
+  return <LandingPageStatic />;
+  //return <Redirect to={"/signin"} />;
 }

client/src/pages/manage/manage.page.component.jsx

@@ -15,7 +15,6 @@ import FcmNotification from "../../components/fcm-notification/fcm-notification.
 //import FooterComponent from "../../components/footer/footer.component";
 //Component Imports
 import HeaderContainer from "../../components/header/header.container";
-import JiraSupportComponent from "../../components/jira-support-widget/jira-support-widget.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import PartnerPingComponent from "../../components/partner-ping/partner-ping.component";
 import PrintCenterModalContainer from "../../components/print-center-modal/print-center-modal.container";
@@ -159,6 +158,7 @@ const EmailTest = lazy(() =>
   import("../../components/email-test/email-test-component")
 );
 const Dashboard = lazy(() => import("../dashboard/dashboard.container"));
+const Dms = lazy(() => import("../dms/dms.container"));
 
 const { Content, Footer } = Layout;
 
@@ -367,6 +367,7 @@ export function Manage({ match, conflict, bodyshop }) {
       <Route exact path={`${match.path}/help`} component={Help} />
       <Route exact path={`${match.path}/emailtest`} component={EmailTest} />
       <Route exact path={`${match.path}/dashboard`} component={Dashboard} />
+      <Route exact path={`${match.path}/dms`} component={Dms} />
     </Suspense>
   );
 
@@ -406,10 +407,9 @@ export function Manage({ match, conflict, bodyshop }) {
                 </div>
                 <div id="noticeable-widget" style={{ marginLeft: "1rem" }} />
               </div>
-              <Link to="/about" target="_blank" style={{ color: "#ccc" }}>
+              <Link to="/disclaimer" target="_blank" style={{ color: "#ccc" }}>
                 Disclaimer & Notices
               </Link>
-              <JiraSupportComponent />
             </div>
           </Footer>
         </Content>

client/src/pages/manage/manage.page.container.jsx

@@ -7,6 +7,7 @@ import LoadingSpinner from "../../components/loading-spinner/loading-spinner.com
 import { QUERY_BODYSHOP } from "../../graphql/bodyshop.queries";
 import { setBodyshop } from "../../redux/user/user.actions";
 import ManagePage from "./manage.page.component";
+import "../../utils/RegisterSw";
 
 const mapDispatchToProps = (dispatch) => ({
   setBodyshop: (bs) => dispatch(setBodyshop(bs)),