Read Onlt Invoice Screen IO-578

This commit is contained in:
Patrick Fic
2021-02-18 15:41:31 -08:00
parent db906d9c19
commit fe47000664
4 changed files with 29 additions and 23 deletions

View File

@@ -3,6 +3,7 @@ import React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { selectBodyshop } from "../../redux/user/user.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors";
import LaborTypeFormItem from "../form-items-formatted/labor-type-form-item.component"; import LaborTypeFormItem from "../form-items-formatted/labor-type-form-item.component";
import PartTypeFormItem from "../form-items-formatted/part-type-form-item.component"; import PartTypeFormItem from "../form-items-formatted/part-type-form-item.component";
@@ -11,12 +12,13 @@ import "./jobs-close-lines.styles.scss";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
jobRO: selectJobReadOnly,
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language)) //setUserLanguage: language => dispatch(setUserLanguage(language))
}); });
export function JobsCloseLines({ bodyshop, job }) { export function JobsCloseLines({ bodyshop, job, jobRO }) {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<div> <div>
@@ -114,6 +116,7 @@ export function JobsCloseLines({ bodyshop, job }) {
allowClear allowClear
optionFilterProp="children" optionFilterProp="children"
showSearch showSearch
disabled={jobRO}
filterOption={(input, option) => filterOption={(input, option) =>
option.children option.children
.toLowerCase() .toLowerCase()
@@ -146,6 +149,7 @@ export function JobsCloseLines({ bodyshop, job }) {
allowClear allowClear
optionFilterProp="children" optionFilterProp="children"
showSearch showSearch
disabled={jobRO}
filterOption={(input, option) => filterOption={(input, option) =>
option.children option.children
.toLowerCase() .toLowerCase()

View File

@@ -240,11 +240,8 @@ export function JobsDetailHeaderActions({
> >
{t("jobs.actions.addtopartsqueue")} {t("jobs.actions.addtopartsqueue")}
</Menu.Item> </Menu.Item>
<Menu.Item <Menu.Item disabled={!jobInPostProduction} key="closejob">
disabled={!!job.date_invoiced || !jobInPostProduction || jobRO} {!jobInPostProduction ? (
key="closejob"
>
{!!job.date_invoiced || !jobInPostProduction || jobRO ? (
t("menus.jobsactions.closejob") t("menus.jobsactions.closejob")
) : ( ) : (
<Link <Link
@@ -256,18 +253,14 @@ export function JobsDetailHeaderActions({
</Link> </Link>
)} )}
</Menu.Item> </Menu.Item>
<Menu.Item disabled={!!job.date_invoiced || jobRO} key="admin"> <Menu.Item key="admin">
{!!job.date_invoiced || jobRO ? ( <Link
t("menus.jobsactions.admin") to={{
) : ( pathname: `/manage/jobs/${job.id}/admin`,
<Link }}
to={{ >
pathname: `/manage/jobs/${job.id}/admin`, {t("menus.jobsactions.admin")}
}} </Link>
>
{t("menus.jobsactions.admin")}
</Link>
)}
</Menu.Item> </Menu.Item>
<JobsDetaiLheaderCsi job={job} /> <JobsDetaiLheaderCsi job={job} />
<Menu.Item <Menu.Item

View File

@@ -6,6 +6,7 @@ import { connect } from "react-redux";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import AlertComponent from "../../components/alert/alert.component"; import AlertComponent from "../../components/alert/alert.component";
import JobCalculateTotals from "../../components/job-calculate-totals/job-calculate-totals.component"; import JobCalculateTotals from "../../components/job-calculate-totals/job-calculate-totals.component";
import ScoreboardAddButton from "../../components/job-scoreboard-add-button/job-scoreboard-add-button.component";
import JobsAdminClass from "../../components/jobs-admin-class/jobs-admin-class.component"; import JobsAdminClass from "../../components/jobs-admin-class/jobs-admin-class.component";
import JobsAdminDatesChange from "../../components/jobs-admin-dates/jobs-admin-dates.component"; import JobsAdminDatesChange from "../../components/jobs-admin-dates/jobs-admin-dates.component";
import JobsAdminDeleteIntake from "../../components/jobs-admin-delete-intake/jobs-admin-delete-intake.component"; import JobsAdminDeleteIntake from "../../components/jobs-admin-delete-intake/jobs-admin-delete-intake.component";
@@ -70,6 +71,7 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
return ( return (
<RbacWrapper action="jobs:admin"> <RbacWrapper action="jobs:admin">
<div> <div>
<ScoreboardAddButton job={data ? data.jobs_by_pk : {}} />
<LayoutFormRow grow> <LayoutFormRow grow>
<JobAdminOwnerReassociate job={data ? data.jobs_by_pk : {}} /> <JobAdminOwnerReassociate job={data ? data.jobs_by_pk : {}} />
<JobAdminVehicleReassociate job={data ? data.jobs_by_pk : {}} /> <JobAdminVehicleReassociate job={data ? data.jobs_by_pk : {}} />

View File

@@ -12,12 +12,14 @@ import JobsCloseExportButton from "../../components/jobs-close-export-button/job
import JobsCloseLines from "../../components/jobs-close-lines/jobs-close-lines.component"; import JobsCloseLines from "../../components/jobs-close-lines/jobs-close-lines.component";
import { generateJobLinesUpdatesForInvoicing } from "../../graphql/jobs-lines.queries"; import { generateJobLinesUpdatesForInvoicing } from "../../graphql/jobs-lines.queries";
import { UPDATE_JOB } from "../../graphql/jobs.queries"; import { UPDATE_JOB } from "../../graphql/jobs.queries";
import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { selectBodyshop } from "../../redux/user/user.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
jobRO: selectJobReadOnly,
}); });
export function JobsCloseComponent({ job, bodyshop }) { export function JobsCloseComponent({ job, bodyshop, jobRO }) {
const { t } = useTranslation(); const { t } = useTranslation();
const [form] = Form.useForm(); const [form] = Form.useForm();
const client = useApolloClient(); const client = useApolloClient();
@@ -86,26 +88,31 @@ export function JobsCloseComponent({ job, bodyshop }) {
<JobsCloseAutoAllocate <JobsCloseAutoAllocate
joblines={job.joblines} joblines={job.joblines}
form={form} form={form}
disabled={!!job.date_exported} disabled={!!job.date_exported || jobRO}
/> />
<Button loading={loading} onClick={() => form.submit()}> <Button
loading={loading}
onClick={() => form.submit()}
disabled={jobRO}
>
{t("general.actions.save")} {t("general.actions.save")}
</Button> </Button>
<Popconfirm <Popconfirm
onConfirm={handleClose} onConfirm={handleClose}
disabled={jobRO}
okText={t("general.labels.yes")} okText={t("general.labels.yes")}
cancelText={t("general.labels.no")} cancelText={t("general.labels.no")}
title={t("jobs.labels.closeconfirm")} title={t("jobs.labels.closeconfirm")}
> >
<Button loading={loading} type="danger"> <Button loading={loading} type="danger" disabled={jobRO}>
{t("general.actions.close")} {t("general.actions.close")}
</Button> </Button>
</Popconfirm> </Popconfirm>
<JobsScoreboardAdd job={job} disabled={false} /> <JobsScoreboardAdd job={job} disabled={false} />
<JobsCloseExportButton jobId={job.id} disabled={false} /> <JobsCloseExportButton jobId={job.id} disabled={job.date_exported} />
</Space> </Space>
<FormsFieldChanged form={form} /> <FormsFieldChanged form={form} />
<JobsCloseLines job={job} /> <JobsCloseLines job={job} />