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

Changes to recent items BOD-178

Browse Source
This commit is contained in:
Patrick Fic
2020-06-26 09:29:16 -07:00
parent 82ee83c43b
commit 4516491c8c
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/pages/jobs-close/jobs-close.component.jsx
View File

@@ -109,6 +109,7 @@ export function JobsCloseComponent({ job, bodyshop, jobTotals }) {
partsAllocations={partsAllocations}
labMatAllocations={labmatAllocations}
jobTotals={jobTotals}
disabled={!!job.date_exported}
suspenseAmount={jobTotals.totals.subtotal
.subtract(labmatAllocatedTotal)
.subtract(partsAllocatedTotal)
@@ -125,19 +126,19 @@ export function JobsCloseComponent({ job, bodyshop, jobTotals }) {
setLabmatAllocations={setLabmatAllocations}
partsAllocations={partsAllocations}
setPartsAllocations={setPartsAllocations}
invoiced={invoiced}
disabled={!!job.date_exported}
/>
<JobsCloseLaborMaterialAllocation
labmatAllocations={labmatAllocations}
setLabmatAllocations={setLabmatAllocations}
labMatTotalAllocation={labmatAllocatedTotal}
invoiced={invoiced}
invoiced={!!job.date_exported}
/>
<JobsClosePartsAllocation
partsAllocations={partsAllocations}
setPartsAllocations={setPartsAllocations}
partsAllocatedTotal={partsAllocatedTotal}
invoiced={invoiced}
invoiced={!!job.date_exported}
/>
</div>
);

10
client/src/pages/jobs-detail/jobs-detail.page.container.jsx
View File

@@ -19,10 +19,10 @@ import { connect } from "react-redux";
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
addRecentItem: (item) => dispatch(setrecentItem(item)),
addRecentItem: (item) => dispatch(addRecentItem(item)),
});
function JobsDetailPageContainer({ match, setBreadcrumbs,addRecentItem }) {
function JobsDetailPageContainer({ match, setBreadcrumbs, addRecentItem }) {
const { jobId } = match.params;
const { t } = useTranslation();
@@ -74,7 +74,9 @@ function JobsDetailPageContainer({ match, setBreadcrumbs,addRecentItem }) {
}, [loading, data, t, error, setBreadcrumbs, jobId]);
if (loading) return <SpinComponent />;
if (error) return <AlertComponent message={error.message} type='error' />;
if (error) return <AlertComponent message={error.message} type="error" />;
if (data) addRecentItem({ id: 1234, label: " abcd" });
return data.jobs_by_pk ? (
<JobsDetailPage
@@ -85,7 +87,7 @@ function JobsDetailPageContainer({ match, setBreadcrumbs,addRecentItem }) {
updateJobStatus={updateJobStatus}
/>
) : (
<AlertComponent message={t("jobs.errors.noaccess")} type='error' />
<AlertComponent message={t("jobs.errors.noaccess")} type="error" />
);
}
export default connect(null, mapDispatchToProps)(JobsDetailPageContainer);