From 179147dc4e489cef3ec4eaaece64f34eefc7ca19 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Tue, 19 Jul 2022 13:14:22 -0700
Subject: [PATCH] IO-1755 Add tax number to owner.

---
 bodyshop_translations.babel                   | 44 ++++++++++++++++++-
 .../jobs-detail-header.component.jsx          |  5 +++
 .../owner-detail-form.component.jsx           |  6 +++
 .../owner-detail-form.container.jsx           |  3 +-
 client/src/graphql/jobs.queries.js            |  2 +
 client/src/graphql/owners.queries.js          |  1 +
 client/src/translations/en_us/common.json     |  4 +-
 client/src/translations/es/common.json        |  4 +-
 client/src/translations/fr/common.json        |  4 +-
 hasura/metadata/tables.yaml                   |  2 +
 .../down.sql                                  |  4 ++
 .../up.sql                                    |  2 +
 12 files changed, 76 insertions(+), 5 deletions(-)
 create mode 100644 hasura/migrations/1658259526300_alter_table_public_owners_add_column_tax_number/down.sql
 create mode 100644 hasura/migrations/1658259526300_alter_table_public_owners_add_column_tax_number/up.sql

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index f3acbe9d5..a255053d6 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
@@ -32741,6 +32741,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>saving</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>selectexistingornew</name>
                                         <definition_loaded>false</definition_loaded>
@@ -33145,6 +33166,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>tax_number</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>
                                 </children>
                             </folder_node>
                             <folder_node>
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 8f41cec59..e10257158 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
@@ -181,6 +181,11 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
             <DataLabel key="4" label={t("owners.fields.ownr_ea")}>
               {job.ownr_ea || ""}
             </DataLabel>
+            {job.owner?.tax_number && (
+              <DataLabel key="5" label={t("owners.fields.tax_number")}>
+                {job.owner?.tax_number || ""}
+              </DataLabel>
+            )}
           </div>
         </Card>
       </Col>
diff --git a/client/src/components/owner-detail-form/owner-detail-form.component.jsx b/client/src/components/owner-detail-form/owner-detail-form.component.jsx
index f5fe04d5d..7178aa322 100644
--- a/client/src/components/owner-detail-form/owner-detail-form.component.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.component.jsx
@@ -94,6 +94,12 @@ export default function OwnerDetailFormComponent({ form, loading }) {
         >
           <Input />
         </Form.Item>
+        <Form.Item
+          label={t("owners.fields.tax_number")}
+          name="tax_number"
+        >
+          <Input />
+        </Form.Item>
       </LayoutFormRow>
       <Form.Item label={t("owners.fields.note")} name="note">
         <Input.TextArea rows={4} />
diff --git a/client/src/components/owner-detail-form/owner-detail-form.container.jsx b/client/src/components/owner-detail-form/owner-detail-form.container.jsx
index 464893ebb..95f14ec00 100644
--- a/client/src/components/owner-detail-form/owner-detail-form.container.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.container.jsx
@@ -20,9 +20,10 @@ function OwnerDetailFormContainer({ owner, refetch }) {
     if (!!result.errors) {
       notification["error"]({
         message: t("owners.errors.saving", {
-          message: JSON.stringify(result.errors),
+          error: JSON.stringify(result.errors),
         }),
       });
+      setLoading(false);
       return;
     }
 
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index e018c1b63..71534b18d 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -621,6 +621,7 @@ export const GET_JOB_BY_PK = gql`
         ownr_ctry
         ownr_ph1
         ownr_ph2
+        tax_number
       }
       labor_rate_desc
       rate_la1
@@ -855,6 +856,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         id
         allow_text_message
         preferred_contact
+        tax_number
       }
       vehicleid
       v_model_yr
diff --git a/client/src/graphql/owners.queries.js b/client/src/graphql/owners.queries.js
index 8ff0736d2..d88f4ca32 100644
--- a/client/src/graphql/owners.queries.js
+++ b/client/src/graphql/owners.queries.js
@@ -67,6 +67,7 @@ export const QUERY_OWNER_BY_ID = gql`
       ownr_zip
       preferred_contact
       note
+      tax_number
       jobs {
         id
         ro_number
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index c24b987c0..e9e055244 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1937,6 +1937,7 @@
 			},
 			"errors": {
 				"noaccess": "The record does not exist or you do not have access to it.  ",
+				"saving": "Error saving owner. {{error}}.",
 				"selectexistingornew": "Select an existing owner record or create a new one. "
 			},
 			"fields": {
@@ -1957,7 +1958,8 @@
 				"ownr_st": "Province/State",
 				"ownr_title": "Title",
 				"ownr_zip": "Zip/Postal Code",
-				"preferred_contact": "Preferred Contact Method"
+				"preferred_contact": "Preferred Contact Method",
+				"tax_number": "Tax Number"
 			},
 			"forms": {
 				"address": "Address",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index a59ef8650..40fb43865 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1937,6 +1937,7 @@
 			},
 			"errors": {
 				"noaccess": "El registro no existe o no tiene acceso a él.",
+				"saving": "",
 				"selectexistingornew": ""
 			},
 			"fields": {
@@ -1957,7 +1958,8 @@
 				"ownr_st": "Provincia del estado",
 				"ownr_title": "Título",
 				"ownr_zip": "código postal",
-				"preferred_contact": "Método de Contacto Preferido"
+				"preferred_contact": "Método de Contacto Preferido",
+				"tax_number": ""
 			},
 			"forms": {
 				"address": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index acdfbc405..e32f0f832 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1937,6 +1937,7 @@
 			},
 			"errors": {
 				"noaccess": "L'enregistrement n'existe pas ou vous n'y avez pas accès.",
+				"saving": "",
 				"selectexistingornew": ""
 			},
 			"fields": {
@@ -1957,7 +1958,8 @@
 				"ownr_st": "Etat / Province",
 				"ownr_title": "Titre",
 				"ownr_zip": "Zip / code postal",
-				"preferred_contact": "Méthode de contact préférée"
+				"preferred_contact": "Méthode de contact préférée",
+				"tax_number": ""
 			},
 			"forms": {
 				"address": "",
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index b830dfef4..c4ba440e2 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -4015,6 +4015,7 @@
           - ownr_zip
           - preferred_contact
           - shopid
+          - tax_number
           - updated_at
         filter:
           bodyshop:
@@ -4050,6 +4051,7 @@
           - ownr_zip
           - preferred_contact
           - shopid
+          - tax_number
           - updated_at
         filter:
           bodyshop:
diff --git a/hasura/migrations/1658259526300_alter_table_public_owners_add_column_tax_number/down.sql b/hasura/migrations/1658259526300_alter_table_public_owners_add_column_tax_number/down.sql
new file mode 100644
index 000000000..0bd40d09a
--- /dev/null
+++ b/hasura/migrations/1658259526300_alter_table_public_owners_add_column_tax_number/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."owners" add column "tax_number" text
+--  null;
diff --git a/hasura/migrations/1658259526300_alter_table_public_owners_add_column_tax_number/up.sql b/hasura/migrations/1658259526300_alter_table_public_owners_add_column_tax_number/up.sql
new file mode 100644
index 000000000..f6f6bd9dc
--- /dev/null
+++ b/hasura/migrations/1658259526300_alter_table_public_owners_add_column_tax_number/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."owners" add column "tax_number" text
+ null;