From 4e9dea31fdea66bc657c0f27011bec8ab159022c Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 7 Dec 2020 09:45:08 -0800
Subject: [PATCH] Further updates to job totals table.

---
 bodyshop_translations.babel                   |  42 ++++
 .../job-totals-table.component.jsx            | 186 +++++++++---------
 client/src/translations/en_us/common.json     |   2 +
 client/src/translations/es/common.json        |   2 +
 client/src/translations/fr/common.json        |   2 +
 5 files changed, 140 insertions(+), 94 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 4ec22fb52..974604fe4 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -17002,6 +17002,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>jobtotals</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>labor_rates_subtotal</name>
                                         <definition_loaded>false</definition_loaded>
@@ -17191,6 +17212,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>othertotal</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>override_header</name>
                                         <definition_loaded>false</definition_loaded>
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 b96af56b2..88c550b19 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
@@ -1,4 +1,4 @@
-import { Col, Result, Row, Statistic, Typography } from "antd";
+import { Col, Result, Row, Typography } from "antd";
 import Dinero from "dinero.js";
 import { JsonEditor as Editor } from "jsoneditor-react";
 import "jsoneditor-react/es/editor.min.css";
@@ -238,6 +238,14 @@ export function JobsTotalsTableComponent({ bodyshop, jobRO, job }) {
                     </strong>
                   </td>
                 </tr>
+              </tbody>
+            </table>
+
+            <Typography.Title level={4}>
+              {t("jobs.labels.othertotal")}
+            </Typography.Title>
+            <table>
+              <tbody>
                 <tr>
                   <td>{t("jobs.labels.subletstotal")}</td>
                   <td className="currency">
@@ -253,99 +261,89 @@ export function JobsTotalsTableComponent({ bodyshop, jobRO, job }) {
                 </tr>
               </tbody>
             </table>
-            <div
-              className="job-totals-stats"
-              onClick={(e) => {
-                if (e.detail === 3) {
-                  try {
-                    console.log("Job", job);
-                  } catch {
-                    console.log("Unable to show job.");
-                  }
-                }
-              }}
-            >
-              <Statistic
-                title={t("jobs.labels.federal_tax_amt")}
-                value={Dinero(job.job_totals.totals.federal_tax).toFormat()}
-              />
-              <Statistic
-                title={t("jobs.labels.state_tax_amt")}
-                value={Dinero(job.job_totals.totals.state_tax).toFormat()}
-              />
-              <Statistic
-                title={t("jobs.labels.local_tax_amt")}
-                value={Dinero(job.job_totals.totals.local_tax).toFormat()}
-              />
-            </div>
-            <div
-              className="job-totals-stats"
-              onClick={(e) => {
-                if (e.detail === 3) {
-                  try {
-                    console.log("Job", job);
-                  } catch {
-                    console.log("Unable to show job.");
-                  }
-                }
-              }}
-            >
-              <Statistic
-                title={t("jobs.fields.ded_amt")}
-                value={Dinero(
-                  job.job_totals.totals.custPayable.deductible
-                ).toFormat()}
-              />
-              <Statistic
-                title={t("jobs.fields.federal_tax_payable")}
-                value={Dinero(
-                  job.job_totals.totals.custPayable.federal_tax
-                ).toFormat()}
-              />
-              <Statistic
-                title={t("jobs.fields.other_amount_payable")}
-                value={Dinero(
-                  job.job_totals.totals.custPayable.other_customer_amount
-                ).toFormat()}
-              />
-              <Statistic
-                title={t("jobs.fields.depreciation_taxes")}
-                value={Dinero(
-                  job.job_totals.totals.custPayable.dep_taxes
-                ).toFormat()}
-              />
-              <Statistic
-                title={t("jobs.labels.total_cust_payable")}
-                value={Dinero(
-                  job.job_totals.totals.custPayable.total
-                ).toFormat()}
-              />
-            </div>
-            <div
-              className="job-totals-stats"
-              onClick={(e) => {
-                if (e.detail === 3) {
-                  try {
-                    console.log("Job", job);
-                  } catch {
-                    console.log("Unable to show job.");
-                  }
-                }
-              }}
-            >
-              <Statistic
-                title={t("jobs.labels.subtotal")}
-                value={Dinero(job.job_totals.totals.subtotal).toFormat()}
-              />
-              <Statistic
-                title={t("jobs.labels.total_repairs")}
-                value={Dinero(job.job_totals.totals.total_repairs).toFormat()}
-              />
-              <Statistic
-                title={t("jobs.labels.net_repairs")}
-                value={Dinero(job.job_totals.totals.net_repairs).toFormat()}
-              />
-            </div>
+
+            <Typography.Title level={4}>
+              {t("jobs.labels.jobtotals")}
+            </Typography.Title>
+            <table>
+              <tbody>
+                <tr>
+                  <td>{t("jobs.labels.local_tax_amt")}</td>
+                  <td className="currency">
+                    {Dinero(job.job_totals.totals.local_tax).toFormat()}
+                  </td>
+                </tr>
+                <tr>
+                  <td>{t("jobs.labels.state_tax_amt")}</td>
+                  <td className="currency">
+                    {Dinero(job.job_totals.totals.state_tax).toFormat()}
+                  </td>
+                </tr>
+                <tr>
+                  <td>{t("jobs.labels.federal_tax_amt")}</td>
+                  <td className="currency">
+                    {Dinero(job.job_totals.totals.federal_tax).toFormat()}
+                  </td>
+                </tr>
+                <tr>
+                  <td>{t("jobs.fields.ded_amt")}</td>
+                  <td className="currency">
+                    {Dinero(
+                      job.job_totals.totals.custPayable.deductible
+                    ).toFormat()}
+                  </td>
+                </tr>
+                <tr>
+                  <td>{t("jobs.fields.federal_tax_payable")}</td>
+                  <td className="currency">
+                    {Dinero(
+                      job.job_totals.totals.custPayable.federal_tax
+                    ).toFormat()}
+                  </td>
+                </tr>
+                <tr>
+                  <td>{t("jobs.fields.other_amount_payable")}</td>
+                  <td className="currency">
+                    {Dinero(
+                      job.job_totals.totals.custPayable.other_customer_amount
+                    ).toFormat()}
+                  </td>
+                </tr>
+                <tr>
+                  <td>{t("jobs.fields.depreciation_taxes")}</td>
+                  <td className="currency">
+                    {Dinero(
+                      job.job_totals.totals.custPayable.dep_taxes
+                    ).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">
+                    {Dinero(job.job_totals.totals.subtotal).toFormat()}
+                  </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.net_repairs")}</td>
+                  <td className="currency">
+                    {Dinero(job.job_totals.totals.net_repairs).toFormat()}
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+
             <JobCalculateTotals job={job} disabled={jobRO} />
             <Editor
               value={{
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 9767edfed..2ad01e1b7 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1036,6 +1036,7 @@
 				"inproduction": "In Production",
 				"job": "Job Details",
 				"jobcosting": "Job Costing",
+				"jobtotals": "Job Totals",
 				"labor_rates_subtotal": "Labor Rates Subtotal",
 				"laborallocations": "Labor Allocations",
 				"labortotals": "Labor Totals",
@@ -1045,6 +1046,7 @@
 				"mash": "Shop Materials",
 				"net_repairs": "Net Repairs",
 				"notes": "Notes",
+				"othertotal": "Other Totals",
 				"override_header": "Override estimate header on import?",
 				"parts": "Parts",
 				"partsfilter": "Parts Only",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index a7ae094ae..ab7ab92b5 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1036,6 +1036,7 @@
 				"inproduction": "",
 				"job": "",
 				"jobcosting": "",
+				"jobtotals": "",
 				"labor_rates_subtotal": "",
 				"laborallocations": "",
 				"labortotals": "",
@@ -1045,6 +1046,7 @@
 				"mash": "",
 				"net_repairs": "",
 				"notes": "Notas",
+				"othertotal": "",
 				"override_header": "¿Anular encabezado estimado al importar?",
 				"parts": "Partes",
 				"partsfilter": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index f621078a0..23c24cf82 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1036,6 +1036,7 @@
 				"inproduction": "",
 				"job": "",
 				"jobcosting": "",
+				"jobtotals": "",
 				"labor_rates_subtotal": "",
 				"laborallocations": "",
 				"labortotals": "",
@@ -1045,6 +1046,7 @@
 				"mash": "",
 				"net_repairs": "",
 				"notes": "Remarques",
+				"othertotal": "",
 				"override_header": "Remplacer l'en-tête d'estimation à l'importation?",
 				"parts": "les pièces",
 				"partsfilter": "",