From 315b816e50656e926e3b5a0f53c89474d3c0115b Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 31 Mar 2021 11:26:22 -0700
Subject: [PATCH] Job Totals Calc Updates

---
 .../job-totals.table.other.component.jsx      | 43 +++++++++-------
 .../jobs-detail-rates.component.jsx           | 51 ++++++++++---------
 .../layout-form-row.component.jsx             |  8 +--
 3 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/client/src/components/job-totals-table/job-totals.table.other.component.jsx b/client/src/components/job-totals-table/job-totals.table.other.component.jsx
index 24f322f71..00925007c 100644
--- a/client/src/components/job-totals-table/job-totals.table.other.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.other.component.jsx
@@ -13,10 +13,6 @@ export default function JobTotalsTableOther({ job }) {
 
   const data = useMemo(() => {
     return [
-      {
-        key: t("jobs.labels.subletstotal"),
-        total: job.job_totals.parts.sublets.total,
-      },
       ...((job.job_totals.additional.additionalCostItems &&
         job.job_totals.additional.additionalCostItems.map((i) => {
           return {
@@ -30,15 +26,15 @@ export default function JobTotalsTableOther({ job }) {
         total: job.job_totals.additional.adjustments,
       },
       {
-        key: t("jobs.fields.towing"),
+        key: t("jobs.fields.towing_payable"),
         total: job.job_totals.additional.towing,
       },
       {
-        key: t("jobs.fields.storage"),
+        key: t("jobs.fields.storage_payable"),
         total: job.job_totals.additional.storage,
       },
       {
-        key: t("jobs.fields.pvrt"),
+        key: t("jobs.fields.ca_bc_pvrt"),
         total: job.job_totals.additional.pvrt,
       },
     ];
@@ -80,17 +76,30 @@ export default function JobTotalsTableOther({ job }) {
         x: true,
       }}
       summary={() => (
-        <Table.Summary.Row>
-          <Table.Summary.Cell>
-            {t("jobs.labels.additionaltotal")}
-          </Table.Summary.Cell>
+        <>
+          <Table.Summary.Row>
+            <Table.Summary.Cell>
+              {t("jobs.labels.additionaltotal")}
+            </Table.Summary.Cell>
 
-          <Table.Summary.Cell>
-            <strong>
-              {Dinero(job.job_totals.additional.total).toFormat()}
-            </strong>
-          </Table.Summary.Cell>
-        </Table.Summary.Row>
+            <Table.Summary.Cell>
+              <strong>
+                {Dinero(job.job_totals.additional.total).toFormat()}
+              </strong>
+            </Table.Summary.Cell>
+          </Table.Summary.Row>
+          <Table.Summary.Row>
+            <Table.Summary.Cell>
+              {t("jobs.labels.subletstotal")}
+            </Table.Summary.Cell>
+
+            <Table.Summary.Cell>
+              <strong>
+                {Dinero(job.job_totals.parts.sublets.total).toFormat()}
+              </strong>
+            </Table.Summary.Cell>
+          </Table.Summary.Row>
+        </>
       )}
     />
   );
diff --git a/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx b/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
index 8a8965a13..c30edf955 100644
--- a/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
+++ b/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
@@ -52,6 +52,33 @@ export function JobsDetailRates({ jobRO, form }) {
         >
           <CurrencyInput disabled={jobRO} />
         </Form.Item>
+
+        <Space align="end">
+          <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
+            <CurrencyInput disabled={jobRO} />
+          </Form.Item>
+          <CABCpvrtCalculator form={form} disabled={jobRO} />
+        </Space>
+      </FormRow>
+      <FormRow>
+        <Form.Item
+          label={t("jobs.fields.federal_tax_rate")}
+          name="federal_tax_rate"
+        >
+          <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+        </Form.Item>
+        <Form.Item
+          label={t("jobs.fields.state_tax_rate")}
+          name="state_tax_rate"
+        >
+          <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+        </Form.Item>
+        <Form.Item
+          label={t("jobs.fields.local_tax_rate")}
+          name="local_tax_rate"
+        >
+          <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
+        </Form.Item>
         <Form.Item
           label={t("jobs.fields.ca_gst_registrant")}
           name="ca_gst_registrant"
@@ -59,12 +86,6 @@ export function JobsDetailRates({ jobRO, form }) {
         >
           <Switch disabled={jobRO} />
         </Form.Item>
-        <Space align="end">
-          <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
-            <CurrencyInput disabled={jobRO} />
-          </Form.Item>
-          <CABCpvrtCalculator form={form} disabled={jobRO} />
-        </Space>
       </FormRow>
       <JobsDetailRatesChangeButton form={form} disabled={jobRO} />
       <FormRow header={t("jobs.forms.laborrates")}>
@@ -134,24 +155,6 @@ export function JobsDetailRates({ jobRO, form }) {
         <Form.Item label={t("jobs.fields.rate_matd")} name="rate_matd">
           <CurrencyInput disabled={jobRO} />
         </Form.Item>
-        <Form.Item
-          label={t("jobs.fields.federal_tax_rate")}
-          name="federal_tax_rate"
-        >
-          <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
-        </Form.Item>
-        <Form.Item
-          label={t("jobs.fields.state_tax_rate")}
-          name="state_tax_rate"
-        >
-          <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
-        </Form.Item>
-        <Form.Item
-          label={t("jobs.fields.local_tax_rate")}
-          name="local_tax_rate"
-        >
-          <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
-        </Form.Item>
       </FormRow>
 
       <JobsDetailRatesParts form={form} />
diff --git a/client/src/components/layout-form-row/layout-form-row.component.jsx b/client/src/components/layout-form-row/layout-form-row.component.jsx
index 94b1b1aa1..cec64c435 100644
--- a/client/src/components/layout-form-row/layout-form-row.component.jsx
+++ b/client/src/components/layout-form-row/layout-form-row.component.jsx
@@ -1,5 +1,5 @@
+import { Col, Divider, Row, Typography } from "antd";
 import React from "react";
-import { Row, Col, Typography } from "antd";
 import "./layout-form-row.styles.scss";
 
 export default function LayoutFormRow({
@@ -41,10 +41,12 @@ export default function LayoutFormRow({
       },
     };
   };
-
+  //{header ? <Typography.Title level={4}>{header}</Typography.Title> : null}
   return (
     <div className="imex-form-row" {...restProps}>
-      {header ? <Typography.Title level={4}>{header}</Typography.Title> : null}
+      <Divider orientation="left" type="horizontal">
+        {header}
+      </Divider>
       <Row {...rowGutter}>
         {children.map(
           (c, idx) =>