From 05e6ef08b1b95e999f4e955f64c450441412641d Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 4 Aug 2020 14:14:13 -0700
Subject: [PATCH] Fixed invoice enter UUID error for noline entries BOD-221

---
 .../invoice-enter-modal.container.jsx         | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx b/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx
index dfbdcb856..40c1a1e4e 100644
--- a/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx
+++ b/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx
@@ -38,6 +38,8 @@ function InvoiceEnterModalContainer({
   const [loading, setLoading] = useState(false);
 
   const handleFinish = (values) => {
+    console.log("handleFinish -> values", values);
+
     setLoading(true);
     const { upload, ...remainingValues } = values;
     insertInvoice({
@@ -46,6 +48,11 @@ function InvoiceEnterModalContainer({
           Object.assign({}, remainingValues, {
             invoicelines: {
               data: remainingValues.invoicelines.map((i) => {
+                console.log(
+                  "Initial insert value",
+                  i.joblineid,
+                  i.joblineid === "noline"
+                );
                 return {
                   ...i,
                   joblineid: i.joblineid === "noline" ? null : i.joblineid,
@@ -62,7 +69,7 @@ function InvoiceEnterModalContainer({
         updateJobLines({
           variables: {
             ids: remainingValues.invoicelines
-              .filter((il) => il.joblineid !== " noline")
+              .filter((il) => il.joblineid !== "noline")
               .map((li) => li.joblineid),
             status: bodyshop.md_order_statuses.default_received || "Received*",
           },
@@ -136,17 +143,19 @@ function InvoiceEnterModalContainer({
           </Button>
           {invoiceEnterModal.context && invoiceEnterModal.context.id ? null : (
             <Button
-              type='primary'
+              type="primary"
               loading={loading}
               onClick={() => {
                 setEnterAgain(true);
-              }}>
+              }}
+            >
               {t("general.actions.saveandnew")}
             </Button>
           )}
         </span>
       }
-      destroyOnClose>
+      destroyOnClose
+    >
       <Form
         onFinish={handleFinish}
         autoComplete={"off"}
@@ -163,7 +172,8 @@ function InvoiceEnterModalContainer({
           federal_tax_rate: bodyshop.invoice_tax_rates.federal_tax_rate || 0,
           state_tax_rate: bodyshop.invoice_tax_rates.state_tax_rate || 0,
           local_tax_rate: bodyshop.invoice_tax_rates.local_tax_rate || 0,
-        }}>
+        }}
+      >
         <InvoiceFormContainer form={form} />
       </Form>
     </Modal>