From 664f4a6e6784382055f3b55867622ad1f44b5421 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 4 Mar 2021 09:05:46 -0800
Subject: [PATCH] Reorder totals table IO-734

---
 bodyshop_translations.babel                   |  2 +-
 .../job-totals-table.component.jsx            | 28 +++++++++----------
 client/src/translations/en_us/common.json     |  2 +-
 client/src/translations/es/common.json        |  2 +-
 client/src/translations/fr/common.json        |  2 +-
 client/src/utils/TemplateConstants.js         |  8 +++---
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 500460478..5d73035cc 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -25619,7 +25619,7 @@
                                         </translations>
                                     </concept_node>
                                     <concept_node>
-                                        <name>filing_coverhseet_portrait</name>
+                                        <name>filing_coversheet_portrait</name>
                                         <definition_loaded>false</definition_loaded>
                                         <description></description>
                                         <comment></comment>
diff --git a/client/src/components/job-totals-table/job-totals-table.component.jsx b/client/src/components/job-totals-table/job-totals-table.component.jsx
index feccaeb4b..7da4b2bfb 100644
--- a/client/src/components/job-totals-table/job-totals-table.component.jsx
+++ b/client/src/components/job-totals-table/job-totals-table.component.jsx
@@ -267,6 +267,14 @@ export function JobsTotalsTableComponent({ bodyshop, jobRO, job }) {
             </Typography.Title>
             <table>
               <tbody>
+                <tr>
+                  <td>{t("jobs.labels.subtotal")}</td>
+                  <td className="currency">
+                    <strong>
+                      {Dinero(job.job_totals.totals.subtotal).toFormat()}
+                    </strong>
+                  </td>
+                </tr>
                 <tr>
                   <td>{t("jobs.labels.local_tax_amt")}</td>
                   <td className="currency">
@@ -317,26 +325,18 @@ export function JobsTotalsTableComponent({ bodyshop, jobRO, job }) {
                     ).toFormat()}
                   </td>
                 </tr>
-                <tr>
-                  <td>{t("jobs.labels.total_cust_payable")}</td>
-                  <td className="currency">
-                    {Dinero(job.job_totals.totals.custPayable.total).toFormat()}
-                  </td>
-                </tr>
-                <tr>
-                  <td>{t("jobs.labels.subtotal")}</td>
-                  <td className="currency">
-                    <strong>
-                      {Dinero(job.job_totals.totals.subtotal).toFormat()}
-                    </strong>
-                  </td>
-                </tr>
                 <tr>
                   <td>{t("jobs.labels.total_repairs")}</td>
                   <td className="currency">
                     {Dinero(job.job_totals.totals.total_repairs).toFormat()}
                   </td>
                 </tr>
+                <tr>
+                  <td>{t("jobs.labels.total_cust_payable")}</td>
+                  <td className="currency">
+                    {Dinero(job.job_totals.totals.custPayable.total).toFormat()}
+                  </td>
+                </tr>
                 <tr>
                   <td>{t("jobs.labels.net_repairs")}</td>
                   <td className="currency">
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 8e8dc5e03..b6f7ebb49 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1552,7 +1552,7 @@
 				"diagnostic_authorization": "Diagnostic Authorization",
 				"estimate": "Estimate Only",
 				"estimate_detail": "Estimate Details",
-				"filing_coverhseet_portrait": "Filing Coversheet (Portrait)",
+				"filing_coversheet_portrait": "Filing Coversheet (Portrait)",
 				"final_invoice": "Final Invoice",
 				"fippa_authorization": "FIPPA Authorization",
 				"glass_express_checklist": "Glass Express Checklist",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index f5a249315..6b82ab965 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1552,7 +1552,7 @@
 				"diagnostic_authorization": "",
 				"estimate": "",
 				"estimate_detail": "",
-				"filing_coverhseet_portrait": "",
+				"filing_coversheet_portrait": "",
 				"final_invoice": "",
 				"fippa_authorization": "",
 				"glass_express_checklist": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 7c327bf1a..62dc9d20c 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1552,7 +1552,7 @@
 				"diagnostic_authorization": "",
 				"estimate": "",
 				"estimate_detail": "",
-				"filing_coverhseet_portrait": "",
+				"filing_coversheet_portrait": "",
 				"final_invoice": "",
 				"fippa_authorization": "",
 				"glass_express_checklist": "",
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 0867d1784..47a4e5054 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -167,11 +167,11 @@ export const TemplateList = (type, context) => {
             key: "coversheet_portrait",
             disabled: false,
           },
-          filing_coverhseet_portrait: {
-            title: i18n.t("printcenter.jobs.filing_coverhseet_portrait"),
+          filing_coversheet_portrait: {
+            title: i18n.t("printcenter.jobs.filing_coversheet_portrait"),
             description: "All Jobs Notes",
-            subject: i18n.t("printcenter.jobs.filing_coverhseet_portrait"),
-            key: "filing_coverhseet_portrait",
+            subject: i18n.t("printcenter.jobs.filing_coversheet_portrait"),
+            key: "filing_coversheet_portrait",
             disabled: false,
           },
         }