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

Added inhouse vendor id to shop info page IO-438

Browse Source
This commit is contained in:
Patrick Fic
2020-12-08 11:48:54 -08:00
parent f3d3a30f77
commit 31a809629d
10 changed files with 108 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bodyshop_translations.babel
View File

@@ -2720,6 +2720,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>inhousevendorid</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>insurance_vendor_id</name> <name>insurance_vendor_id</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

4
client/src/components/bill-form/bill-form.component.jsx
View File

@@ -79,7 +79,7 @@ export function BillFormComponent({
<JobSearchSelect <JobSearchSelect
disabled={billEdit || disabled} disabled={billEdit || disabled}
convertedOnly convertedOnly
// notExported={false} // notExported={false}
onBlur={() => { onBlur={() => {
if (form.getFieldValue("jobid") !== null) { if (form.getFieldValue("jobid") !== null) {
loadLines({ variables: { id: form.getFieldValue("jobid") } }); loadLines({ variables: { id: form.getFieldValue("jobid") } });
@@ -120,7 +120,7 @@ export function BillFormComponent({
({ getFieldValue }) => ({ ({ getFieldValue }) => ({
async validator(rule, value) { async validator(rule, value) {
const vendorid = getFieldValue("vendorid"); const vendorid = getFieldValue("vendorid");
if (vendorid) { if (vendorid && value) {
const response = await client.query({ const response = await client.query({
query: CHECK_BILL_INVOICE_NUMBER, query: CHECK_BILL_INVOICE_NUMBER,
variables: { variables: {

2
client/src/components/help-rescue/help-rescue.component.jsx
View File

@@ -32,7 +32,7 @@ export default function HelpRescue() {
> >
<span> <span>
Enter your six-digit code, then click the Start Download button Enter your six-digit code, then click the Start Download button
below{" "} below
</span> </span>
<input type="text" name="Code" /> <input type="text" name="Code" />
<br /> <br />

2
client/src/components/jobs-detail-checklists/jobs-detail-checklists.component.jsx
View File

@@ -11,7 +11,7 @@ export default function JobsDetailChecklists({ job }) {
<JobChecklistDisplay checklist={job.intakechecklist} /> <JobChecklistDisplay checklist={job.intakechecklist} />
</Col> </Col>
<Col {...colSpan}> <Col {...colSpan}>
{" "}
<JobChecklistDisplay checklist={job.deliverchecklist} /> <JobChecklistDisplay checklist={job.deliverchecklist} />
</Col> </Col>
</Row> </Row>

4
client/src/components/print-center-jobs/print-center-jobs.component.jsx
View File

@@ -55,8 +55,8 @@ export function PrintCenterJobsComponent({ bodyshop, printCenterModal }) {
disabled={item.disabled} disabled={item.disabled}
/> />
) )
)}{" "} )}
</ul>{" "} </ul>
</Collapse.Panel> </Collapse.Panel>
</Collapse> </Collapse>
</Col> </Col>

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

@@ -205,7 +205,7 @@ export default function ShopInfoComponent({ form, saveLoading }) {
}, },
]} ]}
> >
<InputNumberCalculator min={0} precision={0} /> <InputNumber min={0} precision={0} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
@@ -218,7 +218,7 @@ export default function ShopInfoComponent({ form, saveLoading }) {
}, },
]} ]}
> >
<InputNumberCalculator min={0} precision={0} /> <InputNumber min={0} precision={0} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
@@ -243,7 +243,7 @@ export default function ShopInfoComponent({ form, saveLoading }) {
}, },
]} ]}
> >
<InputNumberCalculator min={1} precision={1} /> <InputNumber min={1} precision={1} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
name={["md_referral_sources"]} name={["md_referral_sources"]}
@@ -273,6 +273,19 @@ export default function ShopInfoComponent({ form, saveLoading }) {
<Radio value={3}>3</Radio> <Radio value={3}>3</Radio>
</Radio.Group> </Radio.Group>
</Form.Item> </Form.Item>
<Form.Item
label={t("bodyshop.fields.inhousevendorid")}
name={"inhousevendorid"}
rules={[
{
required: true,
message: t("general.validation.required"),
},
]}
>
<Input />
</Form.Item>
<Form.Item shouldUpdate> <Form.Item shouldUpdate>
{() => { {() => {
return ( return (
@@ -494,65 +507,67 @@ export default function ShopInfoComponent({ form, saveLoading }) {
); );
}} }}
</Form.List> </Form.List>
<LayoutFormRow>
<Form.Item
name={["md_classes"]} <Form.Item
label={t("bodyshop.fields.md_classes")} name={["md_classes"]}
rules={[ label={t("bodyshop.fields.md_classes")}
{ rules={[
required: true, {
message: t("general.validation.required"), required: true,
type: "array", message: t("general.validation.required"),
}, type: "array",
]} },
> ]}
<Select mode="tags" /> >
</Form.Item> <Select mode="tags" />
<Form.Item </Form.Item>
name={["md_categories"]} <Form.Item
label={t("bodyshop.fields.md_categories")} name={["md_categories"]}
rules={[ label={t("bodyshop.fields.md_categories")}
{ rules={[
required: true, {
message: t("general.validation.required"), required: true,
type: "array", message: t("general.validation.required"),
}, type: "array",
]} },
> ]}
<Select mode="tags" /> >
</Form.Item> <Select mode="tags" />
<Form.Item </Form.Item>
name={["md_ins_cos"]} <Form.Item
label={t("bodyshop.fields.md_ins_cos")} name={["md_ins_cos"]}
rules={[ label={t("bodyshop.fields.md_ins_cos")}
{ rules={[
required: true, {
message: t("general.validation.required"), required: true,
type: "array", message: t("general.validation.required"),
}, type: "array",
]} },
> ]}
<Select mode="tags" /> >
</Form.Item> <Select mode="tags" />
<Form.Item </Form.Item>
name={["enforce_class"]} <Form.Item
label={t("bodyshop.fields.enforce_class")} name={["enforce_class"]}
valuePropName="checked" label={t("bodyshop.fields.enforce_class")}
> valuePropName="checked"
<Switch /> >
</Form.Item> <Switch />
<Form.Item </Form.Item>
name={["target_touchtime"]} <Form.Item
label={t("bodyshop.fields.target_touchtime")} name={["target_touchtime"]}
rules={[ label={t("bodyshop.fields.target_touchtime")}
{ rules={[
required: true, {
message: t("general.validation.required"), required: true,
}, message: t("general.validation.required"),
]} },
> ]}
<InputNumberCalculator min={0.1} precision={1} /> >
</Form.Item> <InputNumber min={0.1} precision={1} />
</Form.Item>
</LayoutFormRow>
</Collapse.Panel> </Collapse.Panel>
<Collapse.Panel <Collapse.Panel
key="speedprint" key="speedprint"

3
client/src/components/vendors-form/vendors-form.component.jsx
View File

@@ -23,7 +23,6 @@ export default function VendorsFormComponent({
handleDelete, handleDelete,
responsibilityCenters, responsibilityCenters,
}) { }) {
console.log("🚀 ~ file: vendors-form.component.jsx ~ line 26 ~ formLoading", formLoading)
const { t } = useTranslation(); const { t } = useTranslation();
const { getFieldValue } = form; const { getFieldValue } = form;
return ( return (
@@ -113,7 +112,7 @@ export default function VendorsFormComponent({
label={t("vendors.fields.prompt_discount")} label={t("vendors.fields.prompt_discount")}
name="prompt_discount" name="prompt_discount"
> >
<InputNumberCalculator /> <InputNumber max={1} precision={2} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("vendors.fields.cost_center")} label={t("vendors.fields.cost_center")}

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

@@ -185,6 +185,7 @@
"email": "General Shop Email", "email": "General Shop Email",
"enforce_class": "Enforce Class on Conversion?", "enforce_class": "Enforce Class on Conversion?",
"federal_tax_id": "Federal Tax ID (GST/HST)", "federal_tax_id": "Federal Tax ID (GST/HST)",
"inhousevendorid": "In House Vendor ID",
"insurance_vendor_id": "Insurance Vendor ID", "insurance_vendor_id": "Insurance Vendor ID",
"lastnumberworkingdays": "Scoreboard - Last Number of Working Days", "lastnumberworkingdays": "Scoreboard - Last Number of Working Days",
"logo_img_path": "Shop Logo", "logo_img_path": "Shop Logo",

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

@@ -185,6 +185,7 @@
"email": "", "email": "",
"enforce_class": "", "enforce_class": "",
"federal_tax_id": "", "federal_tax_id": "",
"inhousevendorid": "",
"insurance_vendor_id": "", "insurance_vendor_id": "",
"lastnumberworkingdays": "", "lastnumberworkingdays": "",
"logo_img_path": "", "logo_img_path": "",

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

@@ -185,6 +185,7 @@
"email": "", "email": "",
"enforce_class": "", "enforce_class": "",
"federal_tax_id": "", "federal_tax_id": "",
"inhousevendorid": "",
"insurance_vendor_id": "", "insurance_vendor_id": "",
"lastnumberworkingdays": "", "lastnumberworkingdays": "",
"logo_img_path": "", "logo_img_path": "",