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

BOD-62 Added new job calculations on import + supplement.

Browse Source
This commit is contained in:
Patrick Fic
2020-04-14 14:09:19 -07:00
parent a8caca2f7f
commit ad87cb31ef
18 changed files with 1747 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
client/src/components/job-totals-table/job-totals-table.container.jsx
View File

@@ -1,39 +0,0 @@
import { useQuery } from "@apollo/react-hooks";
import React, { useEffect, useState } from "react";
import { QUERY_JOB_FINANCIALS } from "../../graphql/jobs.queries";
import AlertComponent from "../alert/alert.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import JobTotalsTableComponent from "./job-totals-table.component";
import { CalculateJob } from "./job-totals.utility";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
});
export function JobTotalsTableContainer({ jobId, bodyshop }) {
const { loading, error, data } = useQuery(QUERY_JOB_FINANCIALS, {
variables: { jobId: jobId }
});
const [totals, setTotals] = useState(null);
useEffect(() => {
if (!!data) {
setTotals(CalculateJob(data.jobs_by_pk, bodyshop.shoprates));
}
}, [data, setTotals, bodyshop.shoprates]);
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type='error' />;
return (
<div>
<JobTotalsTableComponent totals={totals} />
</div>
);
}
export default connect(mapStateToProps, null)(JobTotalsTableContainer);

37
client/src/components/job-totals-table/job-totals.utility.js
View File

@@ -15,11 +15,10 @@ function CalculateTaxesTotals(job, otherTotals) {
otherTotals.parts.parts.subtotal +
otherTotals.parts.sublets.subtotal +
otherTotals.rates.subtotal +
job.towing_payable +
job.storage_payable; //Levies should be included??
(job.towing_payable || 0) +
(job.storage_payable || 0); //Levies should be included??
const statePartsTax = job.joblines.reduce((acc, val) => {
console.log("val", val);
if (!!!val.tax_part) return acc;
if (!!job.parts_tax_rates[val.part_type]) {
return (
@@ -75,82 +74,82 @@ function CalculateRatesTotals(ratesList, shoprates) {
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LA1")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
rate: ratesList.rate_la1,
rate: ratesList.rate_la1 || 0,
},
rate_la2: {
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LA2")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
rate: ratesList.rate_la2,
rate: ratesList.rate_la2 || 0,
},
rate_la3: {
rate: ratesList.rate_la3,
rate: ratesList.rate_la3 || 0,
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LA3")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
},
rate_la4: {
rate: ratesList.rate_la4,
rate: ratesList.rate_la4 || 0,
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LA4")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
},
rate_laa: {
rate: ratesList.rate_laa,
rate: ratesList.rate_laa || 0,
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LAA")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
},
rate_lab: {
rate: ratesList.rate_lab,
rate: ratesList.rate_lab || 0,
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LAB")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
},
rate_lad: {
rate: ratesList.rate_lad,
rate: ratesList.rate_lad || 0,
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LAD")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
},
rate_lae: {
rate: ratesList.rate_lae,
rate: ratesList.rate_lae || 0,
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LAE")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
},
rate_laf: {
rate: ratesList.rate_laf,
rate: ratesList.rate_laf || 0,
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LAF")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
},
rate_lag: {
rate: ratesList.rate_lag,
rate: ratesList.rate_lag || 0,
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LAG")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
},
rate_lam: {
rate: ratesList.rate_lam,
rate: ratesList.rate_lam || 0,
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LAM")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
},
rate_lar: {
rate: ratesList.rate_lar,
rate: ratesList.rate_lar || 0,
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LAR")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
},
rate_las: {
rate: ratesList.rate_las,
rate: ratesList.rate_las || 0,
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LAS")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
},
rate_lau: {
rate: ratesList.rate_lau,
rate: ratesList.rate_lau || 0,
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LAU")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
@@ -176,13 +175,13 @@ function CalculateRatesTotals(ratesList, shoprates) {
: 0,
},
paint_mat: {
rate: ratesList.rate_mapa,
rate: ratesList.rate_mapa || 0,
hours: jobLines
.filter((item) => item.mod_lbr_ty === "LAR")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),
},
shop_mat: {
rate: ratesList.rate_mash,
rate: ratesList.rate_mash || 0,
hours: jobLines
.filter((item) => item.mod_lbr_ty !== "LAR")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0),

64
client/src/components/jobs-available-new/jobs-available-new.container.jsx
View File

@@ -1,23 +1,35 @@
import { useMutation, useQuery } from "@apollo/react-hooks";
import { notification } from "antd";
import React, { useState } from "react";
import { useMutation, useQuery } from "@apollo/react-hooks";
import { useTranslation } from "react-i18next";
import { withRouter } from "react-router-dom";
import { DELETE_ALL_AVAILABLE_NEW_JOBS, QUERY_AVAILABLE_NEW_JOBS } from "../../graphql/available-jobs.queries";
import { connect } from "react-redux";
import { useHistory } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import { CalculateJob } from "../../components/job-totals-table/job-totals.utility";
import {
DELETE_ALL_AVAILABLE_NEW_JOBS,
QUERY_AVAILABLE_NEW_JOBS,
} from "../../graphql/available-jobs.queries";
import { INSERT_NEW_JOB } from "../../graphql/jobs.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
import AlertComponent from "../alert/alert.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import JobsAvailableComponent from "./jobs-available-new.component";
export default withRouter(function JobsAvailableContainer({
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
});
export function JobsAvailableContainer({
deleteJob,
estDataLazyLoad,
history
bodyshop,
}) {
const { loading, error, data, refetch } = useQuery(QUERY_AVAILABLE_NEW_JOBS, {
fetchPolicy: "network-only"
fetchPolicy: "network-only",
});
const history = useHistory();
const { t } = useTranslation();
const [modalVisible, setModalVisible] = useState(false);
@@ -41,22 +53,38 @@ export default withRouter(function JobsAvailableContainer({
//We don't have the right data. Error!
setInsertLoading(false);
notification["error"]({
message: t("jobs.errors.creating", { error: "No job data present." })
message: t("jobs.errors.creating", { error: "No job data present." }),
});
} else {
const newTotals = CalculateJob(
{
...estData.data.available_jobs_by_pk.est_data,
joblines: estData.data.available_jobs_by_pk.est_data.joblines.data,
},
bodyshop.shoprates
);
const newJob = {
...estData.data.available_jobs_by_pk.est_data,
clm_total: newTotals.totals.total_repairs,
owner_owing: newTotals.custPayable.total,
job_totals: newTotals,
};
console.log("newTotals", newTotals);
insertNewJob({
variables: {
job: selectedOwner
? Object.assign(
{},
estData.data.available_jobs_by_pk.est_data,
newJob,
{ owner: null },
{ ownerid: selectedOwner }
)
: estData.data.available_jobs_by_pk.est_data
}
: newJob,
},
})
.then(r => {
.then((r) => {
notification["success"]({
message: t("jobs.successes.created"),
onClick: () => {
@@ -64,20 +92,21 @@ export default withRouter(function JobsAvailableContainer({
history.push(
`/manage/jobs/${r.data.insert_jobs.returning[0].id}`
);
}
},
});
//Job has been inserted. Clean up the available jobs record.
deleteJob({
variables: { id: estData.data.available_jobs_by_pk.id }
}).then(r => {
variables: { id: estData.data.available_jobs_by_pk.id },
}).then((r) => {
refetch();
setInsertLoading(false);
});
})
.catch(r => {
.catch((r) => {
//error while inserting
notification["error"]({
message: t("jobs.errors.creating", { error: r.message })
message: t("jobs.errors.creating", { error: r.message }),
});
refetch();
setInsertLoading(false);
@@ -115,4 +144,5 @@ export default withRouter(function JobsAvailableContainer({
/>
</LoadingSpinner>
);
});
}
export default connect(mapStateToProps, null)(JobsAvailableContainer);

65
client/src/components/jobs-available-supplement/jobs-available-supplement.container.jsx
View File

@@ -1,31 +1,36 @@
import { useMutation, useQuery } from "@apollo/react-hooks";
import { notification } from "antd";
import React, { useState } from "react";
import { useMutation, useQuery } from "@apollo/react-hooks";
import { useTranslation } from "react-i18next";
import { withRouter } from "react-router-dom";
import {
DELETE_ALL_AVAILABLE_SUPPLEMENT_JOBS,
QUERY_AVAILABLE_SUPPLEMENT_JOBS
} from "../../graphql/available-jobs.queries";
import { connect } from "react-redux";
import { useHistory } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import { CalculateJob } from "../../components/job-totals-table/job-totals.utility";
import { DELETE_ALL_AVAILABLE_SUPPLEMENT_JOBS, QUERY_AVAILABLE_SUPPLEMENT_JOBS } from "../../graphql/available-jobs.queries";
import { UPDATE_JOB } from "../../graphql/jobs.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
import AlertComponent from "../alert/alert.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import JobsAvailableSupplementComponent from "./jobs-available-supplement.component";
import HeaderFields from "./jobs-available-supplement.headerfields";
export default withRouter(function JobsAvailableSupplementContainer({
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
});
export function JobsAvailableSupplementContainer({
deleteJob,
estDataLazyLoad,
history
bodyshop,
}) {
const { loading, error, data, refetch } = useQuery(
QUERY_AVAILABLE_SUPPLEMENT_JOBS,
{
fetchPolicy: "network-only"
fetchPolicy: "network-only",
}
);
const { t } = useTranslation();
const history = useHistory();
const [deleteAllNewJobs] = useMutation(DELETE_ALL_AVAILABLE_SUPPLEMENT_JOBS);
const [modalVisible, setModalVisible] = useState(false);
@@ -49,48 +54,63 @@ export default withRouter(function JobsAvailableSupplementContainer({
//We don't have the right data. Error!
setInsertLoading(false);
notification["error"]({
message: t("jobs.errors.creating", { error: "No job data present." })
message: t("jobs.errors.creating", { error: "No job data present." }),
});
} else {
//create upsert job
let supp = estData.data.available_jobs_by_pk.est_data;
console.log("supp before", supp);
delete supp.joblines;
//TODO How to update the estimate lines.
delete supp.owner;
delete supp.vehicle;
if (importOptions.overrideHeaders) {
HeaderFields.forEach(item => delete supp[item]);
HeaderFields.forEach((item) => delete supp[item]);
}
const newTotals = CalculateJob(
{
...estData.data.available_jobs_by_pk.est_data,
joblines: estData.data.available_jobs_by_pk.est_data.joblines.data,
},
bodyshop.shoprates
);
console.log('newTotals', newTotals)
delete supp.joblines;
updateJob({
variables: {
jobId: selectedJob,
job: supp
}
job: {
...supp,
clm_total: newTotals.totals.total_repairs,
owner_owing: newTotals.custPayable.total,
job_totals: newTotals,
},
},
})
.then(r => {
.then((r) => {
notification["success"]({
message: t("jobs.successes.supplemented"),
onClick: () => {
history.push(
`/manage/jobs/${r.data.update_jobs.returning[0].id}`
);
}
},
});
//Job has been inserted. Clean up the available jobs record.
deleteJob({
variables: { id: estData.data.available_jobs_by_pk.id }
}).then(r => {
variables: { id: estData.data.available_jobs_by_pk.id },
}).then((r) => {
refetch();
setInsertLoading(false);
});
})
.catch(r => {
.catch((r) => {
//error while inserting
notification["error"]({
message: t("jobs.errors.creating", { error: r.message })
message: t("jobs.errors.creating", { error: r.message }),
});
refetch();
setInsertLoading(false);
@@ -128,4 +148,5 @@ export default withRouter(function JobsAvailableSupplementContainer({
/>
</LoadingSpinner>
);
});
}
export default connect(mapStateToProps, null)(JobsAvailableSupplementContainer);

75
client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
View File

@@ -1,7 +1,7 @@
import { Divider, Form, Input, InputNumber, Row, Col } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import JobTotalsTableContainer from "../job-totals-table/job-totals-table.container";
import JobTotalsTable from "../job-totals-table/job-totals-table.component";
export default function JobsDetailFinancials({ job }) {
const { t } = useTranslation();
@@ -9,123 +9,130 @@ export default function JobsDetailFinancials({ job }) {
return (
<Row>
<Col offset={1} span={10}>
<Form.Item label={t("jobs.fields.ded_amt")} name='ded_amt'>
<Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.ded_status")} name='ded_status'>
<Form.Item label={t("jobs.fields.ded_status")} name="ded_status">
<Input />
</Form.Item>
<Form.Item
label={t("jobs.fields.depreciation_taxes")}
name='depreciation_taxes'>
name="depreciation_taxes"
>
<InputNumber />
</Form.Item>
TODO This is equivalent of GST payable.
<Form.Item
label={t("jobs.fields.federal_tax_payable")}
name='federal_tax_payable'>
name="federal_tax_payable"
>
<InputNumber />
</Form.Item>
TODO equivalent of other customer amount
<Form.Item
label={t("jobs.fields.other_amount_payable")}
name='other_amount_payable'>
name="other_amount_payable"
>
<InputNumber />
</Form.Item>
<Form.Item
label={t("jobs.fields.towing_payable")}
name='towing_payable'>
name="towing_payable"
>
<InputNumber />
</Form.Item>
<Form.Item
label={t("jobs.fields.storage_payable")}
name='storage_payable'>
name="storage_payable"
>
<InputNumber />
</Form.Item>
<Form.Item
label={t("jobs.fields.adjustment_bottom_line")}
name='adjustment_bottom_line'>
name="adjustment_bottom_line"
>
<InputNumber />
</Form.Item>
<Divider />
<Form.Item
label={t("jobs.fields.labor_rate_desc")}
name='labor_rate_desc'>
name="labor_rate_desc"
>
<Input />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lab")} name='rate_lab'>
<Form.Item label={t("jobs.fields.rate_lab")} name="rate_lab">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lad")} name='rate_lad'>
<Form.Item label={t("jobs.fields.rate_lad")} name="rate_lad">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lae")} name='rate_lae'>
<Form.Item label={t("jobs.fields.rate_lae")} name="rate_lae">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lar")} name='rate_lar'>
<Form.Item label={t("jobs.fields.rate_lar")} name="rate_lar">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_las")} name='rate_las'>
<Form.Item label={t("jobs.fields.rate_las")} name="rate_las">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_laf")} name='rate_laf'>
<Form.Item label={t("jobs.fields.rate_laf")} name="rate_laf">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lam")} name='rate_lam'>
<Form.Item label={t("jobs.fields.rate_lam")} name="rate_lam">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lag")} name='rate_lag'>
<Form.Item label={t("jobs.fields.rate_lag")} name="rate_lag">
<InputNumber />
</Form.Item>
Note //TODO Remove ATP rate?
<Form.Item label={t("jobs.fields.rate_atp")} name='rate_atp'>
<Form.Item label={t("jobs.fields.rate_atp")} name="rate_atp">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_lau")} name='rate_lau'>
<Form.Item label={t("jobs.fields.rate_lau")} name="rate_lau">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la1")} name='rate_la1'>
<Form.Item label={t("jobs.fields.rate_la1")} name="rate_la1">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la2")} name='rate_la2'>
<Form.Item label={t("jobs.fields.rate_la2")} name="rate_la2">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la3")} name='rate_la3'>
<Form.Item label={t("jobs.fields.rate_la3")} name="rate_la3">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_la4")} name='rate_la4'>
<Form.Item label={t("jobs.fields.rate_la4")} name="rate_la4">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mapa")} name='rate_mapa'>
<Form.Item label={t("jobs.fields.rate_mapa")} name="rate_mapa">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mash")} name='rate_mash'>
<Form.Item label={t("jobs.fields.rate_mash")} name="rate_mash">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mahw")} name='rate_mahw'>
<Form.Item label={t("jobs.fields.rate_mahw")} name="rate_mahw">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_ma2s")} name='rate_ma2s'>
<Form.Item label={t("jobs.fields.rate_ma2s")} name="rate_ma2s">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_ma3s")} name='rate_ma3s'>
<Form.Item label={t("jobs.fields.rate_ma3s")} name="rate_ma3s">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_mabl")} name='rate_mabl'>
<Form.Item label={t("jobs.fields.rate_mabl")} name="rate_mabl">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_macs")} name='rate_macs'>
<Form.Item label={t("jobs.fields.rate_macs")} name="rate_macs">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_matd")} name='rate_matd'>
<Form.Item label={t("jobs.fields.rate_matd")} name="rate_matd">
<InputNumber />
</Form.Item>
<Form.Item label={t("jobs.fields.rate_laa")} name='rate_laa'>
<Form.Item label={t("jobs.fields.rate_laa")} name="rate_laa">
<InputNumber />
</Form.Item>
</Col>
<Col offset={1} span={12}>
<JobTotalsTableContainer jobId={job.id} />
<JobTotalsTable totals={job.job_totals} />
</Col>
</Row>
);

34
client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
View File

@@ -9,7 +9,7 @@ import {
Menu,
notification,
PageHeader,
Tag
Tag,
} from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
@@ -26,11 +26,11 @@ import VehicleTagPopoverComponent from "../vehicle-tag-popover/vehicle-tag-popov
import JobsDetailHeaderActions from "../jobs-detail-header-actions/jobs-detail-header-actions.component";
import { setModalContext } from "../../redux/modals/modals.actions";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
bodyshop: selectBodyshop,
});
const mapDispatchToProps = dispatch => ({
setScheduleContext: context =>
dispatch(setModalContext({ context: context, modal: "schedule" }))
const mapDispatchToProps = (dispatch) => ({
setScheduleContext: (context) =>
dispatch(setModalContext({ context: context, modal: "schedule" })),
});
export function JobsDetailHeader({
@@ -40,7 +40,7 @@ export function JobsDetailHeader({
bodyshop,
updateJobStatus,
setScheduleContext
setScheduleContext,
}) {
const { t } = useTranslation();
@@ -55,11 +55,11 @@ export function JobsDetailHeader({
const statusmenu = (
<Menu
onClick={e => {
onClick={(e) => {
updateJobStatus(e.key);
}}
>
{bodyshop.md_ro_statuses.statuses.map(item => (
{bodyshop.md_ro_statuses.statuses.map((item) => (
<Menu.Item key={item}>{item}</Menu.Item>
))}
</Menu>
@@ -78,8 +78,8 @@ export function JobsDetailHeader({
setScheduleContext({
actions: { refetch: refetch },
context: {
jobId: job.id
}
jobId: job.id,
},
});
}}
>
@@ -92,12 +92,12 @@ export function JobsDetailHeader({
disabled={job.converted}
onClick={() => {
mutationConvertJob({
variables: { jobId: job.id }
}).then(r => {
variables: { jobId: job.id },
}).then((r) => {
refetch();
notification["success"]({
message: t("jobs.successes.converted")
message: t("jobs.successes.converted"),
});
});
}}
@@ -107,13 +107,13 @@ export function JobsDetailHeader({
<JobsDetailHeaderActions key="actions" job={job} />,
<Button type="primary" key="submit" htmlType="submit">
{t("general.actions.save")}
</Button>
</Button>,
];
return (
<PageHeader
style={{
border: "1px solid rgb(235, 237, 240)"
border: "1px solid rgb(235, 237, 240)",
}}
title={tombstoneTitle}
//subTitle={tombstoneSubtitle}
@@ -136,7 +136,7 @@ export function JobsDetailHeader({
key="custowing"
label={t("jobs.fields.customerowing")}
>
##NO BINDING YET##
<CurrencyFormatter>{job.owner_owing}</CurrencyFormatter>
</Descriptions.Item>
<Descriptions.Item
@@ -157,7 +157,7 @@ export function JobsDetailHeader({
<Descriptions.Item key="servicecar" label={t("jobs.fields.servicecar")}>
{job.cccontracts &&
job.cccontracts.map(item => (
job.cccontracts.map((item) => (
<Link
key={item.id}
to={`/manage/courtesycars/contracts/${item.id}`}

10
client/src/components/jobs-list/jobs-list.component.jsx
View File

@@ -166,13 +166,9 @@ export default withRouter(function JobsList({
dataIndex: "owner_owing",
key: "owner_owing",
width: "8%",
render: (text, record) => {
return record.owner_owing ? (
<span>{record.owner_owing}</span>
) : (
t("general.labels.unknown")
);
},
render: (text, record) => (
<CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
),
},
];