From e06fded73c819ad32f9b507a8a9aa26d2f5e7676 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 3 Jan 2022 10:49:01 -0800
Subject: [PATCH] IO-1604 Add invoice final note to job close.
---
bodyshop_translations.babel | 21 +++++++++++++++++++
client/src/graphql/jobs.queries.js | 1 +
.../pages/jobs-close/jobs-close.component.jsx | 8 +++++++
client/src/translations/en_us/common.json | 1 +
client/src/translations/es/common.json | 1 +
client/src/translations/fr/common.json | 1 +
hasura/metadata/tables.yaml | 3 +++
.../down.sql | 4 ++++
.../up.sql | 2 ++
9 files changed, 42 insertions(+)
create mode 100644 hasura/migrations/1641231095921_alter_table_public_jobs_add_column_invoice_final_note/down.sql
create mode 100644 hasura/migrations/1641231095921_alter_table_public_jobs_add_column_invoice_final_note/up.sql
diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 34451a81c..f992575cc 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -21431,6 +21431,27 @@
+
+ invoice_final_note
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
kmin
false
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 6ec415432..95641e936 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -1816,6 +1816,7 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
jobs_by_pk(id: $id) {
ro_number
invoice_allocation
+ invoice_final_note
ins_co_id
dms_allocation
id
diff --git a/client/src/pages/jobs-close/jobs-close.component.jsx b/client/src/pages/jobs-close/jobs-close.component.jsx
index 71d961c99..9b9e2dc9a 100644
--- a/client/src/pages/jobs-close/jobs-close.component.jsx
+++ b/client/src/pages/jobs-close/jobs-close.component.jsx
@@ -63,6 +63,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
kmin: values.kmin,
kmout: values.kmout,
dms_allocation: values.dms_allocation,
+ invoice_final_note: values.invoice_final_note,
},
},
refetchQueries: ["QUERY_JOB_CLOSE_DETAILS"],
@@ -122,6 +123,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
kmin: job.kmin,
kmout: job.kmout,
dms_allocation: job.dms_allocation,
+ invoice_final_note: job.invoice_final_note,
}}
scrollToFirstError
>
@@ -271,6 +273,12 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
)}
+
+
+
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index e39d34159..d59aa91b2 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1298,6 +1298,7 @@
"required": "Required?",
"type": "Type"
},
+ "invoice_final_note": "Note to Display on Final Invoice",
"kmin": "Mileage In",
"kmout": "Mileage Out",
"la1": "LA1",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index fdb18c791..f7074b2da 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1298,6 +1298,7 @@
"required": "",
"type": ""
},
+ "invoice_final_note": "",
"kmin": "Kilometraje en",
"kmout": "Kilometraje",
"la1": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 2b3e97411..a9578c2e2 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1298,6 +1298,7 @@
"required": "",
"type": ""
},
+ "invoice_final_note": "",
"kmin": "Kilométrage en",
"kmout": "Kilométrage hors",
"la1": "",
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 5aa98e1b4..b1100630e 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -2694,6 +2694,7 @@
- intakechecklist
- invoice_allocation
- invoice_date
+ - invoice_final_note
- iouparent
- job_totals
- kanbanparent
@@ -2948,6 +2949,7 @@
- intakechecklist
- invoice_allocation
- invoice_date
+ - invoice_final_note
- iouparent
- job_totals
- kanbanparent
@@ -3212,6 +3214,7 @@
- intakechecklist
- invoice_allocation
- invoice_date
+ - invoice_final_note
- iouparent
- job_totals
- kanbanparent
diff --git a/hasura/migrations/1641231095921_alter_table_public_jobs_add_column_invoice_final_note/down.sql b/hasura/migrations/1641231095921_alter_table_public_jobs_add_column_invoice_final_note/down.sql
new file mode 100644
index 000000000..bbce2f666
--- /dev/null
+++ b/hasura/migrations/1641231095921_alter_table_public_jobs_add_column_invoice_final_note/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"."jobs" add column "invoice_final_note" Text
+-- null;
diff --git a/hasura/migrations/1641231095921_alter_table_public_jobs_add_column_invoice_final_note/up.sql b/hasura/migrations/1641231095921_alter_table_public_jobs_add_column_invoice_final_note/up.sql
new file mode 100644
index 000000000..a7b12afb5
--- /dev/null
+++ b/hasura/migrations/1641231095921_alter_table_public_jobs_add_column_invoice_final_note/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "invoice_final_note" Text
+ null;