Resolve 2 tier by source exporting IO-740

server/accounting/qbxml/qbxml-payments.js

@@ -74,7 +74,7 @@ exports.default = async (req, res) => {
       QbXmlToExecute.push({
         id: i.id,
         okStatusCodes: ["0"],
-        qbxml: generatePayment(i),
+        qbxml: generatePayment(i, isThreeTier, twoTierPref),
       });
     });
 
@@ -85,7 +85,7 @@ exports.default = async (req, res) => {
   }
 };
 
-const generatePayment = (payment) => {
+const generatePayment = (payment, isThreeTier, twoTierPref) => {
   console.log("generatePayment -> payment", payment);
   let paymentQbxmlObj;
   if (payment.amount > 0) {
@@ -99,11 +99,15 @@ const generatePayment = (payment) => {
                 FullName:
                   payment.job.bodyshop.accountingconfig.tiers === 3
                     ? `${generateSourceTier(payment.job)}:${generateOwnerTier(
-                        payment.job
+                        payment.job,
+                        isThreeTier,
+                        twoTierPref
                       )}:${generateJobTier(payment.job)}`
-                    : `${generateOwnerTier(payment.job)}:${generateJobTier(
+                    : `${generateOwnerTier(
-                        payment.job
+                        payment.job,
-                      )}`,
+                        isThreeTier,
+                        twoTierPref
+                      )}:${generateJobTier(payment.job)}`,
               },
               ARAccountRef: {
                 FullName:
@@ -142,11 +146,15 @@ const generatePayment = (payment) => {
                 FullName:
                   payment.job.bodyshop.accountingconfig.tiers === 3
                     ? `${generateSourceTier(payment.job)}:${generateOwnerTier(
-                        payment.job
+                        payment.job,
+                        isThreeTier,
+                        twoTierPref
                       )}:${generateJobTier(payment.job)}`
-                    : `${generateOwnerTier(payment.job)}:${generateJobTier(
+                    : `${generateOwnerTier(
-                        payment.job
+                        payment.job,
-                      )}`,
+                        isThreeTier,
+                        twoTierPref
+                      )}:${generateJobTier(payment.job)}`,
               },
               ARAccountRef: {
                 FullName:

server/accounting/qbxml/qbxml-receivables.js

@@ -39,6 +39,7 @@ exports.default = async (req, res) => {
       const isThreeTier = bodyshop.accountingconfig.tiers === 3;
       const twoTierPref = bodyshop.accountingconfig.twotierpref;
 
+      //This is the Insurance Company tier IF 3 tier is selected.
       if (isThreeTier) {
         QbXmlToExecute.push({
           id: jobs_by_pk.id,
@@ -47,6 +48,8 @@ exports.default = async (req, res) => {
         });
       }
 
+      //If 3 tier, this should be the customer.
+      //If 2 tier, this should be based on the pref.
       QbXmlToExecute.push({
         id: jobs_by_pk.id,
         okStatusCodes: ["0", "3100"],
@@ -59,6 +62,7 @@ exports.default = async (req, res) => {
         ),
       });
 
+      //This is always going to be the job.
       QbXmlToExecute.push({
         id: jobs_by_pk.id,
         okStatusCodes: ["0", "3100"],
@@ -74,7 +78,12 @@ exports.default = async (req, res) => {
       QbXmlToExecute.push({
         id: jobs_by_pk.id,
         okStatusCodes: ["0"],
-        qbxml: generateInvoiceQbxml(jobs_by_pk, bodyshop),
+        qbxml: generateInvoiceQbxml(
+          jobs_by_pk,
+          bodyshop,
+          isThreeTier,
+          twoTierPref
+        ),
       });
     });
 
@@ -130,19 +139,20 @@ const generateJobQbxml = (
   let ParentRefName;
 
   if (tierLevel === 2) {
-    Name = generateOwnerTier(jobs_by_pk);
+    Name = generateOwnerTier(jobs_by_pk, isThreeTier, twoTierPref);
     ParentRefName = isThreeTier ? generateSourceTier(jobs_by_pk) : null;
   } else if (tierLevel === 3) {
     Name = generateJobTier(jobs_by_pk);
     ParentRefName = isThreeTier
-      ? `${jobs_by_pk.ins_co_nm}:${generateOwnerTier(jobs_by_pk)}`
+      ? `${generateSourceTier(jobs_by_pk)}:${generateOwnerTier(jobs_by_pk)}`
-      : generateOwnerTier(jobs_by_pk);
+      : generateOwnerTier(jobs_by_pk, isThreeTier, twoTierPref);
   }
 
   const jobQbxmlObj = {
     QBXML: {
       QBXMLMsgsRq: {
         "@onError": "continueOnError",
+
         CustomerAddRq: {
           CustomerAdd: {
             Name: Name,
@@ -170,7 +180,12 @@ const generateJobQbxml = (
   return jobQbxml_Full;
 };
 exports.generateJobQbxml = generateJobQbxml;
-const generateInvoiceQbxml = (jobs_by_pk, bodyshop) => {
+const generateInvoiceQbxml = (
+  jobs_by_pk,
+  bodyshop,
+  isThreeTier,
+  twoTierPref
+) => {
   //Build the Invoice XML file.
   const InvoiceLineAdd = [];
   const responsibilityCenters = bodyshop.md_responsibility_centers;
@@ -302,9 +317,11 @@ const generateInvoiceQbxml = (jobs_by_pk, bodyshop) => {
                   ? `${generateSourceTier(jobs_by_pk)}:${generateOwnerTier(
                       jobs_by_pk
                     )}:${generateJobTier(jobs_by_pk)}`
-                  : `${generateOwnerTier(jobs_by_pk)}:${generateJobTier(
+                  : `${generateOwnerTier(
-                      jobs_by_pk
+                      jobs_by_pk,
-                    )}`,
+                      isThreeTier,
+                      twoTierPref
+                    )}:${generateJobTier(jobs_by_pk)}`,
             },
 
             ...(jobs_by_pk.class

server/accounting/qbxml/qbxml-utils.js

@@ -13,12 +13,30 @@ exports.generateJobTier = (jobs_by_pk) => {
   return jobs_by_pk.ro_number;
 };
 
-exports.generateOwnerTier = (jobs_by_pk) => {
+exports.generateOwnerTier = (jobs_by_pk, isThreeTier, twotierpref) => {
-  return jobs_by_pk.ownr_co_nm
+  if (isThreeTier) {
-    ? `${jobs_by_pk.ownr_co_nm} - ${jobs_by_pk.ownr_ln || ""} ${
+    //It's always gonna be the owner now. Same as 2 tier by name
-        jobs_by_pk.ownr_fn || ""
+    return jobs_by_pk.ownr_co_nm
-      } #${jobs_by_pk.owner.accountingid || ""}`
+      ? `${jobs_by_pk.ownr_co_nm} - ${jobs_by_pk.ownr_ln || ""} ${
-    : `${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""} #${
+          jobs_by_pk.ownr_fn || ""
-        jobs_by_pk.owner.accountingid || ""
+        } #${jobs_by_pk.owner.accountingid || ""}`
-      }`;
+      : `${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""} #${
+          jobs_by_pk.owner.accountingid || ""
+        }`;
+  } else {
+    //What's the 2 tier pref?
+    if (twotierpref === "source") {
+      return this.generateSourceTier(jobs_by_pk);
+      //It should be the insurance co.
+    } 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.owner.accountingid || ""
+          }`;
+    }
+  }
 };