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

Futher calculations refinments and QBD testing.

Browse Source
This commit is contained in:
Patrick Fic
2023-01-26 17:01:12 -08:00
parent 0a60f77bfc
commit 25b89d191b
4 changed files with 104 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -520,7 +520,7 @@ async function ResolveCCCLineIssues(estData, bodyshop) {
//TODO Ensure that this doesnt get violated //TODO Ensure that this doesnt get violated
//This needs to be done before cleansing unq_seq since some misc prices could move over. //This needs to be done before cleansing unq_seq since some misc prices could move over.
estData.joblines.data.forEach((line) => { estData.joblines.data.forEach((line) => {
if (line.misc_amt && line.misc_amt > 0) { if (line.misc_amt && line.misc_amt !== 0) {
line.act_price = line.misc_amt; line.act_price = line.misc_amt;
line.part_type = "PAS"; line.part_type = "PAS";
line.tax_part = line.misc_tax; line.tax_part = line.misc_tax;
@@ -546,6 +546,8 @@ async function ResolveCCCLineIssues(estData, bodyshop) {
...estData.joblines.data[nonRefLineIndex + 1], ...estData.joblines.data[nonRefLineIndex + 1],
act_price: null, act_price: null,
db_price: null, db_price: null,
prt_dsmk_p: 0,
prt_dsmk_m: 0,
}; };
}); });
} }

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

@@ -29,7 +29,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "PAA", "prt_discp"]} name={["parts_tax_rates", "PAA", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -42,7 +42,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "PAA", "prt_mkupp"]} name={["parts_tax_rates", "PAA", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -68,7 +68,7 @@ export function JobsDetailRatesParts({
}, },
]} ]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
); );
}} }}
@@ -79,7 +79,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "PAC", "prt_discp"]} name={["parts_tax_rates", "PAC", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -92,7 +92,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "PAC", "prt_mkupp"]} name={["parts_tax_rates", "PAC", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -118,7 +118,7 @@ export function JobsDetailRatesParts({
}, },
]} ]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
); );
}} }}
@@ -129,7 +129,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "PAL", "prt_discp"]} name={["parts_tax_rates", "PAL", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -142,7 +142,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "PAL", "prt_mkupp"]} name={["parts_tax_rates", "PAL", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -168,7 +168,7 @@ export function JobsDetailRatesParts({
}, },
]} ]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
); );
}} }}
@@ -179,7 +179,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "PAG", "prt_discp"]} name={["parts_tax_rates", "PAG", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -192,7 +192,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "PAG", "prt_mkupp"]} name={["parts_tax_rates", "PAG", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -218,7 +218,7 @@ export function JobsDetailRatesParts({
}, },
]} ]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
); );
}} }}
@@ -229,7 +229,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "PAM", "prt_discp"]} name={["parts_tax_rates", "PAM", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -242,7 +242,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "PAM", "prt_mkupp"]} name={["parts_tax_rates", "PAM", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -268,7 +268,7 @@ export function JobsDetailRatesParts({
}, },
]} ]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
); );
}} }}
@@ -279,7 +279,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "PAN", "prt_discp"]} name={["parts_tax_rates", "PAN", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -292,7 +292,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "PAN", "prt_mkupp"]} name={["parts_tax_rates", "PAN", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -318,7 +318,7 @@ export function JobsDetailRatesParts({
}, },
]} ]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
); );
}} }}
@@ -329,7 +329,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "PAO", "prt_discp"]} name={["parts_tax_rates", "PAO", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -342,7 +342,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "PAO", "prt_mkupp"]} name={["parts_tax_rates", "PAO", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -368,7 +368,7 @@ export function JobsDetailRatesParts({
}, },
]} ]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
); );
}} }}
@@ -379,7 +379,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "PAP", "prt_discp"]} name={["parts_tax_rates", "PAP", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -392,7 +392,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "PAP", "prt_mkupp"]} name={["parts_tax_rates", "PAP", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -418,7 +418,7 @@ export function JobsDetailRatesParts({
}, },
]} ]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
); );
}} }}
@@ -429,7 +429,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "PAR", "prt_discp"]} name={["parts_tax_rates", "PAR", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -442,7 +442,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "PAR", "prt_mkupp"]} name={["parts_tax_rates", "PAR", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -468,7 +468,7 @@ export function JobsDetailRatesParts({
}, },
]} ]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
); );
}} }}
@@ -479,7 +479,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "PAS", "prt_discp"]} name={["parts_tax_rates", "PAS", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -492,7 +492,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "PAS", "prt_mkupp"]} name={["parts_tax_rates", "PAS", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -518,7 +518,7 @@ export function JobsDetailRatesParts({
}, },
]} ]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
); );
}} }}
@@ -529,7 +529,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "PASL", "prt_discp"]} name={["parts_tax_rates", "PASL", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -542,7 +542,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "PASL", "prt_mkupp"]} name={["parts_tax_rates", "PASL", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -568,7 +568,7 @@ export function JobsDetailRatesParts({
}, },
]} ]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
); );
}} }}
@@ -579,7 +579,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "CCDR", "prt_discp"]} name={["parts_tax_rates", "CCDR", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -592,7 +592,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "CCDR", "prt_mkupp"]} name={["parts_tax_rates", "CCDR", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -605,7 +605,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_tax_rt")} label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
name={["parts_tax_rates", "CCDR", "prt_tax_rt"]} name={["parts_tax_rates", "CCDR", "prt_tax_rt"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow header={t("joblines.fields.part_types.CCF")}> <LayoutFormRow header={t("joblines.fields.part_types.CCF")}>
@@ -613,7 +613,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "CCF", "prt_discp"]} name={["parts_tax_rates", "CCF", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -626,7 +626,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "CCF", "prt_mkupp"]} name={["parts_tax_rates", "CCF", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -639,7 +639,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_tax_rt")} label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
name={["parts_tax_rates", "CCF", "prt_tax_rt"]} name={["parts_tax_rates", "CCF", "prt_tax_rt"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow header={t("joblines.fields.part_types.CCM")}> <LayoutFormRow header={t("joblines.fields.part_types.CCM")}>
@@ -647,7 +647,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "CCM", "prt_discp"]} name={["parts_tax_rates", "CCM", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -660,7 +660,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "CCM", "prt_mkupp"]} name={["parts_tax_rates", "CCM", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -673,7 +673,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_tax_rt")} label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
name={["parts_tax_rates", "CCM", "prt_tax_rt"]} name={["parts_tax_rates", "CCM", "prt_tax_rt"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow header={t("joblines.fields.part_types.CCC")}> <LayoutFormRow header={t("joblines.fields.part_types.CCC")}>
@@ -681,7 +681,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "CCC", "prt_discp"]} name={["parts_tax_rates", "CCC", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -694,7 +694,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "CCC", "prt_mkupp"]} name={["parts_tax_rates", "CCC", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -707,7 +707,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_tax_rt")} label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
name={["parts_tax_rates", "CCC", "prt_tax_rt"]} name={["parts_tax_rates", "CCC", "prt_tax_rt"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow header={t("joblines.fields.part_types.CCD")}> <LayoutFormRow header={t("joblines.fields.part_types.CCD")}>
@@ -715,7 +715,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_discp")} label={t("jobs.fields.parts_tax_rates.prt_discp")}
name={["parts_tax_rates", "CCD", "prt_discp"]} name={["parts_tax_rates", "CCD", "prt_discp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_mktyp")} label={t("jobs.fields.parts_tax_rates.prt_mktyp")}
@@ -728,7 +728,7 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_mkupp")} label={t("jobs.fields.parts_tax_rates.prt_mkupp")}
name={["parts_tax_rates", "CCD", "prt_mkupp"]} name={["parts_tax_rates", "CCD", "prt_mkupp"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.parts_tax_rates.prt_tax_in")} label={t("jobs.fields.parts_tax_rates.prt_tax_in")}
@@ -741,39 +741,39 @@ export function JobsDetailRatesParts({
label={t("jobs.fields.parts_tax_rates.prt_tax_rt")} label={t("jobs.fields.parts_tax_rates.prt_tax_rt")}
name={["parts_tax_rates", "CCD", "prt_tax_rt"]} name={["parts_tax_rates", "CCD", "prt_tax_rt"]}
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow> <LayoutFormRow>
<Form.Item label={t("jobs.fields.tax_tow_rt")} name="tax_tow_rt"> <Form.Item label={t("jobs.fields.tax_tow_rt")} name="tax_tow_rt">
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.tax_str_rt")} name="tax_str_rt"> <Form.Item label={t("jobs.fields.tax_str_rt")} name="tax_str_rt">
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.tax_paint_mat_rt")} label={t("jobs.fields.tax_paint_mat_rt")}
name="tax_paint_mat_rt" name="tax_paint_mat_rt"
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.tax_shop_mat_rt")} label={t("jobs.fields.tax_shop_mat_rt")}
name="tax_shop_mat_rt" name="tax_shop_mat_rt"
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.tax_sub_rt")} name="tax_sub_rt"> <Form.Item label={t("jobs.fields.tax_sub_rt")} name="tax_sub_rt">
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.tax_lbr_rt")} name="tax_lbr_rt"> <Form.Item label={t("jobs.fields.tax_lbr_rt")} name="tax_lbr_rt">
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.tax_levies_rt")} label={t("jobs.fields.tax_levies_rt")}
name="tax_levies_rt" name="tax_levies_rt"
> >
<InputNumber min={0} max={100} precision={2} disabled={jobRO} /> <InputNumber min={0} max={100} precision={4} disabled={jobRO} />
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
</Collapse.Panel> </Collapse.Panel>

16
job-totals-testing-util.js
View File

@@ -20,7 +20,7 @@ require("dotenv").config({
async function RunTheTest() { async function RunTheTest() {
const bodyshopids = ["6c63a820-542c-497e-8c82-0cc38fb2bbca"]; const bodyshopids = ["6c63a820-542c-497e-8c82-0cc38fb2bbca"];
const bearerToken = `Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImQwNTU5YzU5MDgzZDc3YWI2NDUxOThiNTIxZmM4ZmVmZmVlZmJkNjIiLCJ0eXAiOiJKV1QifQ.eyJuYW1lIjoiUGF0cmljayBGaWMgKERFVikiLCJodHRwczovL2hhc3VyYS5pby9qd3QvY2xhaW1zIjp7IngtaGFzdXJhLWRlZmF1bHQtcm9sZSI6InVzZXIiLCJ4LWhhc3VyYS1hbGxvd2VkLXJvbGVzIjpbInVzZXIiXSwieC1oYXN1cmEtdXNlci1pZCI6ImhOSjhBRHB0REhRQkRFcXNCOFFNWVRqaURuZjEifSwiaXNzIjoiaHR0cHM6Ly9zZWN1cmV0b2tlbi5nb29nbGUuY29tL2ltZXgtZGV2IiwiYXVkIjoiaW1leC1kZXYiLCJhdXRoX3RpbWUiOjE2NzQ1OTgwMTEsInVzZXJfaWQiOiJoTko4QURwdERIUUJERXFzQjhRTVlUamlEbmYxIiwic3ViIjoiaE5KOEFEcHRESFFCREVxc0I4UU1ZVGppRG5mMSIsImlhdCI6MTY3NDY3MzYyOSwiZXhwIjoxNjc0Njc3MjI5LCJlbWFpbCI6InBhdHJpY2tAaW1leC5kZXYiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsicGF0cmlja0BpbWV4LmRldiJdfSwic2lnbl9pbl9wcm92aWRlciI6InBhc3N3b3JkIn19.UGFIwVz_B8Q2m7_lmpT8U4Kq0LG3N-yiv4eRhWybme46y1OCiUpw1dJct-vjunprGTrRXdRlWsEOBEmPULYYbKektcHs60boxQxPty9YghageMcknj14ujoLE98Gz3pN6De4mAQMtqYdWaC20OWrH8wIDGkoFMN7PHhY-c2QWdt-UQH_OUW0dqY0vSSJIlC9QNI3Rjn0N6if40j2jnTF9qgIClRjoWN9OBh1s1qIou6yNchnA2v9ni1Js_kGmMJfixmkTxUau3THCxVQAdPtuwURYRn1Xa8Eo5feo0FLoFbPtylHUZyaoogE7q6ZQkHA2A3ylIxWhYUspyPzkIyf_g`; const bearerToken = `Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImQwNWI0MDljNmYyMmM0MDNlMWY5MWY5ODY3YWM0OTJhOTA2MTk1NTgiLCJ0eXAiOiJKV1QifQ.eyJuYW1lIjoiUGF0cmljayBGaWMgKERFVikiLCJodHRwczovL2hhc3VyYS5pby9qd3QvY2xhaW1zIjp7IngtaGFzdXJhLWRlZmF1bHQtcm9sZSI6InVzZXIiLCJ4LWhhc3VyYS1hbGxvd2VkLXJvbGVzIjpbInVzZXIiXSwieC1oYXN1cmEtdXNlci1pZCI6ImhOSjhBRHB0REhRQkRFcXNCOFFNWVRqaURuZjEifSwiaXNzIjoiaHR0cHM6Ly9zZWN1cmV0b2tlbi5nb29nbGUuY29tL2ltZXgtZGV2IiwiYXVkIjoiaW1leC1kZXYiLCJhdXRoX3RpbWUiOjE2NzQ1OTgwMTEsInVzZXJfaWQiOiJoTko4QURwdERIUUJERXFzQjhRTVlUamlEbmYxIiwic3ViIjoiaE5KOEFEcHRESFFCREVxc0I4UU1ZVGppRG5mMSIsImlhdCI6MTY3NDc3ODM3NCwiZXhwIjoxNjc0NzgxOTc0LCJlbWFpbCI6InBhdHJpY2tAaW1leC5kZXYiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsicGF0cmlja0BpbWV4LmRldiJdfSwic2lnbl9pbl9wcm92aWRlciI6InBhc3N3b3JkIn19.d6uLsEMeaG68m5jzageh5Wlesp-nPNARwic6QKZFoJbAk20Lr2nO7DOUQcsPlFQyFeoGTEG8mugkAfPAVkI76a7SlrgxsjesncO5DPfpKXPr3dIacmzW832ZYayMNZQFoWLmjYxI7WSEXhzxwaKOKdrjFYUQVo4urMyB1IiaNeZAUhIHhE6tTcxhbfHt7YYkMlWriKCTXfu-9L6EEkSXBOH1EaDOWLJ5bqjBdFjwgywalB8nShsmSi0F1AWoaXzXxVKb2RiPzRjByq2VbRhUXzV2EJIEG9Glxr1aQ7S8x-RlRkdgQgN1OHO3P3-SbMoz-7KZEjpc7H-FB1Dj5iXLhQ`;
const { jobs } = await client.request( const { jobs } = await client.request(
gql` gql`
query GET_JOBS($bodyshopids: [uuid!]!) { query GET_JOBS($bodyshopids: [uuid!]!) {
@@ -98,6 +98,20 @@ async function RunTheTest() {
} }
console.table(results); console.table(results);
const summary = results.reduce(
(acc, val) => {
if (val.result === "PASS") {
return { ...acc, pass: acc.pass + 1 };
} else {
return { ...acc, fail: acc.fail + 1 };
}
},
{ pass: 0, fail: 0 }
);
console.log(
"Pass Rate: ",
((summary.pass / (summary.fail + summary.pass)) * 100).toFixed(1)
);
} }
RunTheTest(); RunTheTest();

60
server/job/job-totals.js
View File

@@ -180,8 +180,6 @@ async function AutoAddAtsIfRequired({ job, client }) {
}); });
job.joblines[atsLineIndex].act_price = atsAmount; job.joblines[atsLineIndex].act_price = atsAmount;
} }
console.log(job.jobLines);
} }
} }
@@ -379,7 +377,6 @@ function CalculatePartsTotals(jobLines, parts_tax_rates) {
const ret = jl.reduce( const ret = jl.reduce(
(acc, value) => { (acc, value) => {
console.log(JSON.stringify(acc, null, 2));
switch (value.part_type) { switch (value.part_type) {
case "PAS": case "PAS":
case "PASL": case "PASL":
@@ -524,7 +521,11 @@ function CalculatePartsTotals(jobLines, parts_tax_rates) {
//Check if there's any parts in this part type. //Check if there's any parts in this part type.
if (ret.parts.list[key] !== undefined) { if (ret.parts.list[key] !== undefined) {
disc = ret.parts.list[key].total disc = ret.parts.list[key].total
.percentage(parts_tax_rates[key].prt_discp) .percentage(
Math.abs(parts_tax_rates[key].prt_discp) > 1
? parts_tax_rates[key].prt_discp
: parts_tax_rates[key].prt_discp * 100
)
.multiply(-1); .multiply(-1);
} }
} }
@@ -535,7 +536,9 @@ function CalculatePartsTotals(jobLines, parts_tax_rates) {
//Check if there's any parts in this part type. //Check if there's any parts in this part type.
if (ret.parts.list[key] !== undefined) { if (ret.parts.list[key] !== undefined) {
markup = ret.parts.list[key].total.percentage( markup = ret.parts.list[key].total.percentage(
parts_tax_rates[key].prt_mkupp * 100 //Seems that mark up is written as decimal not %. Math.abs(parts_tax_rates[key].prt_mkupp) > 1
? parts_tax_rates[key].prt_mkupp
: parts_tax_rates[key].prt_mkupp * 100 //Seems that mark up is written as decimal not %.
); );
} }
} }
@@ -736,20 +739,20 @@ function CalculateTaxesTotals(job, otherTotals) {
otherTotals.additional.storage.percentage((job.tax_str_rt || 0) * 100) otherTotals.additional.storage.percentage((job.tax_str_rt || 0) * 100)
) )
.add(additionalItemsTax), .add(additionalItemsTax),
// .add( // .add(
// otherTotals.rates.mapa.hasMapaLine === false //If parts and materials were not added as lines, we must calculate the taxes on them. // otherTotals.rates.mapa.hasMapaLine === false //If parts and materials were not added as lines, we must calculate the taxes on them.
// ? otherTotals.rates.mapa.total.percentage( // ? otherTotals.rates.mapa.total.percentage(
// (job.tax_paint_mat_rt || 0) * 100 // (job.tax_paint_mat_rt || 0) * 100
// ) // )
// : Dinero() // : Dinero()
// ) // )
// .add( // .add(
// otherTotals.rates.mash.hasMashLine === false //If parts and materials were not added as lines, we must calculate the taxes on them. // otherTotals.rates.mash.hasMashLine === false //If parts and materials were not added as lines, we must calculate the taxes on them.
// ? otherTotals.rates.mash.total.percentage( // ? otherTotals.rates.mash.total.percentage(
// (job.tax_paint_mat_rt || 0) * 100 // (job.tax_paint_mat_rt || 0) * 100
// ) // )
// : Dinero() // : Dinero()
// ) // ),
// .add(otherTotals.additional.pvrt), // .add(otherTotals.additional.pvrt),
local_tax: subtotal.percentage((job.local_tax_rate || 0) * 100), local_tax: subtotal.percentage((job.local_tax_rate || 0) * 100),
}; };
@@ -787,6 +790,15 @@ function CalculateTaxesTotals(job, otherTotals) {
exports.default = Totals; exports.default = Totals;
function DiscountNotAlreadyCounted(jobline, joblines) { function DiscountNotAlreadyCounted(jobline, joblines) {
//CCC already factors in the discount. If the difference between the 2 is exactly the discount, it's all good.
if (
Math.round(
(jobline.prt_dsmk_m / (jobline.act_price - jobline.prt_dsmk_m)) * 100
) === Math.abs(jobline.prt_dsmk_p)
) {
return false;
}
if ( if (
//If it's not a discount line, then it definitely hasn't been counted yet. //If it's not a discount line, then it definitely hasn't been counted yet.
jobline.db_ref !== "900510" && jobline.db_ref !== "900510" &&
@@ -794,16 +806,6 @@ function DiscountNotAlreadyCounted(jobline, joblines) {
) )
return true; return true;
if (jobline.unq_seq === '68') {
console.log("stophere");
}
//CCC already factors in the discount. If the difference between the 2 is exactly the discount, it's all good.
if (
Math.round(jobline.prt_dsmk_m / jobline.act_price - jobline.prt_dsmk_m) ===
Math.abs(jobline.prt_dsmk_p)
)
return false;
const ParentLine = joblines.find((j) => j.unq_seq === jobline.line_ref); const ParentLine = joblines.find((j) => j.unq_seq === jobline.line_ref);
return ParentLine && !(ParentLine.prt_dsmk_m && ParentLine.prt_dsmk_m !== 0); return ParentLine && !(ParentLine.prt_dsmk_m && ParentLine.prt_dsmk_m !== 0);