Merged in feature/2021-07-09 (pull request #130)

feature/2021-07-09

Approved-by: Patrick Fic

client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js

@@ -11,6 +11,7 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
     query: GET_ALL_JOBLINES_BY_PK,
     variables: { id: jobId },
   });
+
   const existingLines = _.cloneDeep(existingLinesFromDb);
   const linesToInsert = [];
   const linesToUpdate = [];
@@ -19,11 +20,14 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
     const matchingIndex = existingLines.findIndex(
       (eL) => eL.unq_seq === newLine.unq_seq
     );
+
+    //Should do a check to make sure there is only 1 matching unq sequence number.
+
     if (matchingIndex >= 0) {
       //Found a relevant matching line. Add it to lines to update.
       linesToUpdate.push({
         id: existingLines[matchingIndex].id,
-        newData: newLine,
+        newData: { ...newLine, removed: false },
       });
 
       //Splice out item we found for performance.

client/src/graphql/jobs-lines.queries.js

@@ -23,19 +23,6 @@ export const GET_ALL_JOBLINES_BY_PK = gql`
       notes
       location
       tax_part
-      parts_order_lines {
-        id
-        parts_order {
-          id
-          order_number
-          order_date
-          user_email
-          vendor {
-            id
-            name
-          }
-        }
-      }
     }
   }
 `;

server/accounting/qbxml/qbxml-utils.js

@@ -17,12 +17,13 @@ exports.generateOwnerTier = (jobs_by_pk, isThreeTier, twotierpref) => {
   if (isThreeTier) {
     //It's always gonna be the owner now. Same as 2 tier by name
     return jobs_by_pk.ownr_co_nm
-      ? `${jobs_by_pk.ownr_co_nm} - ${jobs_by_pk.ownr_ln || ""} ${
-          jobs_by_pk.ownr_fn || ""
-        } #${jobs_by_pk.owner.accountingid || ""}`
-      : `${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""} #${
+      ? `${jobs_by_pk.ownr_co_nm.substring(0, 30)} #${
           jobs_by_pk.owner.accountingid || ""
-        }`;
+        }`
+      : `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}`.substring(
+          0,
+          30
+        )} #${jobs_by_pk.owner.accountingid || ""}`;
   } else {
     //What's the 2 tier pref?
     if (twotierpref === "source") {
@@ -31,12 +32,12 @@ exports.generateOwnerTier = (jobs_by_pk, isThreeTier, twotierpref) => {
     } else {
       //Same as 3 tier
       return jobs_by_pk.ownr_co_nm
-        ? `${jobs_by_pk.ownr_co_nm} - ${jobs_by_pk.ownr_ln || ""} ${
-            jobs_by_pk.ownr_fn || ""
-          } #${jobs_by_pk.owner.accountingid || ""}`
-        : `${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""} #${
+        ? `${jobs_by_pk.ownr_co_nm.substring(0, 30)} #${
             jobs_by_pk.owner.accountingid || ""
-          }`;
+          }`
+        : `${`${jobs_by_pk.ownr_ln || ""} ${
+            jobs_by_pk.ownr_fn || ""
+          }`.substring(0, 30)} #${jobs_by_pk.owner.accountingid || ""}`;
     }
   }
 };

server/graphql-client/queries.js

@@ -57,6 +57,7 @@ query QUERY_JOBS_FOR_RECEIVABLES_EXPORT($ids: [uuid!]!) {
     ownerid
     ownr_ln
     ownr_fn
+    ownr_co_nm
     ownr_addr1
     ownr_addr2
     ownr_zip