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

Resolved parts total discrepancy. IO-474

Browse Source
This commit is contained in:
Patrick Fic
2021-01-19 11:05:57 -08:00
parent 79982a6c3f
commit 7259d70b20
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,17 +30,16 @@ export default function JobBillsTotalComponent({ loading, bills, jobTotals }) {
}) })
); );
const discrepancy = Dinero(totals.parts.parts.total).subtract(billTotals); const totalPartsSublet = Dinero(totals.parts.parts.total).add(
Dinero(totals.parts.sublets.total)
);
const discrepancy = totalPartsSublet.subtract(billTotals);
return ( return (
<div className="job-bills-totals-container"> <div className="job-bills-totals-container">
<Statistic <Statistic
title={t("jobs.labels.partstotal")} title={t("jobs.labels.partstotal")}
value={Dinero(totals.parts.parts.total).toFormat()} value={totalPartsSublet.toFormat()}
/>
<Statistic
title={t("jobs.labels.subletstotal")}
value={Dinero(totals.parts.sublets.total).toFormat()}
/> />
<Statistic <Statistic
title={t("bills.labels.retailtotal")} title={t("bills.labels.retailtotal")}

2
client/src/translations/en_us/common.json
View File

@@ -1100,7 +1100,7 @@
"parts": "Parts", "parts": "Parts",
"partsfilter": "Parts Only", "partsfilter": "Parts Only",
"partssubletstotal": "Parts & Sublets Total", "partssubletstotal": "Parts & Sublets Total",
"partstotal": "Parts Total", "partstotal": "Parts Total (ex. Taxes)",
"rates": "Rates", "rates": "Rates",
"rates_subtotal": "All Rates Subtotal", "rates_subtotal": "All Rates Subtotal",
"reconciliation": { "reconciliation": {