diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 45c53caf6..2d8e210a1 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -12992,6 +12992,27 @@ + + invoices-list + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + jobs false @@ -13351,6 +13372,27 @@ + + invoices-list + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + jobs false diff --git a/client/src/components/parts-order-modal/parts-order-modal.container.jsx b/client/src/components/parts-order-modal/parts-order-modal.container.jsx index b5fbecc01..77589a373 100644 --- a/client/src/components/parts-order-modal/parts-order-modal.container.jsx +++ b/client/src/components/parts-order-modal/parts-order-modal.container.jsx @@ -4,18 +4,14 @@ import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; -import { EmailSettings } from "../../emails/constants"; +import { INSERT_NEW_INVOICE } from "../../graphql/invoices.queries"; import { UPDATE_JOB_LINE_STATUS } from "../../graphql/jobs-lines.queries"; import { INSERT_NEW_PARTS_ORDERS } from "../../graphql/parts-orders.queries"; import { QUERY_ALL_VENDORS_FOR_ORDER } from "../../graphql/vendors.queries"; -import { INSERT_NEW_INVOICE } from "../../graphql/invoices.queries"; import { setEmailOptions } from "../../redux/email/email.actions"; import { toggleModalVisible } from "../../redux/modals/modals.actions"; import { selectPartsOrder } from "../../redux/modals/modals.selectors"; -import { - selectBodyshop, - selectCurrentUser, -} from "../../redux/user/user.selectors"; +import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors"; import AlertComponent from "../alert/alert.component"; import LoadingSpinner from "../loading-spinner/loading-spinner.component"; import PartsOrderModalComponent from "./parts-order-modal.component"; @@ -56,8 +52,6 @@ export function PartsOrderModalContainer({ const [insertInvoice] = useMutation(INSERT_NEW_INVOICE); const handleFinish = async (values) => { - //Check if this was actuall an inhouse invoice - insertPartOrder({ variables: { po: [ @@ -109,7 +103,7 @@ export function PartsOrderModalContainer({ }, }; - const invoiceResult = insertInvoice({ + insertInvoice({ variables: { invoice: invoiceToPost }, }); } @@ -177,19 +171,17 @@ export function PartsOrderModalContainer({ toggleModalVisible()} - width="90%" + width='90%' onOk={() => form.submit()} destroyOnClose - forceRender - > - {error ? : null} + forceRender> + {error ? : null}
+ initialValues={{ parts_order_lines: { data: initialValues } }}> ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) + setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)), +}); + +export function InvoicesPageContainer({ setBreadcrumbs }) { + const { t } = useTranslation(); + useEffect(() => { + document.title = t("titles.invoices-list"); + setBreadcrumbs([ + { link: "/manage/invoices", label: t("titles.bc.invoices-list") }, + ]); + }, [t, setBreadcrumbs]); -export default function InvoicesPageContainer() { return ( @@ -21,3 +41,7 @@ export default function InvoicesPageContainer() { ); } +export default connect( + mapStateToProps, + mapDispatchToProps +)(InvoicesPageContainer); diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 8bb03437e..4f31a6b28 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -838,6 +838,7 @@ "courtesycars": "Courtesy Cars", "courtesycars-detail": "Courtesy Car {{number}}", "courtesycars-new": "New Courtesy Car", + "invoices-list": "Invoices", "jobs": "Jobs", "jobs-active": "Active Jobs", "jobs-detail": "Job {{number}}", @@ -856,6 +857,7 @@ "courtesycars": "Courtesy Cars | $t(titles.app)", "courtesycars-create": "New Courtesy Car | $t(titles.app)", "courtesycars-detail": "Courtesy Car {{id}} | $t(titles.app)", + "invoices-list": "Invoices | $t(titles.app)", "jobs": "Active Jobs | $t(titles.app)", "jobs-create": "Create a New Job | $t(titles.app)", "jobsavailable": "Available Jobs | $t(titles.app)", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 5b2e026d8..05476c5d8 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -838,6 +838,7 @@ "courtesycars": "", "courtesycars-detail": "", "courtesycars-new": "", + "invoices-list": "", "jobs": "", "jobs-active": "", "jobs-detail": "", @@ -856,6 +857,7 @@ "courtesycars": "", "courtesycars-create": "", "courtesycars-detail": "", + "invoices-list": "", "jobs": "Todos los trabajos | $t(titles.app)", "jobs-create": "", "jobsavailable": "Empleos disponibles | $t(titles.app)", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index cf02b0c0d..54ba5f8cb 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -838,6 +838,7 @@ "courtesycars": "", "courtesycars-detail": "", "courtesycars-new": "", + "invoices-list": "", "jobs": "", "jobs-active": "", "jobs-detail": "", @@ -856,6 +857,7 @@ "courtesycars": "", "courtesycars-create": "", "courtesycars-detail": "", + "invoices-list": "", "jobs": "Tous les emplois | $t(titles.app)", "jobs-create": "", "jobsavailable": "Emplois disponibles | $t(titles.app)",