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

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

@@ -219,6 +219,7 @@ export function JobsConvertButton({
</Select> </Select>
</Form.Item> </Form.Item>
)} )}
{bodyshop.region_config.toLowerCase().startsWith("ca") && (
<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"
@@ -226,6 +227,7 @@ export function JobsConvertButton({
> >
<Switch /> <Switch />
</Form.Item> </Form.Item>
)}
<Form.Item <Form.Item
label={t("jobs.fields.driveable")} label={t("jobs.fields.driveable")}
name="driveable" name="driveable"

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

@@ -224,6 +224,7 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
> >
<CurrencyInput /> <CurrencyInput />
</Form.Item> </Form.Item>
{bodyshop.region_config.toLowerCase().startsWith("ca") && (
<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"
@@ -231,6 +232,7 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
> >
<Switch /> <Switch />
</Form.Item> </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"

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

@@ -40,6 +40,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
> >
<CurrencyInput disabled={jobRO} min={0} /> <CurrencyInput disabled={jobRO} min={0} />
</Form.Item> </Form.Item>
{bodyshop.region_config.toLowerCase().startsWith("ca") && (
<Tooltip title={t("jobs.labels.ca_gst_all_if_null")}> <Tooltip title={t("jobs.labels.ca_gst_all_if_null")}>
<Form.Item <Form.Item
label={t("jobs.fields.ca_customer_gst")} label={t("jobs.fields.ca_customer_gst")}
@@ -58,6 +59,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
/> />
</Form.Item> </Form.Item>
</Tooltip> </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>
{bodyshop.region_config === "CA_BC" && (
<Space align="center"> <Space align="center">
<Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt"> <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
<CurrencyInput disabled={jobRO} min={0} /> <CurrencyInput disabled={jobRO} min={0} />
</Form.Item> </Form.Item>
<CABCpvrtCalculator form={form} disabled={jobRO} /> <CABCpvrtCalculator form={form} disabled={jobRO} />
</Space> </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,6 +145,7 @@ 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>
{bodyshop.region_config.toLowerCase().startsWith("ca") && (
<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"
@@ -148,6 +153,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
> >
<Switch disabled={jobRO} /> <Switch disabled={jobRO} />
</Form.Item> </Form.Item>
)}
</FormRow> </FormRow>
<Divider <Divider
orientation="left" orientation="left"