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

IO-1468 QB and CDK Updates for MCE Markup

Browse Source
This commit is contained in:
Patrick Fic
2021-10-14 11:21:06 -07:00
parent 660f463aea
commit 1d210a9e52
9 changed files with 91 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/jobs-available-table/jobs-available-table.container.jsx
View File

@@ -501,7 +501,7 @@ async function CheckTaxRates(estData, bodyshop) {
//Set markup lines and tax lines as taxable.
//900510 is a mark up. 900510 is a discount.
if (bodyshop.region_config === "CA_SK" && jl.db_ref === "900510") {
if (jl.db_ref === "900510") {
estData.joblines.data[index].tax_part = true;
}
});

15
client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
View File

@@ -31,6 +31,7 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
<th>{t("joblines.fields.line_desc")}</th>
<th>{t("joblines.fields.part_type")}</th>
<th>{t("joblines.fields.act_price")}</th>
<th>{t("joblines.fields.prt_dsmk_m")}</th>
<th>{t("joblines.fields.op_code_desc")}</th>
<th>{t("joblines.fields.mod_lbr_ty")}</th>
<th>{t("joblines.fields.mod_lb_hrs")}</th>
@@ -70,6 +71,16 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
<ReadOnlyFormItem type="currency" />
</Form.Item>
</td>
<td>
<Form.Item
span={2}
// label={t("joblines.fields.prt_dsmk_m")}
key={`${index}prt_dsmk_m`}
name={[field.name, "prt_dsmk_m"]}
>
<ReadOnlyFormItem type="currency" />
</Form.Item>
</td>
<td>
<Form.Item
span={2}
@@ -108,7 +119,9 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
labelCol={{ span: 0 }}
rules={[
{
required: !!job.joblines[index].act_price,
required:
!!job.joblines[index].act_price ||
!!job.joblines[index].prt_dsmk_m,
//message: t("general.validation.required"),
},
]}