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

IO-975 IO-978 IO-922 Multiple bug fixes.

Browse Source
This commit is contained in:
Patrick Fic
2021-05-03 11:53:23 -07:00
parent bf77bbd4ee
commit 1482786b2c
18 changed files with 1722 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
View File

@@ -86,14 +86,24 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
<ProductionListColumnProductionNote record={job} />
</DataLabel>
)}
{job.special_coverage_policy && (
<Tag color="tomato">
<Space>
<WarningFilled />
<span>{t("jobs.labels.specialcoveragepolicy")}</span>
</Space>
</Tag>
)}
<Space>
{job.special_coverage_policy && (
<Tag color="tomato">
<Space>
<WarningFilled />
<span>{t("jobs.labels.specialcoveragepolicy")}</span>
</Space>
</Tag>
)}
{job.ca_gst_registrant && (
<Tag color="geekblue">
<Space>
<WarningFilled />
<span>{t("jobs.fields.ca_gst_registrant")}</span>
</Space>
</Tag>
)}
</Space>
</div>
</Card>
</Col>

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

@@ -1,4 +1,4 @@
import { Form, Input, InputNumber, Select, Space, Switch } from "antd";
import { Form, Input, InputNumber, Select, Space, Switch, Tooltip } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
@@ -28,6 +28,14 @@ export function JobsDetailRates({ jobRO, form }) {
>
<CurrencyInput disabled={jobRO} />
</Form.Item>
<Tooltip title={t("jobs.labels.ca_gst_all_if_null")}>
<Form.Item
label={t("jobs.fields.ca_customer_gst")}
name="ca_customer_gst"
>
<CurrencyInput disabled={jobRO} />
</Form.Item>
</Tooltip>
<Form.Item
label={t("jobs.fields.other_amount_payable")}
name="other_amount_payable"
@@ -52,7 +60,6 @@ export function JobsDetailRates({ jobRO, form }) {
>
<CurrencyInput disabled={jobRO} />
</Form.Item>
<Space align="end">
<Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
<CurrencyInput disabled={jobRO} />