From 2579558090d1fe1b798883a1b9c7e1bd676c09de Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 8 Mar 2022 14:47:01 -0800
Subject: [PATCH 1/4] IO-1606 IO-1607 IO-1752 Move towing rates.

---
 .../job-bills-total.component.jsx                |  6 +++---
 .../job-reconciliation-modal.component.jsx       |  6 +++++-
 server/job/job-totals.js                         | 16 +++++++++++-----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/client/src/components/job-bills-total/job-bills-total.component.jsx b/client/src/components/job-bills-total/job-bills-total.component.jsx
index 011a9b80f..ef9e0da35 100644
--- a/client/src/components/job-bills-total/job-bills-total.component.jsx
+++ b/client/src/components/job-bills-total/job-bills-total.component.jsx
@@ -64,9 +64,9 @@ export default function JobBillsTotalComponent({
     })
   );
 
-  const totalPartsSublet = Dinero(totals.parts.parts.total).add(
-    Dinero(totals.parts.sublets.total)
-  );
+  const totalPartsSublet = Dinero(totals.parts.parts.total)
+    .add(Dinero(totals.parts.sublets.total))
+    .add(Dinero(totals.additional.towing));
 
   const discrepancy = totalPartsSublet.subtract(billTotals);
 
diff --git a/client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx b/client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx
index f817a4e73..cde3abc6c 100644
--- a/client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx
+++ b/client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx
@@ -18,7 +18,11 @@ export default function JobReconciliationModalComponent({ job, bills }) {
       .flat() || [];
 
   const jobLineData = job.joblines.filter(
-    (j) => j.part_type !== null && j.part_type !== "PAE"
+    (j) =>
+      (j.part_type !== null && j.part_type !== "PAE") ||
+      (j.line_desc &&
+        j.line_desc.toLowerCase().includes("towing") &&
+        j.lbr_op === "OP13")
   );
 
   return (
diff --git a/server/job/job-totals.js b/server/job/job-totals.js
index 31dc995a6..f6ef1fda6 100644
--- a/server/job/job-totals.js
+++ b/server/job/job-totals.js
@@ -418,21 +418,27 @@ function CalculateAdditional(job) {
     pvrt: null,
     total: null,
   };
+  ret.towing = Dinero({
+    amount: Math.round((job.towing_payable || 0) * 100),
+  });
   ret.additionalCosts = job.joblines
     .filter((jl) => !jl.removed && IsAdditionalCost(jl))
     .reduce((acc, val) => {
       const lineValue = Dinero({
         amount: Math.round((val.act_price || 0) * 100),
       }).multiply(val.part_qty || 1);
-      ret.additionalCostItems.push({ key: val.line_desc, total: lineValue });
-      return acc.add(lineValue);
+
+      if (val.line_desc.toLowerCase().includes("towing")) {
+        ret.towing = lineValue;
+        return acc;
+      } else {
+        ret.additionalCostItems.push({ key: val.line_desc, total: lineValue });
+        return acc.add(lineValue);
+      }
     }, Dinero());
   ret.adjustments = Dinero({
     amount: Math.round((job.adjustment_bottom_line || 0) * 100),
   });
-  ret.towing = Dinero({
-    amount: Math.round((job.towing_payable || 0) * 100),
-  });
   ret.storage = Dinero({
     amount: Math.round((job.storage_payable || 0) * 100),
   });

From 2e2a4920ca5204b83cd4baab77d0e03900ba9e38 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 10 Mar 2022 10:55:44 -0800
Subject: [PATCH 2/4] IO-1772 Add label for no vehicle info.

---
 bodyshop_translations.babel                   | 23 ++++++++++++++++++-
 .../jobs-detail-header.component.jsx          | 13 ++++++++---
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index b94eb957c..fb5525ca5 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -43353,6 +43353,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>novehinfo</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>relatedjobs</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index 59ca3821c..0e1ddc327 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -60,6 +60,13 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
     );
   }, [job.status, bodyshop.md_ro_statuses.post_production_statuses]);
 
+  const vehicleTitle = `${job.v_model_yr || ""} ${job.v_color || ""}
+  ${job.v_make_desc || ""} 
+  ${job.v_model_desc || ""}`.trim();
+  console.log(
+    "🚀  ~ file: jobs-detail-header.component.jsx  ~ line 64  ~ vehicleTitle",
+    vehicleTitle.length
+  );
   return (
     <Row gutter={[16, 16]} style={{ alignItems: "stretch" }}>
       <Col {...colSpan}>
@@ -188,9 +195,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                     : job.vehicle && `/manage/vehicles/${job.vehicle.id}`
                 }
               >
-                {`${job.v_model_yr || ""} ${job.v_color || ""}
-        ${job.v_make_desc || ""} 
-        ${job.v_model_desc || ""}`}
+                {vehicleTitle.length > 0
+                  ? vehicleTitle
+                  : t("vehicles.labels.novehinfo")}
               </Link>
             ) : (
               <span></span>
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index d8f5825dc..91adfc3bc 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2578,6 +2578,7 @@
 			},
 			"labels": {
 				"fromvehicle": "Historical Vehicle Record",
+				"novehinfo": "No Vehicle Information",
 				"relatedjobs": "Related Jobs",
 				"updatevehicle": "Update Vehicle Information"
 			},
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 7b695ceef..9b29f820b 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2578,6 +2578,7 @@
 			},
 			"labels": {
 				"fromvehicle": "",
+				"novehinfo": "",
 				"relatedjobs": "",
 				"updatevehicle": ""
 			},
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 7bfc53f31..20d039f34 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2578,6 +2578,7 @@
 			},
 			"labels": {
 				"fromvehicle": "",
+				"novehinfo": "",
 				"relatedjobs": "",
 				"updatevehicle": ""
 			},

From 471756d7ad1ef93ed426deb14cdc09c12cac0494 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 10 Mar 2022 11:00:13 -0800
Subject: [PATCH 3/4] IO-1769 Resolve error on part selection.

---
 client/src/components/job-detail-lines/job-lines.component.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index d23e1d090..e00fa21c3 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -462,7 +462,7 @@ export function JobLinesComponent({
           };
         }}
         rowSelection={{
-          selectedRowKeys: selectedLines.map((item) => item.id),
+          selectedRowKeys: selectedLines.map((item) => item && item.id),
           onSelectAll: (selected, selectedRows, changeRows) => {
             setSelectedLines(selectedRows);
           },

From 839c82abb9db0d36280f4bc7d650ae2887cdef37 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Fri, 11 Mar 2022 08:11:44 -0800
Subject: [PATCH 4/4] IO-1776 Mechanical authorization added to print center.

---
 bodyshop_translations.babel               | 23 ++++++++++++++++++++++-
 client/src/translations/en_us/common.json |  1 +
 client/src/translations/es/common.json    |  1 +
 client/src/translations/fr/common.json    |  1 +
 client/src/utils/TemplateConstants.js     |  8 ++++++++
 5 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index fb5525ca5..e3e62a467 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -34752,6 +34752,27 @@
                                             </concept_node>
                                         </children>
                                     </folder_node>
+                                    <concept_node>
+                                        <name>mechanical_authorization</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>mpi_animal_checklist</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 91adfc3bc..9cee773e8 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2068,6 +2068,7 @@
 					"labels": "Labels",
 					"position": "Starting Position"
 				},
+				"mechanical_authorization": "Mechanical Authorization",
 				"mpi_animal_checklist": "MPI - Animal Checklist",
 				"mpi_eglass_auth": "MPI - eGlass Auth",
 				"mpi_final_acct_sheet": "MPI - Final Accounting Sheet",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 9b29f820b..fffc38b2b 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2068,6 +2068,7 @@
 					"labels": "",
 					"position": ""
 				},
+				"mechanical_authorization": "",
 				"mpi_animal_checklist": "",
 				"mpi_eglass_auth": "",
 				"mpi_final_acct_sheet": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 20d039f34..faf9dfd0b 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2068,6 +2068,7 @@
 					"labels": "",
 					"position": ""
 				},
+				"mechanical_authorization": "",
 				"mpi_animal_checklist": "",
 				"mpi_eglass_auth": "",
 				"mpi_final_acct_sheet": "",
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index b478fd969..8f7db6bad 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -37,6 +37,14 @@ export const TemplateList = (type, context) => {
             disabled: false,
             group: "authorization",
           },
+          mechanical_authorization: {
+            title: i18n.t("printcenter.jobs.mechanical_authorization"),
+            description: "Diagnostic Authorization",
+            subject: i18n.t("printcenter.jobs.mechanical_authorization"),
+            key: "mechanical_authorization",
+            disabled: false,
+            group: "authorization",
+          },
           appointment_reminder: {
             title: i18n.t("printcenter.jobs.appointment_reminder"),
             description: "All Jobs Notes",