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

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

View File

@@ -19,6 +19,11 @@ import {
import { useHistory, useLocation } from "react-router-dom";
import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
import queryString from "query-string";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors";
import { CalculateJob } from "../../components/job-totals-table/job-totals.utility";
const JobsLinesContainer = lazy(() =>
import("../../components/job-detail-lines/job-lines.container")
);
@@ -65,13 +70,18 @@ const JobsDetailAuditContainer = lazy(() =>
import("../../components/audit-trail-list/audit-trail-list.container")
);
export default function JobsDetailPage({
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
});
export function JobsDetailPage({
job,
mutationUpdateJob,
mutationConvertJob,
handleSubmit,
refetch,
updateJobStatus,
bodyshop,
}) {
const { t } = useTranslation();
const [form] = Form.useForm();
@@ -90,8 +100,17 @@ export default function JobsDetailPage({
};
const handleFinish = (values) => {
const newTotals = CalculateJob({ ...job, ...values }, bodyshop.shoprates);
mutationUpdateJob({
variables: { jobId: job.id, job: values },
variables: {
jobId: job.id,
job: {
...values,
clm_total: newTotals.totals.total_repairs,
owner_owing: newTotals.custPayable.total,
job_totals: newTotals,
},
},
}).then((r) => {
notification["success"]({
message: t("jobs.successes.savetitle"),
@@ -270,3 +289,4 @@ export default function JobsDetailPage({
</Suspense>
);
}
export default connect(mapStateToProps, null)(JobsDetailPage);