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

IO-2275 Remove PVRT and GST References in USA App.

Browse Source
This commit is contained in:
Patrick Fic
2023-05-17 12:09:21 -07:00
parent f553307587
commit 5e36a4ae89
3 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,13 +219,15 @@ export function JobsConvertButton({
</Select> </Select>
</Form.Item> </Form.Item>
)} )}
<Form.Item {bodyshop.region_config.toLowerCase().startsWith("ca") && (
label={t("jobs.fields.ca_gst_registrant")} <Form.Item
name="ca_gst_registrant" label={t("jobs.fields.ca_gst_registrant")}
valuePropName="checked" name="ca_gst_registrant"
> valuePropName="checked"
<Switch /> >
</Form.Item> <Switch />
</Form.Item>
)}
<Form.Item <Form.Item
label={t("jobs.fields.driveable")} label={t("jobs.fields.driveable")}
name="driveable" name="driveable"

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

@@ -224,13 +224,15 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
> >
<CurrencyInput /> <CurrencyInput />
</Form.Item> </Form.Item>
<Form.Item {bodyshop.region_config.toLowerCase().startsWith("ca") && (
label={t("jobs.fields.ca_gst_registrant")} <Form.Item
name="ca_gst_registrant" label={t("jobs.fields.ca_gst_registrant")}
valuePropName="checked" name="ca_gst_registrant"
> valuePropName="checked"
<Switch /> >
</Form.Item> <Switch />
</Form.Item>
)}
<Form.Item <Form.Item
label={t("jobs.fields.other_amount_payable")} label={t("jobs.fields.other_amount_payable")}
name="other_amount_payable" name="other_amount_payable"

68
client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
View File

@@ -40,24 +40,26 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
> >
<CurrencyInput disabled={jobRO} min={0} /> <CurrencyInput disabled={jobRO} min={0} />
</Form.Item> </Form.Item>
<Tooltip title={t("jobs.labels.ca_gst_all_if_null")}> {bodyshop.region_config.toLowerCase().startsWith("ca") && (
<Form.Item <Tooltip title={t("jobs.labels.ca_gst_all_if_null")}>
label={t("jobs.fields.ca_customer_gst")} <Form.Item
name="ca_customer_gst" label={t("jobs.fields.ca_customer_gst")}
> name="ca_customer_gst"
<CurrencyInput >
disabled={jobRO} <CurrencyInput
min={0} disabled={jobRO}
max={ min={0}
Math.round( max={
(job.job_totals && Math.round(
job.job_totals.totals.federal_tax.amount) || (job.job_totals &&
0 job.job_totals.totals.federal_tax.amount) ||
) / 100 0
} ) / 100
/> }
</Form.Item> />
</Tooltip> </Form.Item>
</Tooltip>
)}
<Form.Item <Form.Item
label={t("jobs.fields.other_amount_payable")} label={t("jobs.fields.other_amount_payable")}
name="other_amount_payable" name="other_amount_payable"
@@ -82,12 +84,14 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
> >
<CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} /> <CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} />
</Form.Item> </Form.Item>
<Space align="center"> {bodyshop.region_config === "CA_BC" && (
<Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt"> <Space align="center">
<CurrencyInput disabled={jobRO} min={0} /> <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
</Form.Item> <CurrencyInput disabled={jobRO} min={0} />
<CABCpvrtCalculator form={form} disabled={jobRO} /> </Form.Item>
</Space> <CABCpvrtCalculator form={form} disabled={jobRO} />
</Space>
)}
<Form.Item <Form.Item
label={t("jobs.fields.auto_add_ats")} label={t("jobs.fields.auto_add_ats")}
name="auto_add_ats" name="auto_add_ats"
@@ -141,13 +145,15 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
> >
<InputNumber min={0} max={1} precision={2} disabled={jobRO} /> <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item {bodyshop.region_config.toLowerCase().startsWith("ca") && (
label={t("jobs.fields.ca_gst_registrant")} <Form.Item
name="ca_gst_registrant" label={t("jobs.fields.ca_gst_registrant")}
valuePropName="checked" name="ca_gst_registrant"
> valuePropName="checked"
<Switch disabled={jobRO} /> >
</Form.Item> <Switch disabled={jobRO} />
</Form.Item>
)}
</FormRow> </FormRow>
<Divider <Divider
orientation="left" orientation="left"