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

Null handling missed in previous updates.

Browse Source
This commit is contained in:
Patrick Fic
2021-03-30 11:35:38 -07:00
parent 0498c8781f
commit a0654bdb2c
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/job-bills-total/job-bills-total.component.jsx
View File

@@ -118,7 +118,7 @@ export default function JobBillsTotalComponent({
<Statistic <Statistic
title={t("bills.labels.totalreturns")} title={t("bills.labels.totalreturns")}
value={totalReturns.toFormat()} value={totalReturns.toFormat()}
/>{" "} />
<Statistic <Statistic
title={t("bills.labels.creditsreceived")} title={t("bills.labels.creditsreceived")}
value={billCms.toFormat()} value={billCms.toFormat()}

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

@@ -133,7 +133,7 @@ export default function JobsAvailableComponent({
title: t("general.labels.actions"), title: t("general.labels.actions"),
key: "actions", key: "actions",
render: (text, record) => ( render: (text, record) => (
<Space> <Space wrap>
<Button <Button
onClick={() => { onClick={() => {
deleteJob({ variables: { id: record.id } }).then((r) => { deleteJob({ variables: { id: record.id } }).then((r) => {

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

@@ -352,7 +352,9 @@ function CalculateTaxesTotals(job, otherTotals) {
((job.parts_tax_rates && ((job.parts_tax_rates &&
job.parts_tax_rates[val.part_type] && job.parts_tax_rates[val.part_type] &&
job.parts_tax_rates[val.part_type].prt_tax_rt) || job.parts_tax_rates[val.part_type].prt_tax_rt) ||
(val.part_type.startsWith("PAG") && (val.part_type &&
val.part_type.startsWith("PAG") &&
BackupGlassTax &&
BackupGlassTax.prt_tax_rt) || BackupGlassTax.prt_tax_rt) ||
0) * 100 0) * 100
) )