Merged in feature/IO-3503-Job-Costing-Fixes (pull request #2921)

IO-3503 Job Costing Corrections

Approved-by: Dave Richer

server/fortellis/fortellis.js

@@ -306,8 +306,7 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
             CreateFortellisLogEvent(socket, "ERROR", `{7.1} Error posting vehicle service history. ${error.message}`);
           }
 
-          //TODO: IF THE VEHICLE SERVICE HISTORY FAILS, WE NEED TO MARK IT AS SUCH AND NOT DELETE THE TRANSACTION.
-          //socket.emit("export-success", JobData.id);
+          socket.emit("export-success", JobData.id);
         } else {
           //There was something wrong. Throw an error to trigger clean up. 
           //throw new Error("Error posting DMS Batch Transaction");
@@ -431,10 +430,10 @@ async function QueryDmsCustomerByName({ socket, redisHelpers, JobData }) {
   const ownerName =
     JobData.ownr_co_nm && JobData.ownr_co_nm.trim() !== ""
       //? [["firstName", JobData.ownr_co_nm.replace(replaceSpecialRegex, "").toUpperCase()]] // Commented out until we receive direction. 
-      ? [["email", JobData.ownr_ea.toUpperCase()]]
+      ? [["phone", JobData.ownr_ph1?.replace(replaceSpecialRegex, "")]]
       : [
-        ["firstName", JobData.ownr_fn.replace(replaceSpecialRegex, "").toUpperCase()],
-        ["lastName", JobData.ownr_ln.replace(replaceSpecialRegex, "").toUpperCase()]
+        ["firstName", JobData.ownr_fn?.replace(replaceSpecialRegex, "").toUpperCase()],
+        ["lastName", JobData.ownr_ln?.replace(replaceSpecialRegex, "").toUpperCase()]
       ];
   try {
     const result = await MakeFortellisCall({

server/graphql-client/queries.js

@@ -1725,6 +1725,7 @@ query QUERY_JOB_COSTING_DETAILS($id: uuid!) {
         profitcenter_part
         profitcenter_labor
         act_price_before_ppc
+        manual_line
       }
       bills {
         id
@@ -1842,6 +1843,7 @@ exports.QUERY_JOB_COSTING_DETAILS_MULTI = ` query QUERY_JOB_COSTING_DETAILS_MULT
       op_code_desc
       profitcenter_part
       profitcenter_labor
+      manual_line
     }
     bills {
       id

server/job/job-costing.js

@@ -343,7 +343,7 @@ function GenerateCostingData(job) {
           if (!acc.labor[laborProfitCenter]) acc.labor[laborProfitCenter] = Dinero();
           acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter].add(laborAmount);
 
-          if (val.act_price > 0 && val.lbr_op === "OP14") {
+          if (val.act_price > 0 && val.lbr_op === "OP14" && !val.part_type) {
             //Scenario where SGI may pay out hours using a part price.
             acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter].add(
               Dinero({
@@ -363,6 +363,9 @@ function GenerateCostingData(job) {
             if (val.mod_lbr_ty !== "LAR" && mashOpCodes.includes(val.lbr_op)) {
               materialsHours.mashHrs += val.mod_lb_hrs || 0;
             }
+            if (val.manual_line === true && !mashOpCodes.includes(val.lbr_op) && val.mod_lbr_ty !== "LAR" ) {
+              materialsHours.mashHrs += val.mod_lb_hrs || 0;
+            }
           }
         }
 
@@ -499,7 +502,7 @@ function GenerateCostingData(job) {
     let disc = Dinero(),
       markup = Dinero();
     const convertedKey = Object.keys(defaultProfits).find((k) => defaultProfits[k] === key);
-    if (job.parts_tax_rates && job.parts_tax_rates[convertedKey.toUpperCase()]) {
+    if (convertedKey && job.parts_tax_rates && job.parts_tax_rates[convertedKey.toUpperCase()]) {
       if (
         job.parts_tax_rates[convertedKey.toUpperCase()].prt_discp !== undefined &&
         job.parts_tax_rates[convertedKey.toUpperCase()].prt_discp >= 0
@@ -523,14 +526,16 @@ function GenerateCostingData(job) {
     }
 
     if (InstanceManager({ rome: true })) {
-      const correspondingCiecaStlTotalLine = job.cieca_stl?.data.find(
-        (c) => c.ttl_typecd === convertedKey.toUpperCase()
-      );
-      if (
-        correspondingCiecaStlTotalLine &&
-        Math.abs(jobLineTotalsByProfitCenter.parts[key].getAmount() - correspondingCiecaStlTotalLine.ttl_amt * 100) > 1
-      ) {
-        jobLineTotalsByProfitCenter.parts[key] = jobLineTotalsByProfitCenter.parts[key].add(disc).add(markup);
+      if (convertedKey) {
+        const correspondingCiecaStlTotalLine = job.cieca_stl?.data.find(
+          (c) => c.ttl_typecd === convertedKey.toUpperCase()
+        );
+        if (
+          correspondingCiecaStlTotalLine &&
+          Math.abs(jobLineTotalsByProfitCenter.parts[key].getAmount() - correspondingCiecaStlTotalLine.ttl_amt * 100) > 1
+        ) {
+          jobLineTotalsByProfitCenter.parts[key] = jobLineTotalsByProfitCenter.parts[key].add(disc).add(markup);
+        }
       }
     }
   });