admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
release/2021-10-08

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2021-10-04 20:35:21 +00:00
parent 7bd2a90141 ea2c583b26
commit f46c19b152
18 changed files with 7540 additions and 7522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bodyshop_translations.babel
View File

@@ -22304,7 +22304,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>referral_source_other</name> <name>referral_source_extra</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>

4
client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
View File

@@ -133,8 +133,8 @@ export function JobsConvertButton({
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.referral_source_other")} label={t("jobs.fields.referral_source_extra")}
name="referral_source_other" name="referral_source_extra"
> >
<Input /> <Input />
</Form.Item> </Form.Item>

4
client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
View File

@@ -182,8 +182,8 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.referral_source_other")} label={t("jobs.fields.referral_source_extra")}
name="referral_source_other" name="referral_source_extra"
> >
<Input /> <Input />
</Form.Item> </Form.Item>

4
client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
View File

@@ -115,8 +115,8 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.referral_source_other")} label={t("jobs.fields.referral_source_extra")}
name="referral_source_other" name="referral_source_extra"
> >
<Input /> <Input />
</Form.Item> </Form.Item>

10
client/src/graphql/jobs.queries.js
View File

@@ -359,7 +359,7 @@ export const GET_JOB_BY_PK = gql`
kmin kmin
kmout kmout
referral_source referral_source
referral_source_other referral_source_extra
unit_number unit_number
po_number po_number
special_coverage_policy special_coverage_policy
@@ -966,7 +966,7 @@ export const CONVERT_JOB_TO_RO = gql`
$driveable: Boolean $driveable: Boolean
$towin: Boolean $towin: Boolean
$referral_source: String $referral_source: String
$referral_source_other: String $referral_source_extra: String
) { ) {
update_jobs( update_jobs(
where: { id: { _eq: $jobId } } where: { id: { _eq: $jobId } }
@@ -978,7 +978,7 @@ export const CONVERT_JOB_TO_RO = gql`
towin: $towin towin: $towin
driveable: $driveable driveable: $driveable
referral_source: $referral_source referral_source: $referral_source
referral_source_other: $referral_source_other referral_source_extra: $referral_source_extra
} }
) { ) {
returning { returning {
@@ -988,7 +988,7 @@ export const CONVERT_JOB_TO_RO = gql`
class class
ins_co_nm ins_co_nm
referral_source referral_source
referral_source_other referral_source_extra
} }
} }
} }
@@ -1502,7 +1502,7 @@ export const QUERY_ALL_JOB_FIELDS = gql`
rate_mash rate_mash
rate_matd rate_matd
referral_source referral_source
referral_source_other referral_source_extra
regie_number regie_number
selling_dealer selling_dealer
selling_dealer_contact selling_dealer_contact

2
client/src/translations/en_us/common.json
View File

@@ -1336,7 +1336,7 @@
"rate_mapa": "Paint Materials", "rate_mapa": "Paint Materials",
"rate_mash": "Shop Material", "rate_mash": "Shop Material",
"rate_matd": "Tire Disposal", "rate_matd": "Tire Disposal",
"referral_source_other": "Other Referral Source", "referral_source_extra": "Other Referral Source",
"referralsource": "Referral Source", "referralsource": "Referral Source",
"regie_number": "Registration #", "regie_number": "Registration #",
"repairtotal": "Repair Total", "repairtotal": "Repair Total",

2
client/src/translations/es/common.json
View File

@@ -1336,7 +1336,7 @@
"rate_mapa": "Tasa de materiales de pintura", "rate_mapa": "Tasa de materiales de pintura",
"rate_mash": "Comprar material de tarifa", "rate_mash": "Comprar material de tarifa",
"rate_matd": "Tasa de eliminación de neumáticos", "rate_matd": "Tasa de eliminación de neumáticos",
"referral_source_other": "", "referral_source_extra": "",
"referralsource": "Fuente de referencia", "referralsource": "Fuente de referencia",
"regie_number": "N. ° de registro", "regie_number": "N. ° de registro",
"repairtotal": "Reparación total", "repairtotal": "Reparación total",

2
client/src/translations/fr/common.json
View File

@@ -1336,7 +1336,7 @@
"rate_mapa": "Taux de matériaux de peinture", "rate_mapa": "Taux de matériaux de peinture",
"rate_mash": "Tarif du matériel de la boutique", "rate_mash": "Tarif du matériel de la boutique",
"rate_matd": "Taux d'élimination des pneus", "rate_matd": "Taux d'élimination des pneus",
"referral_source_other": "", "referral_source_extra": "",
"referralsource": "Source de référence", "referralsource": "Source de référence",
"regie_number": "Enregistrement #", "regie_number": "Enregistrement #",
"repairtotal": "Réparation totale", "repairtotal": "Réparation totale",

6
hasura/metadata/tables.yaml
View File

@@ -2716,7 +2716,7 @@
- rate_mash - rate_mash
- rate_matd - rate_matd
- referral_source - referral_source
- referral_source_other - referral_source_extra
- regie_number - regie_number
- ro_number - ro_number
- scheduled_completion - scheduled_completion
@@ -2964,7 +2964,7 @@
- rate_mash - rate_mash
- rate_matd - rate_matd
- referral_source - referral_source
- referral_source_other - referral_source_extra
- regie_number - regie_number
- ro_number - ro_number
- scheduled_completion - scheduled_completion
@@ -3222,7 +3222,7 @@
- rate_mash - rate_mash
- rate_matd - rate_matd
- referral_source - referral_source
- referral_source_other - referral_source_extra
- regie_number - regie_number
- ro_number - ro_number
- scheduled_completion - scheduled_completion

2
hasura/migrations/1633378235691_alter_table_public_jobs_drop_column_referral_source_other/down.sql Normal file
View File

@@ -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;

1
hasura/migrations/1633378235691_alter_table_public_jobs_drop_column_referral_source_other/up.sql Normal file
View File

@@ -0,0 +1 @@
alter table "public"."jobs" drop column "referral_source_other" cascade;

4
hasura/migrations/1633378265002_alter_table_public_jobs_add_column_referral_source_other/down.sql Normal file
View File

@@ -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;

2
hasura/migrations/1633378265002_alter_table_public_jobs_add_column_referral_source_other/up.sql Normal file
View File

@@ -0,0 +1,2 @@
alter table "public"."jobs" add column "referral_source_other" text
null;

2
hasura/migrations/1633378692773_alter_table_public_jobs_drop_column_referral_source_other/down.sql Normal file
View File

@@ -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;

1
hasura/migrations/1633378692773_alter_table_public_jobs_drop_column_referral_source_other/up.sql Normal file
View File

@@ -0,0 +1 @@
alter table "public"."jobs" drop column "referral_source_other" cascade;

4
hasura/migrations/1633378712268_alter_table_public_jobs_add_column_referral_source_extra/down.sql Normal file
View File

@@ -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;

2
hasura/migrations/1633378712268_alter_table_public_jobs_add_column_referral_source_extra/up.sql Normal file
View File

@@ -0,0 +1,2 @@
alter table "public"."jobs" add column "referral_source_extra" text
null;

2
server/graphql-client/queries.js
View File

@@ -555,7 +555,7 @@ exports.GET_JOB_BY_PK = ` query GET_JOB_BY_PK($id: uuid!) {
kmin kmin
kmout kmout
referral_source referral_source
referral_source_other referral_source_extra
unit_number unit_number
po_number po_number
special_coverage_policy special_coverage_policy