Merged in hotfix/2021-07-02 (pull request #127)

IO-1231 Resolve dates not saving on job close.

Approved-by: Patrick Fic

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);
   };