diff --git a/client/src/pages/jobs-close/jobs-close.component.jsx b/client/src/pages/jobs-close/jobs-close.component.jsx index 0833ddd18..c9421c26d 100644 --- a/client/src/pages/jobs-close/jobs-close.component.jsx +++ b/client/src/pages/jobs-close/jobs-close.component.jsx @@ -1,4 +1,5 @@ -import { DeleteFilled } from "@ant-design/icons"; +import { DeleteFilled, PrinterFilled } from "@ant-design/icons"; +import { PageHeader } from "@ant-design/pro-layout"; import { useApolloClient, useMutation } from "@apollo/client"; import { Alert, @@ -16,32 +17,31 @@ import { Switch, Typography } from "antd"; -import { PageHeader } from "@ant-design/pro-layout"; - -import React, { useState } from "react"; +import { useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; // import { useNavigate } from 'react-router-dom'; import { useSplitTreatments } from "@splitsoftware/splitio-react"; import Dinero from "dinero.js"; -import dayjs from "../../utils/day"; import { Link } from "react-router-dom"; import { createStructuredSelector } from "reselect"; import DateTimePicker from "../../components/form-date-time-picker/form-date-time-picker.component"; import FormsFieldChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component"; import CurrencyInput from "../../components/form-items-formatted/currency-form-item.component"; +import JobCloseRoGuardContainer from "../../components/job-close-ro-guard/job-close-ro-guard.container"; import JobsScoreboardAdd from "../../components/job-scoreboard-add-button/job-scoreboard-add-button.component"; import JobsCloseAutoAllocate from "../../components/jobs-close-auto-allocate/jobs-close-auto-allocate.component"; import JobsCloseLines from "../../components/jobs-close-lines/jobs-close-lines.component"; import LayoutFormRow from "../../components/layout-form-row/layout-form-row.component"; +import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; import { generateJobLinesUpdatesForInvoicing } from "../../graphql/jobs-lines.queries"; import { UPDATE_JOB } from "../../graphql/jobs.queries"; import { insertAuditTrail } from "../../redux/application/application.actions"; import { selectJobReadOnly } from "../../redux/application/application.selectors"; +import { setModalContext } from "../../redux/modals/modals.actions.js"; import { selectBodyshop } from "../../redux/user/user.selectors"; import AuditTrailMapping from "../../utils/AuditTrailMappings"; -import JobCloseRoGuardContainer from "../../components/job-close-ro-guard/job-close-ro-guard.container"; -import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; +import dayjs from "../../utils/day"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, @@ -49,10 +49,17 @@ const mapStateToProps = createStructuredSelector({ }); const mapDispatchToProps = (dispatch) => ({ - insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type })) + insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type })), + setPrintCenterContext: (context) => + dispatch( + setModalContext({ + context: context, + modal: "printCenter" + }) + ) }); -export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail }) { +export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, setPrintCenterContext }) { const { t } = useTranslation(); const [form] = Form.useForm(); const client = useApolloClient(); @@ -171,7 +178,6 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail }) { extra={ - form.submit()} disabled={jobRO} @@ -188,6 +194,21 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail }) { )} + }