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

IO-2177 Add enforce category on conversion.

Browse Source
This commit is contained in:
Patrick Fic
2023-03-16 14:15:29 -07:00
parent 10a354e479
commit 9438ef9683
11 changed files with 134 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.vscode/settings.json vendored
View File

@@ -1,5 +1,4 @@
{ {
"eslint.workingDirectories": ["./client", "./"],
"xml.fileAssociations": [ "xml.fileAssociations": [
{ {
"pattern": "**/Test.xml", "pattern": "**/Test.xml",

86
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project version="1.2" be_version="2.7.1"> <babeledit_project be_version="2.7.1" version="1.2">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -4593,6 +4593,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>enforce_conversion_category</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> <concept_node>
<name>enforce_conversion_csr</name> <name>enforce_conversion_csr</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -20868,6 +20889,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>sendpartspricechange</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> <concept_node>
<name>sendtodms</name> <name>sendtodms</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -21314,6 +21356,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>partspricechange</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> <concept_node>
<name>saving</name> <name>saving</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -40906,6 +40969,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>customer_list</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> <concept_node>
<name>cycle_time_analysis</name> <name>cycle_time_analysis</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

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

@@ -43,7 +43,7 @@ export function JobsConvertButton({
const { t } = useTranslation(); const { t } = useTranslation();
const [form] = Form.useForm(); const [form] = Form.useForm();
const handleConvert = async ({ employee_csr, ...values }) => { const handleConvert = async ({ employee_csr, category, ...values }) => {
if (parentFormIsFieldsTouched()) { if (parentFormIsFieldsTouched()) {
alert(t("jobs.labels.savebeforeconversion")); alert(t("jobs.labels.savebeforeconversion"));
return; return;
@@ -55,6 +55,7 @@ export function JobsConvertButton({
job: { job: {
converted: true, converted: true,
...(bodyshop.enforce_conversion_csr ? { employee_csr } : {}), ...(bodyshop.enforce_conversion_csr ? { employee_csr } : {}),
...(bodyshop.enforce_conversion_category ? { category } : {}),
...values, ...values,
}, },
}, },
@@ -94,6 +95,7 @@ export function JobsConvertButton({
driveable: true, driveable: true,
towin: false, towin: false,
employee_csr: job.employee_csr, employee_csr: job.employee_csr,
category: job.category,
}} }}
> >
<Form.Item <Form.Item
@@ -197,6 +199,26 @@ export function JobsConvertButton({
</Select> </Select>
</Form.Item> </Form.Item>
)} )}
{bodyshop.enforce_conversion_category && (
<Form.Item
name={"category"}
label={t("jobs.fields.category")}
rules={[
{
required: bodyshop.enforce_conversion_category,
//message: t("general.validation.required"),
},
]}
>
<Select allowClear>
{bodyshop.md_categories.map((s) => (
<Select.Option key={s} value={s}>
{s}
</Select.Option>
))}
</Select>
</Form.Item>
)}
<Form.Item <Form.Item
label={t("jobs.fields.ca_gst_registrant")} label={t("jobs.fields.ca_gst_registrant")}
name="ca_gst_registrant" name="ca_gst_registrant"

7
client/src/components/shop-info/shop-info.general.component.jsx
View File

@@ -473,6 +473,13 @@ export default function ShopInfoGeneral({ form }) {
> >
<Switch /> <Switch />
</Form.Item> </Form.Item>
<Form.Item
name={["enforce_conversion_category"]}
label={t("bodyshop.fields.enforce_conversion_category")}
valuePropName="checked"
>
<Switch />
</Form.Item>
<Form.Item <Form.Item
name={["target_touchtime"]} name={["target_touchtime"]}
label={t("bodyshop.fields.target_touchtime")} label={t("bodyshop.fields.target_touchtime")}

2
client/src/graphql/bodyshop.queries.js
View File

@@ -115,6 +115,7 @@ export const QUERY_BODYSHOP = gql`
enforce_conversion_csr enforce_conversion_csr
md_lost_sale_reasons md_lost_sale_reasons
md_parts_scan md_parts_scan
enforce_conversion_category
employees { employees {
user_email user_email
id id
@@ -227,6 +228,7 @@ export const UPDATE_SHOP = gql`
enforce_conversion_csr enforce_conversion_csr
md_lost_sale_reasons md_lost_sale_reasons
md_parts_scan md_parts_scan
enforce_conversion_category
employees { employees {
id id
first_name first_name

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

@@ -283,6 +283,7 @@
}, },
"email": "General Shop Email", "email": "General Shop Email",
"enforce_class": "Enforce Class on Conversion?", "enforce_class": "Enforce Class on Conversion?",
"enforce_conversion_category": "Enforce Conversion Category",
"enforce_conversion_csr": "Enforce CSR on Conversion?", "enforce_conversion_csr": "Enforce CSR on Conversion?",
"enforce_referral": "Enforce Referrals", "enforce_referral": "Enforce Referrals",
"federal_tax_id": "Federal Tax ID (GST/HST)", "federal_tax_id": "Federal Tax ID (GST/HST)",
@@ -1280,6 +1281,7 @@
"removefromproduction": "Remove from Production", "removefromproduction": "Remove from Production",
"schedule": "Schedule", "schedule": "Schedule",
"sendcsi": "Send CSI", "sendcsi": "Send CSI",
"sendpartspricechange": "",
"sendtodms": "Send to DMS", "sendtodms": "Send to DMS",
"sync": "Sync", "sync": "Sync",
"uninvoice": "Uninvoice", "uninvoice": "Uninvoice",
@@ -1303,6 +1305,7 @@
"nojobselected": "No job is selected.", "nojobselected": "No job is selected.",
"noowner": "No owner associated.", "noowner": "No owner associated.",
"novehicle": "No vehicle associated.", "novehicle": "No vehicle associated.",
"partspricechange": "",
"saving": "Error encountered while saving record.", "saving": "Error encountered while saving record.",
"scanimport": "Error importing job. {{message}}", "scanimport": "Error importing job. {{message}}",
"totalscalc": "Error while calculating new job totals.", "totalscalc": "Error while calculating new job totals.",

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

@@ -283,6 +283,7 @@
}, },
"email": "", "email": "",
"enforce_class": "", "enforce_class": "",
"enforce_conversion_category": "",
"enforce_conversion_csr": "", "enforce_conversion_csr": "",
"enforce_referral": "", "enforce_referral": "",
"federal_tax_id": "", "federal_tax_id": "",
@@ -1280,6 +1281,7 @@
"removefromproduction": "", "removefromproduction": "",
"schedule": "Programar", "schedule": "Programar",
"sendcsi": "", "sendcsi": "",
"sendpartspricechange": "",
"sendtodms": "", "sendtodms": "",
"sync": "", "sync": "",
"uninvoice": "", "uninvoice": "",
@@ -1303,6 +1305,7 @@
"nojobselected": "No hay trabajo seleccionado.", "nojobselected": "No hay trabajo seleccionado.",
"noowner": "Ningún propietario asociado.", "noowner": "Ningún propietario asociado.",
"novehicle": "No hay vehículo asociado.", "novehicle": "No hay vehículo asociado.",
"partspricechange": "",
"saving": "Se encontró un error al guardar el registro.", "saving": "Se encontró un error al guardar el registro.",
"scanimport": "", "scanimport": "",
"totalscalc": "", "totalscalc": "",

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

@@ -283,6 +283,7 @@
}, },
"email": "", "email": "",
"enforce_class": "", "enforce_class": "",
"enforce_conversion_category": "",
"enforce_conversion_csr": "", "enforce_conversion_csr": "",
"enforce_referral": "", "enforce_referral": "",
"federal_tax_id": "", "federal_tax_id": "",
@@ -1280,6 +1281,7 @@
"removefromproduction": "", "removefromproduction": "",
"schedule": "Programme", "schedule": "Programme",
"sendcsi": "", "sendcsi": "",
"sendpartspricechange": "",
"sendtodms": "", "sendtodms": "",
"sync": "", "sync": "",
"uninvoice": "", "uninvoice": "",
@@ -1303,6 +1305,7 @@
"nojobselected": "Aucun travail n'est sélectionné.", "nojobselected": "Aucun travail n'est sélectionné.",
"noowner": "Aucun propriétaire associé.", "noowner": "Aucun propriétaire associé.",
"novehicle": "Aucun véhicule associé.", "novehicle": "Aucun véhicule associé.",
"partspricechange": "",
"saving": "Erreur rencontrée lors de la sauvegarde de l'enregistrement.", "saving": "Erreur rencontrée lors de la sauvegarde de l'enregistrement.",
"scanimport": "", "scanimport": "",
"totalscalc": "", "totalscalc": "",

2
hasura/metadata/tables.yaml
View File

@@ -860,6 +860,7 @@
- deliverchecklist - deliverchecklist
- email - email
- enforce_class - enforce_class
- enforce_conversion_category
- enforce_conversion_csr - enforce_conversion_csr
- enforce_referral - enforce_referral
- entegral_configuration - entegral_configuration
@@ -959,6 +960,7 @@
- deliverchecklist - deliverchecklist
- email - email
- enforce_class - enforce_class
- enforce_conversion_category
- enforce_conversion_csr - enforce_conversion_csr
- enforce_referral - enforce_referral
- federal_tax_id - federal_tax_id

4
hasura/migrations/1679000353261_alter_table_public_bodyshops_add_column_enforce_conversion_category/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"."bodyshops" add column "enforce_conversion_category" boolean
-- not null default 'false';

2
hasura/migrations/1679000353261_alter_table_public_bodyshops_add_column_enforce_conversion_category/up.sql Normal file
View File

@@ -0,0 +1,2 @@
alter table "public"."bodyshops" add column "enforce_conversion_category" boolean
not null default 'false';