Merged in release/2021-10-08 (pull request #239)

release/2021-10-08 Approved-by: Patrick Fic
2021-10-04 20:35:21 +00:00
parent 7bd2a90141 ea2c583b26
commit f46c19b152
18 changed files with 7540 additions and 7522 deletions
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -22304,7 +22304,7 @@
                                        </translations>
                                    </concept_node>
                                    <concept_node>
-                                        <name>referral_source_other</name>
+                                        <name>referral_source_extra</name>
                                        <definition_loaded>false</definition_loaded>
                                        <description></description>
                                        <comment></comment>
--- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -133,8 +133,8 @@ export function JobsConvertButton({
              </Select>
            </Form.Item>
            <Form.Item
-              label={t("jobs.fields.referral_source_other")}
-              name="referral_source_other"
+              label={t("jobs.fields.referral_source_extra")}
+              name="referral_source_extra"
            >
              <Input />
            </Form.Item>
--- 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
@@ -182,8 +182,8 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
              </Select>
            </Form.Item>
            <Form.Item
-              label={t("jobs.fields.referral_source_other")}
-              name="referral_source_other"
+              label={t("jobs.fields.referral_source_extra")}
+              name="referral_source_extra"
            >
              <Input />
            </Form.Item>
--- a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
+++ b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
@@ -115,8 +115,8 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
          </Select>
        </Form.Item>
        <Form.Item
-          label={t("jobs.fields.referral_source_other")}
-          name="referral_source_other"
+          label={t("jobs.fields.referral_source_extra")}
+          name="referral_source_extra"
        >
          <Input />
        </Form.Item>
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -359,7 +359,7 @@ export const GET_JOB_BY_PK = gql`
      kmin
      kmout
      referral_source
-      referral_source_other
+      referral_source_extra
      unit_number
      po_number
      special_coverage_policy
@@ -966,7 +966,7 @@ export const CONVERT_JOB_TO_RO = gql`
    $driveable: Boolean
    $towin: Boolean
    $referral_source: String
-    $referral_source_other: String
+    $referral_source_extra: String
  ) {
    update_jobs(
      where: { id: { _eq: $jobId } }
@@ -978,7 +978,7 @@ export const CONVERT_JOB_TO_RO = gql`
        towin: $towin
        driveable: $driveable
        referral_source: $referral_source
-        referral_source_other: $referral_source_other
+        referral_source_extra: $referral_source_extra
      }
    ) {
      returning {
@@ -988,7 +988,7 @@ export const CONVERT_JOB_TO_RO = gql`
        class
        ins_co_nm
        referral_source
-        referral_source_other
+        referral_source_extra
      }
    }
  }
@@ -1502,7 +1502,7 @@ export const QUERY_ALL_JOB_FIELDS = gql`
      rate_mash
      rate_matd
      referral_source
-      referral_source_other
+      referral_source_extra
      regie_number
      selling_dealer
      selling_dealer_contact
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1336,7 +1336,7 @@
        "rate_mapa": "Paint Materials",
        "rate_mash": "Shop Material",
        "rate_matd": "Tire Disposal",
-				"referral_source_other": "Other Referral Source",
+        "referral_source_extra": "Other Referral Source",
        "referralsource": "Referral Source",
        "regie_number": "Registration #",
        "repairtotal": "Repair Total",
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1336,7 +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": "",
+        "referral_source_extra": "",
        "referralsource": "Fuente de referencia",
        "regie_number": "N. ° de registro",
        "repairtotal": "Reparación total",
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1336,7 +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": "",
+        "referral_source_extra": "",
        "referralsource": "Source de référence",
        "regie_number": "Enregistrement #",
        "repairtotal": "Réparation totale",
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -2716,7 +2716,7 @@
      - rate_mash
      - rate_matd
      - referral_source
-      - referral_source_other
+      - referral_source_extra
      - regie_number
      - ro_number
      - scheduled_completion
@@ -2964,7 +2964,7 @@
      - rate_mash
      - rate_matd
      - referral_source
-      - referral_source_other
+      - referral_source_extra
      - regie_number
      - ro_number
      - scheduled_completion
@@ -3222,7 +3222,7 @@
      - rate_mash
      - rate_matd
      - referral_source
-      - referral_source_other
+      - referral_source_extra
      - regie_number
      - ro_number
      - scheduled_completion
--- a/hasura/migrations/1633378235691_alter_table_public_jobs_drop_column_referral_source_other/down.sql
+++ b/hasura/migrations/1633378235691_alter_table_public_jobs_drop_column_referral_source_other/down.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" alter column "referral_source_other" drop not null;
+alter table "public"."jobs" add column "referral_source_other" text;
--- a/hasura/migrations/1633378235691_alter_table_public_jobs_drop_column_referral_source_other/up.sql
+++ b/hasura/migrations/1633378235691_alter_table_public_jobs_drop_column_referral_source_other/up.sql
@@ -0,0 +1 @@
+alter table "public"."jobs" drop column "referral_source_other" cascade;
--- a/hasura/migrations/1633378265002_alter_table_public_jobs_add_column_referral_source_other/down.sql
+++ b/hasura/migrations/1633378265002_alter_table_public_jobs_add_column_referral_source_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_source_other" text
+--  null;
--- a/hasura/migrations/1633378265002_alter_table_public_jobs_add_column_referral_source_other/up.sql
+++ b/hasura/migrations/1633378265002_alter_table_public_jobs_add_column_referral_source_other/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "referral_source_other" text
+ null;
--- a/hasura/migrations/1633378692773_alter_table_public_jobs_drop_column_referral_source_other/down.sql
+++ b/hasura/migrations/1633378692773_alter_table_public_jobs_drop_column_referral_source_other/down.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" alter column "referral_source_other" drop not null;
+alter table "public"."jobs" add column "referral_source_other" text;
--- a/hasura/migrations/1633378692773_alter_table_public_jobs_drop_column_referral_source_other/up.sql
+++ b/hasura/migrations/1633378692773_alter_table_public_jobs_drop_column_referral_source_other/up.sql
@@ -0,0 +1 @@
+alter table "public"."jobs" drop column "referral_source_other" cascade;
--- a/hasura/migrations/1633378712268_alter_table_public_jobs_add_column_referral_source_extra/down.sql
+++ b/hasura/migrations/1633378712268_alter_table_public_jobs_add_column_referral_source_extra/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_source_extra" text
+--  null;
--- a/hasura/migrations/1633378712268_alter_table_public_jobs_add_column_referral_source_extra/up.sql
+++ b/hasura/migrations/1633378712268_alter_table_public_jobs_add_column_referral_source_extra/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "referral_source_extra" text
+ null;
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -555,7 +555,7 @@ exports.GET_JOB_BY_PK = ` query GET_JOB_BY_PK($id: uuid!) {
      kmin
      kmout
      referral_source
-       referral_source_other
+       referral_source_extra
      unit_number
      po_number
      special_coverage_policy
				`@@ -0,0 +1 @@`
				`alter table "public"."jobs" drop column "referral_source_other" cascade;`