BOD-72 Refactored calculations to use Dinero library.

This commit is contained in:
Patrick Fic
2020-04-29 13:25:31 -07:00
parent a9bd0a5ccb
commit 99d3a6a64e
6 changed files with 240 additions and 209 deletions

View File

@@ -109,9 +109,9 @@ export function JobsDetailPage({
jobId: job.id,
job: {
...values,
clm_total: newTotals.totals.total_repairs,
owner_owing: newTotals.custPayable.total,
job_totals: newTotals,
clm_total: newTotals.totals.total_repairs.toFormat("0.00"),
owner_owing: newTotals.custPayable.total.toFormat("0.00"),
job_totals: JSON.stringify(newTotals),
},
},
}).then((r) => {
@@ -124,15 +124,21 @@ export function JobsDetailPage({
return (
<Suspense
fallback={<LoadingSpinner message={t("general.labels.loadingapp")} />}
>
fallback={<LoadingSpinner message={t("general.labels.loadingapp")} />}>
<ScheduleJobModalContainer />
<JobLineUpsertModalContainer />
<button
onClick={() => {
let r = CalculateJob(job, bodyshop.shoprates);
console.log("r", r);
}}>
Calculate
</button>
<Form
form={form}
//onFieldsChange={(a, b) => console.log("a,b", a, b)}
name="JobDetailForm"
name='JobDetailForm'
onFinish={handleFinish}
{...formItemLayout}
autoComplete={"off"}
@@ -163,8 +169,7 @@ export function JobsDetailPage({
date_invoiced: job.date_invoiced ? moment(job.date_invoiced) : null,
date_closed: job.date_closed ? moment(job.date_closed) : null,
date_exported: job.date_exported ? moment(job.date_exported) : null,
}}
>
}}>
<JobsDetailHeader
job={job}
mutationConvertJob={mutationConvertJob}
@@ -174,8 +179,7 @@ export function JobsDetailPage({
/>
<Tabs
defaultActiveKey={search.tab}
onChange={(key) => history.push({ search: `?tab=${key}` })}
>
onChange={(key) => history.push({ search: `?tab=${key}` })}>
<Tabs.TabPane
tab={
<span>
@@ -183,8 +187,7 @@ export function JobsDetailPage({
{t("menus.jobsdetail.claimdetail")}
</span>
}
key="claimdetail"
>
key='claimdetail'>
<JobsDetailClaims job={job} />
</Tabs.TabPane>
<Tabs.TabPane
@@ -194,8 +197,7 @@ export function JobsDetailPage({
{t("menus.jobsdetail.insurance")}
</span>
}
key="insurance"
>
key='insurance'>
<JobsDetailInsurance job={job} form={form} />
</Tabs.TabPane>
<Tabs.TabPane
@@ -205,8 +207,7 @@ export function JobsDetailPage({
{t("menus.jobsdetail.repairdata")}
</span>
}
key="repairdata"
>
key='repairdata'>
<JobsLinesContainer jobId={job.id} />
</Tabs.TabPane>
<Tabs.TabPane
@@ -216,8 +217,7 @@ export function JobsDetailPage({
{t("menus.jobsdetail.financials")}
</span>
}
key="financials"
>
key='financials'>
<JobsDetailFinancials job={job} />
</Tabs.TabPane>
<Tabs.TabPane
@@ -227,8 +227,7 @@ export function JobsDetailPage({
{t("menus.jobsdetail.partssublet")}
</span>
}
key="partssublet"
>
key='partssublet'>
<JobsDetailPliContainer job={job} />
</Tabs.TabPane>
<Tabs.TabPane
@@ -238,8 +237,7 @@ export function JobsDetailPage({
{t("menus.jobsdetail.labor")}
</span>
}
key="labor"
>
key='labor'>
<JobsDetailLaborContainer jobId={job.id} />
</Tabs.TabPane>
<Tabs.TabPane
@@ -249,8 +247,7 @@ export function JobsDetailPage({
{t("menus.jobsdetail.dates")}
</span>
}
key="dates"
>
key='dates'>
<JobsDetailDatesComponent job={job} />}
</Tabs.TabPane>
<Tabs.TabPane
@@ -260,8 +257,7 @@ export function JobsDetailPage({
{t("jobs.labels.documents")}
</span>
}
key="documents"
>
key='documents'>
<JobsDocumentsGalleryContainer jobId={job.id} />
</Tabs.TabPane>
<Tabs.TabPane
@@ -271,8 +267,7 @@ export function JobsDetailPage({
{t("jobs.labels.notes")}
</span>
}
key="notes"
>
key='notes'>
<JobNotesContainer jobId={job.id} />
</Tabs.TabPane>
@@ -283,8 +278,7 @@ export function JobsDetailPage({
{t("jobs.labels.audit")}
</span>
}
key="audit"
>
key='audit'>
<JobsDetailAuditContainer recordId={job.id} />
</Tabs.TabPane>
</Tabs>