WIP Bill Line deduction from Labor IO-571

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

@@ -5,15 +5,15 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_NEW_BILL } from "../../graphql/bills.queries";
+import { UPDATE_JOB_LINE_STATUS } from "../../graphql/jobs-lines.queries";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectBillEnterModal } from "../../redux/modals/modals.selectors";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import { handleUpload } from "../documents-upload/documents-upload.utility";
 import BillFormContainer from "../bill-form/bill-form.container";
-import { UPDATE_JOB_LINE_STATUS } from "../../graphql/jobs-lines.queries";
+import { handleUpload } from "../documents-upload/documents-upload.utility";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -37,81 +37,98 @@ function BillEnterModalContainer({
   const [updateJobLines] = useMutation(UPDATE_JOB_LINE_STATUS);
   const [loading, setLoading] = useState(false);
 
-  const handleFinish = (values) => {
+  const handleFinish = async (values) => {
+    console.log(
+      "🚀 ~ file: bill-enter-modal.container.jsx ~ line 41 ~ handleFinish ~ values",
+      values
+    );
     setLoading(true);
     const { upload, location, ...remainingValues } = values;
-    insertBill({
+
+    const adjustmentsToInsert = [];
+
+    const r1 = await insertBill({
       variables: {
         bill: [
-          Object.assign({}, remainingValues, {
+          {
+            ...remainingValues,
             billlines: {
               data:
                 remainingValues.billlines &&
                 remainingValues.billlines.map((i) => {
+                  const { deductfromlabor, lbr_adjustment, ...restI } = i;
+                  if (deductfromlabor) {
+                    adjustmentsToInsert.push({
+                      ...lbr_adjustment,
+                      act_price: i.act_price,
+                    });
+                  }
                   return {
-                    ...i,
+                    ...restI,
                     joblineid: i.joblineid === "noline" ? null : i.joblineid,
                   };
                 }),
             },
-          }),
+          },
         ],
       },
-    })
-      .then((r) => {
-        const billId = r.data.insert_bills.returning[0].id;
+    });
 
-        updateJobLines({
-          variables: {
-            ids: remainingValues.billlines
-              .filter((il) => il.joblineid !== "noline")
-              .map((li) => li.joblineid),
-            status: bodyshop.md_order_statuses.default_received || "Received*",
-            location: location,
-          },
-        }).then((joblineresult) => {
-          /////////////////////////
-          if (upload && upload.length > 0) {
-            //insert Each of the documents?
-            upload.forEach((u) => {
-              handleUpload(
-                { file: u.originFileObj },
-                {
-                  bodyshop: bodyshop,
-                  uploaded_by: currentUser.email,
-                  jobId: values.jobid,
-                  billId: billId,
-                  tagsArray: null,
-                  callback: null,
-                }
-              );
-            });
-          }
-          ///////////////////////////
-          setLoading(false);
-          notification["success"]({
-            message: t("bills.successes.created"),
-          });
-          if (billEnterModal.actions.refetch) billEnterModal.actions.refetch();
-
-          if (enterAgain) {
-            form.resetFields();
-            form.setFieldsValue({ billlines: [] });
-          } else {
-            toggleModalVisible();
-          }
-          setEnterAgain(false);
-        });
-      })
-      .catch((error) => {
-        setLoading(false);
-        setEnterAgain(false);
-        notification["error"]({
-          message: t("bills.errors.creating", {
-            message: JSON.stringify(error),
-          }),
-        });
+    if (!!r1.errors) {
+      setLoading(false);
+      setEnterAgain(false);
+      notification["error"]({
+        message: t("bills.errors.creating", {
+          message: JSON.stringify(r1.errors),
+        }),
       });
+    }
+
+    const billId = r1.data.insert_bills.returning[0].id;
+
+    await updateJobLines({
+      variables: {
+        ids: remainingValues.billlines
+          .filter((il) => il.joblineid !== "noline")
+          .map((li) => li.joblineid),
+        status: bodyshop.md_order_statuses.default_received || "Received*",
+        location: location,
+      },
+    });
+
+    console.log("adjustmentsToInsert", adjustmentsToInsert);
+
+    /////////////////////////
+    if (upload && upload.length > 0) {
+      //insert Each of the documents?
+      upload.forEach((u) => {
+        handleUpload(
+          { file: u.originFileObj },
+          {
+            bodyshop: bodyshop,
+            uploaded_by: currentUser.email,
+            jobId: values.jobid,
+            billId: billId,
+            tagsArray: null,
+            callback: null,
+          }
+        );
+      });
+    }
+    ///////////////////////////
+    setLoading(false);
+    notification["success"]({
+      message: t("bills.successes.created"),
+    });
+    if (billEnterModal.actions.refetch) billEnterModal.actions.refetch();
+
+    if (enterAgain) {
+      form.resetFields();
+      form.setFieldsValue({ billlines: [] });
+    } else {
+      toggleModalVisible();
+    }
+    setEnterAgain(false);
   };
 
   const handleCancel = () => {