IO-3522 Replace Email with Phone1

Signed-off-by: Allan Carr <allan@imexsystems.ca>

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,7 +1725,6 @@ query QUERY_JOB_COSTING_DETAILS($id: uuid!) {
         profitcenter_part
         profitcenter_labor
         act_price_before_ppc
-        manual_line
       }
       bills {
         id
@@ -1843,7 +1842,6 @@ 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

@@ -2,7 +2,6 @@ const _ = require("lodash");
 const Dinero = require("dinero.js");
 const queries = require("../graphql-client/queries");
 const logger = require("../utils/logger");
-const { ParseCalopCode } = require("../job/job-totals-USA");
 const InstanceManager = require("../utils/instanceMgr").default;
 const { DiscountNotAlreadyCounted } = InstanceManager({
   imex: require("../job/job-totals"),
@@ -266,9 +265,6 @@ function GenerateCostingData(job) {
   );
 
   const materialsHours = { mapaHrs: 0, mashHrs: 0 };
-  let mashOpCodes = InstanceManager({
-    rome: ParseCalopCode(job.materials["MASH"]?.cal_opcode)
-  });
   let hasMapaLine = false;
   let hasMashLine = false;
 
@@ -343,7 +339,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" && !val.part_type) {
+          if (val.act_price > 0 && val.lbr_op === "OP14") {
             //Scenario where SGI may pay out hours using a part price.
             acc.labor[laborProfitCenter] = acc.labor[laborProfitCenter].add(
               Dinero({
@@ -355,17 +351,8 @@ function GenerateCostingData(job) {
           if (val.mod_lbr_ty === "LAR") {
             materialsHours.mapaHrs += val.mod_lb_hrs || 0;
           }
-          if (InstanceManager({ imex: true, rome: false })) {
-            if (val.mod_lbr_ty !== "LAR") {
-              materialsHours.mashHrs += val.mod_lb_hrs || 0;
-            }
-          } else {
-            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;
-            }
+          if (val.mod_lbr_ty !== "LAR") {
+            materialsHours.mashHrs += val.mod_lb_hrs || 0;
           }
         }
 
@@ -411,6 +398,32 @@ function GenerateCostingData(job) {
                 : Dinero()
             );
 
+          // Profile Discount for Parts
+          if (job.parts_tax_rates && job.parts_tax_rates[val.part_type.toUpperCase()]) {
+            if (
+              job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp !== undefined &&
+              job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp >= 0
+            ) {
+              const discountRate =
+                Math.abs(job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp) > 1
+                  ? job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp
+                  : job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp * 100;
+              const disc = partsAmount.percentage(discountRate).multiply(-1);
+              partsAmount = partsAmount.add(disc);
+            }
+            if (
+              job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp !== undefined &&
+              job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp >= 0
+            ) {
+              const markupRate =
+                Math.abs(job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp) > 1
+                  ? job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp
+                  : job.parts_tax_rates[val.part_type.toUpperCase()].prt_mkupp * 100;
+              const markup = partsAmount.percentage(markupRate);
+              partsAmount = partsAmount.add(markup);
+            }
+          }
+
           if (!acc.parts[partsProfitCenter]) acc.parts[partsProfitCenter] = Dinero();
           acc.parts[partsProfitCenter] = acc.parts[partsProfitCenter].add(partsAmount);
         }
@@ -497,67 +510,10 @@ function GenerateCostingData(job) {
       { parts: {}, labor: {}, additional: {}, sublet: {} }
     );
 
-  // Profile Discount for Parts
-  Object.keys(jobLineTotalsByProfitCenter.parts).forEach((key) => {
-    let disc = Dinero(),
-      markup = Dinero();
-    const convertedKey = Object.keys(defaultProfits).find((k) => defaultProfits[k] === key);
-    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
-      ) {
-        const discountRate =
-          Math.abs(job.parts_tax_rates[convertedKey.toUpperCase()].prt_discp) > 1
-            ? job.parts_tax_rates[convertedKey.toUpperCase()].prt_discp
-            : job.parts_tax_rates[convertedKey.toUpperCase()].prt_discp * 100;
-        disc = jobLineTotalsByProfitCenter.parts[key].percentage(discountRate).multiply(-1);
-      }
-      if (
-        job.parts_tax_rates[convertedKey.toUpperCase()].prt_mkupp !== undefined &&
-        job.parts_tax_rates[convertedKey.toUpperCase()].prt_mkupp >= 0
-      ) {
-        const markupRate =
-          Math.abs(job.parts_tax_rates[convertedKey.toUpperCase()].prt_mkupp) > 1
-            ? job.parts_tax_rates[convertedKey.toUpperCase()].prt_mkupp
-            : job.parts_tax_rates[convertedKey.toUpperCase()].prt_mkupp * 100;
-        markup = jobLineTotalsByProfitCenter.parts[key].percentage(markupRate);
-      }
-    }
-
-    if (InstanceManager({ rome: true })) {
-      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);
-        }
-      }
-    }
-  });
-
   if (!hasMapaLine) {
-    let threshold;
-    if (
-      job.materials["MAPA"] &&
-      job.materials["MAPA"].cal_maxdlr !== undefined &&
-      job.materials["MAPA"].cal_maxdlr >= 0
-    ) {
-      //It has an upper threshhold.
-      threshold = Dinero({
-        amount: Math.round(job.materials["MAPA"].cal_maxdlr * 100)
-      });
-    }
-
     if (!jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]])
       jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]] = Dinero();
 
-    const origMAPAAmount = jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]];
-
     jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]] = jobLineTotalsByProfitCenter.additional[
       defaultProfits["MAPA"]
     ].add(
@@ -585,29 +541,11 @@ function GenerateCostingData(job) {
         .percentage(adjp < 0 ? adjp * -1 : adjp)
         .multiply(adjp < 0 ? -1 : 1)
     );
-
-    if (threshold && jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]].greaterThanOrEqual(threshold)) {
-      jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]] = threshold.add(origMAPAAmount);
-    }
   }
   if (!hasMashLine) {
-    let threshold;
-    if (
-      job.materials["MASH"] &&
-      job.materials["MASH"].cal_maxdlr !== undefined &&
-      job.materials["MASH"].cal_maxdlr >= 0
-    ) {
-      //It has an upper threshhold.
-      threshold = Dinero({
-        amount: Math.round(job.materials["MASH"].cal_maxdlr * 100)
-      });
-    }
-
     if (!jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]])
       jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]] = Dinero();
 
-    const origMASHAmount = jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]];
-
     jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]] = jobLineTotalsByProfitCenter.additional[
       defaultProfits["MASH"]
     ].add(
@@ -635,10 +573,6 @@ function GenerateCostingData(job) {
         .percentage(adjp < 0 ? adjp * -1 : adjp)
         .multiply(adjp < 0 ? -1 : 1)
     );
-
-    if (threshold && jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]].greaterThanOrEqual(threshold)) {
-      jobLineTotalsByProfitCenter.additional[defaultProfits["MASH"]] = threshold.add(origMASHAmount);
-    }
   }
 
   if (InstanceManager({ imex: false, rome: true })) {
@@ -648,34 +582,20 @@ function GenerateCostingData(job) {
     if (!jobLineTotalsByProfitCenter.additional[defaultProfits["TOW"]])
       jobLineTotalsByProfitCenter.additional[defaultProfits["TOW"]] = Dinero();
 
-    if (stlTowing)
-      jobLineTotalsByProfitCenter.additional[defaultProfits["TOW"]] = Dinero({
-        amount: Math.round((stlTowing.ttl_amt || 0) * 100)
-      });
-    if (!stlTowing && job.towing_payable && job.towing_payable > 0)
-      jobLineTotalsByProfitCenter.additional[defaultProfits["TOW"]] = jobLineTotalsByProfitCenter.additional[
-        defaultProfits["TOW"]
-      ].add(
-        Dinero({
+    jobLineTotalsByProfitCenter.additional[defaultProfits["TOW"]] = stlTowing
+      ? Dinero({ amount: Math.round((stlTowing.ttl_amt || 0) * 100) })
+      : Dinero({
           amount: Math.round((job.towing_payable || 0) * 100)
-        })
-      );
+        });
 
     if (!jobLineTotalsByProfitCenter.additional[defaultProfits["STO"]])
       jobLineTotalsByProfitCenter.additional[defaultProfits["STO"]] = Dinero();
 
-    if (stlStorage)
-      jobLineTotalsByProfitCenter.additional[defaultProfits["TOW"]] = Dinero({
-        amount: Math.round((stlStorage.ttl_amt || 0) * 100)
-      });
-    if (!stlStorage && job.storage_payable && job.storage_payable > 0)
-      jobLineTotalsByProfitCenter.additional[defaultProfits["STO"]] = jobLineTotalsByProfitCenter.additional[
-        defaultProfits["STO"]
-      ].add(
-        Dinero({
+    jobLineTotalsByProfitCenter.additional[defaultProfits["STO"]] = stlStorage
+      ? Dinero({ amount: Math.round((stlStorage.ttl_amt || 0) * 100) })
+      : Dinero({
           amount: Math.round((job.storage_payable || 0) * 100)
-        })
-      );
+        });
   }
 
   //Is it a DMS Setup?

server/job/job-totals-USA.js

@@ -1227,8 +1227,6 @@ function ParseCalopCode(opcode) {
   return opcode.trim().split(" ");
 }
 
-exports.ParseCalopCode = ParseCalopCode;
-
 function IsTrueOrYes(value) {
   return value === true || value === "Y" || value === "y";
 }