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 f36269c83..b8e1ba7aa 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 @@ -1,5 +1,4 @@ import { Col, Form, Input, InputNumber, Row, Select, Space, Switch } from "antd"; -import React from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; @@ -188,6 +187,9 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) { + + + 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 dd49ffee0..f237b66ec 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 @@ -10,6 +10,7 @@ import { setModalContext } from "../../redux/modals/modals.actions"; import { selectBodyshop } from "../../redux/user/user.selectors"; import CurrencyFormatter from "../../utils/CurrencyFormatter"; import { DateTimeFormatter } from "../../utils/DateFormatter"; +import dayjs from "../../utils/day"; import PhoneNumberFormatter from "../../utils/PhoneFormatter"; import ChatOpenButton from "../chat-open-button/chat-open-button.component"; import DataLabel from "../data-label/data-label.component"; @@ -21,7 +22,6 @@ import ProductionListColumnComment from "../production-list-columns/production-l import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component"; import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component"; import "./jobs-detail-header.styles.scss"; -import dayjs from "../../utils/day"; const mapStateToProps = createStructuredSelector({ jobRO: selectJobReadOnly, @@ -149,6 +149,14 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) { )} + {job.hit_and_run && ( + + + + {t("jobs.fields.hit_and_run")} + + + )} diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index b31c5c17a..5d5c33bbf 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -511,6 +511,7 @@ export const GET_JOB_BY_PK = gql` est_ph1 flat_rate_ats federal_tax_rate + hit_and_run id inproduction ins_addr1 diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 0a1ec198a..d546213b6 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -1764,6 +1764,7 @@ "flat_rate_ats": "Flat Rate ATS?", "federal_tax_payable": "Federal Tax Payable", "federal_tax_rate": "Federal Tax Rate", + "hit_and_run": "Hit and Run", "ins_addr1": "Insurance Co. Address", "ins_city": "Insurance Co. City", "ins_co_id": "Insurance Co. ID", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 820fd2973..5098a0d20 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -1764,6 +1764,7 @@ "flat_rate_ats": "", "federal_tax_payable": "Impuesto federal por pagar", "federal_tax_rate": "", + "hit_and_run": "", "ins_addr1": "Dirección de Insurance Co.", "ins_city": "Ciudad de seguros", "ins_co_id": "ID de la compañía de seguros", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index cd799fec9..6cafb9147 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -1765,6 +1765,7 @@ "flat_rate_ats": "", "federal_tax_payable": "Impôt fédéral à payer", "federal_tax_rate": "", + "hit_and_run": "", "ins_addr1": "Adresse Insurance Co.", "ins_city": "Insurance City", "ins_co_id": "ID de la compagnie d'assurance", diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index 0e8cbb888..d46ba81d0 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -3700,6 +3700,7 @@ - federal_tax_rate - flat_rate_ats - g_bett_amt + - hit_and_run - id - inproduction - ins_addr1 @@ -3972,6 +3973,7 @@ - federal_tax_rate - flat_rate_ats - g_bett_amt + - hit_and_run - id - inproduction - ins_addr1 @@ -4256,6 +4258,7 @@ - federal_tax_rate - flat_rate_ats - g_bett_amt + - hit_and_run - id - inproduction - ins_addr1 diff --git a/hasura/migrations/1745427508374_alter_table_public_jobs_add_column_hit_and_run/down.sql b/hasura/migrations/1745427508374_alter_table_public_jobs_add_column_hit_and_run/down.sql new file mode 100644 index 000000000..24534298b --- /dev/null +++ b/hasura/migrations/1745427508374_alter_table_public_jobs_add_column_hit_and_run/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 "hit_and_run" boolean +-- null default 'false'; diff --git a/hasura/migrations/1745427508374_alter_table_public_jobs_add_column_hit_and_run/up.sql b/hasura/migrations/1745427508374_alter_table_public_jobs_add_column_hit_and_run/up.sql new file mode 100644 index 000000000..ea504819a --- /dev/null +++ b/hasura/migrations/1745427508374_alter_table_public_jobs_add_column_hit_and_run/up.sql @@ -0,0 +1,2 @@ +alter table "public"."jobs" add column "hit_and_run" boolean + null default 'false';