IO-1231 Resolve dates not saving on job close.

Hotfix/2021 06 30

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file

client/src/landing/index.jsx

@@ -81,48 +81,52 @@ export default class Home extends React.Component {
         dataSource={Banner00DataSource}
         isMobile={this.state.isMobile}
       />,
-      // <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}
-      // />,
+      ...(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"

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/translations/en_us/common.json

@@ -1441,11 +1441,11 @@
 					"name": "ImEX Online",
 					"status": "System Status"
 				},
-				"slogan": "The future of shop management systems. "
+				"slogan": "A whole new kind of shop management system."
 			},
 			"hero": {
-				"button": "Learn More",
-				"title": "Bringing the future to the collision repair process."
+				"button": "Coming Soon",
+				"title": "A whole new kind of shop management system."
 			},
 			"labels": {
 				"features": "Features",