From c82a8e6706a15d12cbd303fe72db8fb86348b805 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 6 May 2021 14:40:31 -0700
Subject: [PATCH] IO-1000 IO-1014 IO-1002 IO-1005 Minor label fixes.

---
 bodyshop_translations.babel                   | 23 +++++++-
 .../contracts-find-modal.container.jsx        |  2 +-
 .../job-totals.table.other.component.jsx      |  6 +--
 .../job-totals.table.parts.component.jsx      |  2 +-
 .../shop-info.laborrates.component.jsx        | 54 ++++++++++---------
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 8 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index bc3bb852f..51447326a 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
@@ -12653,6 +12653,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>item</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>label</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx b/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
index 31daf4a4e..ce1fec33b 100644
--- a/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
+++ b/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
@@ -61,7 +61,7 @@ export function ContractsFindModalContainer({
     <Modal
       visible={visible}
       width="70%"
-      title={t("labels.labels.findermodal")}
+      title={t("payments.labels.findermodal")}
       onCancel={() => toggleModalVisible()}
       onOk={() => toggleModalVisible()}
       destroyOnClose
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 c06cd7232..b7c302899 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
@@ -42,7 +42,7 @@ export default function JobTotalsTableOther({ job }) {
 
   const columns = [
     {
-      //title: t("joblines.fields.part_type"),
+      title: t("general.labels.item"),
       dataIndex: "key",
       key: "key",
       sorter: (a, b) => alphaSort(a.key, b.key),
@@ -82,7 +82,7 @@ export default function JobTotalsTableOther({ job }) {
               <strong>{t("jobs.labels.additionaltotal")}</strong>
             </Table.Summary.Cell>
 
-            <Table.Summary.Cell>
+            <Table.Summary.Cell align="right">
               <strong>
                 {Dinero(job.job_totals.additional.total).toFormat()}
               </strong>
@@ -93,7 +93,7 @@ export default function JobTotalsTableOther({ job }) {
               <strong>{t("jobs.labels.subletstotal")}</strong>
             </Table.Summary.Cell>
 
-            <Table.Summary.Cell>
+            <Table.Summary.Cell align="right">
               <strong>
                 {Dinero(job.job_totals.parts.sublets.total).toFormat()}
               </strong>
diff --git a/client/src/components/job-totals-table/job-totals.table.parts.component.jsx b/client/src/components/job-totals-table/job-totals.table.parts.component.jsx
index d71e033b4..7f1b884d6 100644
--- a/client/src/components/job-totals-table/job-totals.table.parts.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.parts.component.jsx
@@ -74,7 +74,7 @@ export default function JobTotalsTableParts({ job }) {
             <strong>{t("jobs.labels.partstotal")}</strong>
           </Table.Summary.Cell>
 
-          <Table.Summary.Cell>
+          <Table.Summary.Cell align="right">
             <strong>
               {Dinero(job.job_totals.parts.parts.total).toFormat()}
             </strong>
diff --git a/client/src/components/shop-info/shop-info.laborrates.component.jsx b/client/src/components/shop-info/shop-info.laborrates.component.jsx
index 27f27a522..1015cad64 100644
--- a/client/src/components/shop-info/shop-info.laborrates.component.jsx
+++ b/client/src/components/shop-info/shop-info.laborrates.component.jsx
@@ -252,32 +252,34 @@ export default function ShopInfoLaborRates({ form }) {
                     >
                       <CurrencyInput />
                     </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_mabl")}
-                      key={`${index}rate_mabl`}
-                      name={[field.name, "rate_mabl"]}
-                      rules={[
-                        {
-                          required: true,
-                          message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <CurrencyInput />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("jobs.fields.rate_macs")}
-                      key={`${index}rate_macs`}
-                      name={[field.name, "rate_macs"]}
-                      rules={[
-                        {
-                          required: true,
-                          message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <CurrencyInput />
-                    </Form.Item>
+                    {
+                      // <Form.Item
+                      //   label={t("jobs.fields.rate_mabl")}
+                      //   key={`${index}rate_mabl`}
+                      //   name={[field.name, "rate_mabl"]}
+                      //   rules={[
+                      //     {
+                      //       required: true,
+                      //       message: t("general.validation.required"),
+                      //     },
+                      //   ]}
+                      // >
+                      //   <CurrencyInput />
+                      // </Form.Item>
+                      // <Form.Item
+                      //   label={t("jobs.fields.rate_macs")}
+                      //   key={`${index}rate_macs`}
+                      //   name={[field.name, "rate_macs"]}
+                      //   rules={[
+                      //     {
+                      //       required: true,
+                      //       message: t("general.validation.required"),
+                      //     },
+                      //   ]}
+                      // >
+                      //   <CurrencyInput />
+                      // </Form.Item>
+                    }
                     <Form.Item
                       label={t("jobs.fields.rate_matd")}
                       key={`${index}rate_matd`}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 9675e079f..60e3ec3ed 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -806,6 +806,7 @@
 				"in": "In",
 				"instanceconflictext": "Your $t(titles.app) account can only be used on one device at any given time. Refresh your session to take control.",
 				"instanceconflictitle": "Your account is being used elsewhere.",
+				"item": "Item",
 				"label": "Label",
 				"loading": "Loading...",
 				"loadingapp": "Loading $t(titles.app)",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 01a2a8fdc..f4add141e 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -806,6 +806,7 @@
 				"in": "en",
 				"instanceconflictext": "",
 				"instanceconflictitle": "",
+				"item": "",
 				"label": "",
 				"loading": "Cargando...",
 				"loadingapp": "Cargando $t(titles.app)",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 57dd91448..b441faf21 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -806,6 +806,7 @@
 				"in": "dans",
 				"instanceconflictext": "",
 				"instanceconflictitle": "",
+				"item": "",
 				"label": "",
 				"loading": "Chargement...",
 				"loadingapp": "Chargement de $t(titles.app)",