WIP Financial

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

@@ -15,16 +15,16 @@ import InvoiceEnterModalComponent from "./invoice-enter-modal.component";
 
 const mapStateToProps = createStructuredSelector({
   invoiceEnterModal: selectInvoiceEnterModal,
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
 });
-const mapDispatchToProps = dispatch => ({
-  toggleModalVisible: () => dispatch(toggleModalVisible("invoiceEnter"))
+const mapDispatchToProps = (dispatch) => ({
+  toggleModalVisible: () => dispatch(toggleModalVisible("invoiceEnter")),
 });
 
 function InvoiceEnterModalContainer({
   invoiceEnterModal,
   toggleModalVisible,
-  bodyshop
+  bodyshop,
 }) {
   const [form] = Form.useForm();
   const { t } = useTranslation();
@@ -35,45 +35,45 @@ function InvoiceEnterModalContainer({
   const { data: RoAutoCompleteData } = useQuery(ACTIVE_JOBS_FOR_AUTOCOMPLETE, {
     fetchPolicy: "network-only",
     variables: { statuses: bodyshop.md_ro_statuses.open_statuses || ["Open"] },
-    skip: !invoiceEnterModal.visible
+    skip: !invoiceEnterModal.visible,
   });
 
   const { data: VendorAutoCompleteData } = useQuery(
     SEARCH_VENDOR_AUTOCOMPLETE,
     {
       fetchPolicy: "network-only",
-      skip: !invoiceEnterModal.visible
+      skip: !invoiceEnterModal.visible,
     }
   );
 
   const [loadLines, { data: lineData }] = useLazyQuery(
     GET_JOB_LINES_TO_ENTER_INVOICE,
     {
-      fetchPolicy: "network-only"
+      fetchPolicy: "network-only",
     }
   );
 
-  const handleFinish = values => {
+  const handleFinish = (values) => {
     insertInvoice({
       variables: {
         invoice: [
           Object.assign({}, values, {
-            invoicelines: { data: values.invoicelines }
-          })
-        ]
-      }
+            invoicelines: { data: values.invoicelines },
+          }),
+        ],
+      },
     })
-      .then(r => {
+      .then((r) => {
         notification["success"]({
-          message: t("invoices.successes.created")
+          message: t("invoices.successes.created"),
         });
         toggleModalVisible();
       })
-      .catch(error => {
+      .catch((error) => {
         notification["error"]({
           message: t("invoices.errors.creating", {
-            message: JSON.stringify(error)
-          })
+            message: JSON.stringify(error),
+          }),
         });
       });
   };
@@ -82,6 +82,8 @@ function InvoiceEnterModalContainer({
     toggleModalVisible();
   };
 
+  console.log("invoiceEnterModal", invoiceEnterModal);
+
   return (
     <Modal
       title={
@@ -96,7 +98,17 @@ function InvoiceEnterModalContainer({
       onCancel={handleCancel}
       destroyOnClose
     >
-      <Form onFinish={handleFinish} autoComplete={"off"} form={form}>
+      <Form
+        onFinish={handleFinish}
+        autoComplete={"off"}
+        form={form}
+        initialValues={{
+          jobid:
+            (invoiceEnterModal.context.job &&
+              invoiceEnterModal.context.job.id) ||
+            null,
+        }}
+      >
         <InvoiceEnterModalComponent
           form={form}
           roAutoCompleteOptions={RoAutoCompleteData && RoAutoCompleteData.jobs}