Extensions to job totals calculation.

client/src/components/job-calculate-totals/job-calculate-totals.component.jsx

@@ -4,7 +4,7 @@ import React, { useState } from "react";
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
-
+import Dinero from "dinero.js";
 export default function JobCalculateTotals({ job, disabled }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
@@ -25,6 +25,10 @@ export default function JobCalculateTotals({ job, disabled }) {
         jobId: job.id,
         job: {
           job_totals: newTotals,
+          clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
+          owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat(
+            "0.00"
+          ),
         },
       },
     });

client/src/components/jobs-available-table/jobs-available-table.container.jsx

@@ -1,4 +1,5 @@
 import {
+  gql,
   useApolloClient,
   useLazyQuery,
   useMutation,
@@ -7,9 +8,10 @@ import {
 import { notification } from "antd";
 import Axios from "axios";
 import Dinero from "dinero.js";
-import { gql } from "@apollo/client";
 import _ from "lodash";
-import React, { useState, useEffect, useCallback } from "react";
+import moment from "moment";
+import queryString from "query-string";
+import React, { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useHistory, useLocation } from "react-router-dom";
@@ -21,6 +23,7 @@ import {
   QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK,
 } from "../../graphql/available-jobs.queries";
 import { INSERT_NEW_JOB, UPDATE_JOB } from "../../graphql/jobs.queries";
+import { INSERT_NEW_NOTE } from "../../graphql/notes.queries";
 import { SEARCH_VEHICLE_BY_VIN } from "../../graphql/vehicles.queries";
 import {
   selectBodyshop,
@@ -33,9 +36,6 @@ import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.contai
 import { GetSupplementDelta } from "./jobs-available-supplement.estlines.util";
 import HeaderFields from "./jobs-available-supplement.headerfields";
 import JobsAvailableTableComponent from "./jobs-available-table.component";
-import moment from "moment";
-import { INSERT_NEW_NOTE } from "../../graphql/notes.queries";
-import queryString from "query-string";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -71,6 +71,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
   const importOptions = importOptionsState[0];
   const modalSearchState = useState("");
 
+  //Import Scenario
   const onOwnerFindModalOk = async () => {
     logImEXEvent("job_import_new");
 
@@ -171,6 +172,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
       });
   };
 
+  //Suplement scenario
   const onJobFindModalOk = async () => {
     logImEXEvent("job_import_supplement");
 
@@ -199,15 +201,6 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
         HeaderFields.forEach((item) => delete supp[item]);
       }
 
-      const newTotals = (
-        await Axios.post("/job/totals", {
-          job: {
-            ...estData.data.available_jobs_by_pk.est_data,
-            joblines: estData.data.available_jobs_by_pk.est_data.joblines.data,
-          },
-        })
-      ).data;
-
       let suppDelta = await GetSupplementDelta(
         client,
         selectedJob,
@@ -220,46 +213,65 @@ export function JobsAvailableContainer({ bodyshop, currentUser }) {
           ${suppDelta}
         `,
       });
-      updateJob({
+
+      const updateResult = await updateJob({
         variables: {
           jobId: selectedJob,
           job: {
             ...supp,
-            clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
-            owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat(
-              "0.00"
-            ),
-            job_totals: newTotals,
-            queued_for_parts: true,
+            // clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
+            // owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat(
+            //   "0.00"
+            // ),
+            // job_totals: newTotals,
+            // queued_for_parts: true,
           },
         },
-      })
-        .then((r) => {
-          notification["success"]({
-            message: t("jobs.successes.supplemented"),
-            onClick: () => {
-              history.push(
-                `/manage/jobs/${r.data.update_jobs.returning[0].id}`
-              );
-            },
-          });
-          //Job has been inserted. Clean up the available jobs record.
+      });
 
-          deleteJob({
-            variables: { id: estData.data.available_jobs_by_pk.id },
-          }).then((r) => {
-            refetch();
-            setInsertLoading(false);
-          });
-        })
-        .catch((r) => {
-          //error while inserting
-          notification["error"]({
-            message: t("jobs.errors.creating", { error: r.message }),
-          });
-          refetch();
-          setInsertLoading(false);
+      if (updateResult.errors) {
+        //error while inserting
+        notification["error"]({
+          message: t("jobs.errors.creating", {
+            error: JSON.stringify(updateResult.errors),
+          }),
         });
+        refetch();
+        setInsertLoading(false);
+        return;
+      }
+
+      const newTotals = await Axios.post("/job/totalsssu", {
+        id: selectedJob,
+      });
+      console.log(
+        "🚀  ~ file: jobs-available-table.container.jsx  ~ line 247  ~ newTotals",
+        newTotals
+      );
+
+      if (newTotals.status !== 200) {
+        notification["error"]({
+          message: t("jobs.errors.totalscalc"),
+        });
+        setInsertLoading(false);
+        return;
+      }
+      notification["success"]({
+        message: t("jobs.successes.supplemented"),
+        onClick: () => {
+          history.push(
+            `/manage/jobs/${updateResult.data.update_jobs.returning[0].id}`
+          );
+        },
+      });
+      //Job has been inserted. Clean up the available jobs record.
+
+      deleteJob({
+        variables: { id: estData.data.available_jobs_by_pk.id },
+      }).then((r) => {
+        refetch();
+        setInsertLoading(false);
+      });
 
       await insertNote({
         variables: {