From 4995e44e069f2deef9a9e950d4964f73ea37b9bf Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 4 Oct 2021 11:43:33 -0700
Subject: [PATCH] IO-1424 Add other referral source

---
 bodyshop_translations.babel                   | 21 +++++++++
 .../jobs-convert-button.component.jsx         | 45 +++++++++++--------
 .../jobs-create-jobs-info.component.jsx       |  6 +++
 .../jobs-detail-general.component.jsx         |  6 +++
 client/src/graphql/jobs.queries.js            |  5 +++
 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 +
 .../down.sql                                  |  1 +
 .../up.sql                                    |  1 +
 server/graphql-client/queries.js              |  1 +
 14 files changed, 80 insertions(+), 18 deletions(-)
 create mode 100644 hasura/migrations/1633371928424_alter_table_public_jobs_add_column_referral_soure_other/down.sql
 create mode 100644 hasura/migrations/1633371928424_alter_table_public_jobs_add_column_referral_soure_other/up.sql
 create mode 100644 hasura/migrations/1633371952863_alter_table_public_jobs_alter_column_referral_soure_other/down.sql
 create mode 100644 hasura/migrations/1633371952863_alter_table_public_jobs_alter_column_referral_soure_other/up.sql

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index f5995934e..27e4063e0 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -22303,6 +22303,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>referral_source_other</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>referralsource</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
index 2c42c7b58..b2c2b42e1 100644
--- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -2,6 +2,7 @@ import { useMutation } from "@apollo/client";
 import {
   Button,
   Form,
+  Input,
   notification,
   Popover,
   Select,
@@ -112,24 +113,32 @@ export function JobsConvertButton({
           </Form.Item>
         )}
         {bodyshop.enforce_referral && (
-          <Form.Item
-            name={"referral_source"}
-            label={t("jobs.fields.referralsource")}
-            rules={[
-              {
-                required: bodyshop.enforce_referral,
-                //message: t("general.validation.required"),
-              },
-            ]}
-          >
-            <Select>
-              {bodyshop.md_referral_sources.map((s) => (
-                <Select.Option key={s} value={s}>
-                  {s}
-                </Select.Option>
-              ))}
-            </Select>
-          </Form.Item>
+          <>
+            <Form.Item
+              name={"referral_source"}
+              label={t("jobs.fields.referralsource")}
+              rules={[
+                {
+                  required: bodyshop.enforce_referral,
+                  //message: t("general.validation.required"),
+                },
+              ]}
+            >
+              <Select>
+                {bodyshop.md_referral_sources.map((s) => (
+                  <Select.Option key={s} value={s}>
+                    {s}
+                  </Select.Option>
+                ))}
+              </Select>
+            </Form.Item>
+            <Form.Item
+              label={t("jobs.fields.referral_source_other")}
+              name="referral_source_other"
+            >
+              <Input />
+            </Form.Item>
+          </>
         )}
         <Form.Item
           label={t("jobs.fields.ca_gst_registrant")}
diff --git a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
index 190ade3ed..aeb710936 100644
--- a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
+++ b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
@@ -181,6 +181,12 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
                 ))}
               </Select>
             </Form.Item>
+            <Form.Item
+              label={t("jobs.fields.referral_source_other")}
+              name="referral_source_other"
+            >
+              <Input />
+            </Form.Item>
           </LayoutFormRow>
         </Collapse.Panel>
         <Collapse.Panel
diff --git a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
index 6d77cadd4..ec4f79745 100644
--- a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
+++ b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
@@ -114,6 +114,12 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
             ))}
           </Select>
         </Form.Item>
+        <Form.Item
+          label={t("jobs.fields.referral_source_other")}
+          name="referral_source_other"
+        >
+          <Input />
+        </Form.Item>
         <Form.Item label={t("jobs.fields.alt_transport")} name="alt_transport">
           <Select disabled={jobRO} allowClear>
             {bodyshop.appt_alt_transport.map((s) => (
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 0640e101f..10c9313b2 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -359,6 +359,7 @@ export const GET_JOB_BY_PK = gql`
       kmin
       kmout
       referral_source
+      referral_source_other
       unit_number
       po_number
       special_coverage_policy
@@ -964,6 +965,7 @@ export const CONVERT_JOB_TO_RO = gql`
     $driveable: Boolean
     $towin: Boolean
     $referral_source: String
+    $referral_source_other: String
   ) {
     update_jobs(
       where: { id: { _eq: $jobId } }
@@ -975,6 +977,7 @@ export const CONVERT_JOB_TO_RO = gql`
         towin: $towin
         driveable: $driveable
         referral_source: $referral_source
+        referral_source_other: $referral_source_other
       }
     ) {
       returning {
@@ -984,6 +987,7 @@ export const CONVERT_JOB_TO_RO = gql`
         class
         ins_co_nm
         referral_source
+        referral_source_other
       }
     }
   }
@@ -1497,6 +1501,7 @@ export const QUERY_ALL_JOB_FIELDS = gql`
       rate_mash
       rate_matd
       referral_source
+      referral_source_other
       regie_number
       selling_dealer
       selling_dealer_contact
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 077e82c85..5c3b7c97d 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1336,6 +1336,7 @@
 				"rate_mapa": "Paint Materials",
 				"rate_mash": "Shop Material",
 				"rate_matd": "Tire Disposal",
+				"referral_source_other": "Other Referral Source",
 				"referralsource": "Referral Source",
 				"regie_number": "Registration #",
 				"repairtotal": "Repair Total",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index eddd2aca4..c22513b73 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1336,6 +1336,7 @@
 				"rate_mapa": "Tasa de materiales de pintura",
 				"rate_mash": "Comprar material de tarifa",
 				"rate_matd": "Tasa de eliminación de neumáticos",
+				"referral_source_other": "",
 				"referralsource": "Fuente de referencia",
 				"regie_number": "N. ° de registro",
 				"repairtotal": "Reparación total",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index c7825635d..c0d327234 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1336,6 +1336,7 @@
 				"rate_mapa": "Taux de matériaux de peinture",
 				"rate_mash": "Tarif du matériel de la boutique",
 				"rate_matd": "Taux d'élimination des pneus",
+				"referral_source_other": "",
 				"referralsource": "Source de référence",
 				"regie_number": "Enregistrement #",
 				"repairtotal": "Réparation totale",
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 9eee43482..0bc94cb5c 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -2716,6 +2716,7 @@
       - rate_mash
       - rate_matd
       - referral_source
+      - referral_source_other
       - regie_number
       - ro_number
       - scheduled_completion
@@ -2963,6 +2964,7 @@
       - rate_mash
       - rate_matd
       - referral_source
+      - referral_source_other
       - regie_number
       - ro_number
       - scheduled_completion
@@ -3220,6 +3222,7 @@
       - rate_mash
       - rate_matd
       - referral_source
+      - referral_source_other
       - regie_number
       - ro_number
       - scheduled_completion
diff --git a/hasura/migrations/1633371928424_alter_table_public_jobs_add_column_referral_soure_other/down.sql b/hasura/migrations/1633371928424_alter_table_public_jobs_add_column_referral_soure_other/down.sql
new file mode 100644
index 000000000..c9ae4c4f4
--- /dev/null
+++ b/hasura/migrations/1633371928424_alter_table_public_jobs_add_column_referral_soure_other/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 "referral_soure_other" text
+--  null;
diff --git a/hasura/migrations/1633371928424_alter_table_public_jobs_add_column_referral_soure_other/up.sql b/hasura/migrations/1633371928424_alter_table_public_jobs_add_column_referral_soure_other/up.sql
new file mode 100644
index 000000000..5f5bef695
--- /dev/null
+++ b/hasura/migrations/1633371928424_alter_table_public_jobs_add_column_referral_soure_other/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "referral_soure_other" text
+ null;
diff --git a/hasura/migrations/1633371952863_alter_table_public_jobs_alter_column_referral_soure_other/down.sql b/hasura/migrations/1633371952863_alter_table_public_jobs_alter_column_referral_soure_other/down.sql
new file mode 100644
index 000000000..b7237950c
--- /dev/null
+++ b/hasura/migrations/1633371952863_alter_table_public_jobs_alter_column_referral_soure_other/down.sql
@@ -0,0 +1 @@
+alter table "public"."jobs" rename column "referral_source_other" to "referral_soure_other";
diff --git a/hasura/migrations/1633371952863_alter_table_public_jobs_alter_column_referral_soure_other/up.sql b/hasura/migrations/1633371952863_alter_table_public_jobs_alter_column_referral_soure_other/up.sql
new file mode 100644
index 000000000..b61ffafae
--- /dev/null
+++ b/hasura/migrations/1633371952863_alter_table_public_jobs_alter_column_referral_soure_other/up.sql
@@ -0,0 +1 @@
+alter table "public"."jobs" rename column "referral_soure_other" to "referral_source_other";
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index 9a83dffc1..7e7f3de29 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -555,6 +555,7 @@ exports.GET_JOB_BY_PK = ` query GET_JOB_BY_PK($id: uuid!) {
       kmin
       kmout
       referral_source
+       referral_source_other
       unit_number
       po_number
       special_coverage_policy