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

IO-1436 App tax part fix to all regions.

Browse Source
This commit is contained in:
Patrick Fic
2021-10-05 11:36:21 -07:00
parent cdb4da9e5f
commit 65550c7bf4
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
View File

@@ -167,7 +167,11 @@ export function JobChecklistForm({
title={t("checklist.labels.checklist")} title={t("checklist.labels.checklist")}
extra={ extra={
!readOnly && ( !readOnly && (
<Button loading={loading} onClick={() => form.submit()}> <Button
loading={loading}
type="primary"
onClick={() => form.submit()}
>
{t("general.actions.submit")} {t("general.actions.submit")}
</Button> </Button>
) )

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

@@ -490,15 +490,14 @@ async function CheckTaxRates(estData, bodyshop) {
//IO-1387 If a sublet line is NOT R&R, use the labor tax. If it is, use the sublet tax rate. //IO-1387 If a sublet line is NOT R&R, use the labor tax. If it is, use the sublet tax rate.
//Currently limited to SK shops only. //Currently limited to SK shops only.
if (bodyshop.region_config === "CA_SK") { //if (bodyshop.region_config === "CA_SK") {
estData.joblines.data.forEach((jl, index) => { estData.joblines.data.forEach((jl, index) => {
if ( if (
(jl.part_type === "PASL" || jl.part_type === "PAS") && (jl.part_type === "PASL" || jl.part_type === "PAS") &&
jl.lbr_op !== "OP11" jl.lbr_op !== "OP11"
) { ) {
estData.joblines.data[index].tax_part = jl.lbr_tax; estData.joblines.data[index].tax_part = jl.lbr_tax;
console.log(estData.joblines.data[index], jl); }
} });
}); //}
}
} }