Invoice enter modal now saves invoices.
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
import React, { useState } from "react";
|
||||
import { useLazyQuery, useQuery } from "react-apollo";
|
||||
import { notification } from "antd";
|
||||
import { useLazyQuery, useQuery, useMutation } from "react-apollo";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { GET_JOB_LINES_TO_ENTER_INVOICE } from "../../graphql/jobs-lines.queries";
|
||||
@@ -9,6 +10,8 @@ import { toggleModalVisible } from "../../redux/modals/modals.actions";
|
||||
import { selectInvoiceEnterModal } from "../../redux/modals/modals.selectors";
|
||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
import InvoiceEnterModalComponent from "./invoice-enter-modal.component";
|
||||
import { INSERT_NEW_INVOICE } from "../../graphql/invoices.queries";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
invoiceEnterModal: selectInvoiceEnterModal,
|
||||
@@ -23,11 +26,13 @@ function InvoiceEnterModalContainer({
|
||||
toggleModalVisible,
|
||||
bodyshop
|
||||
}) {
|
||||
// const { t } = useTranslation();
|
||||
const { t } = useTranslation();
|
||||
const linesState = useState([]);
|
||||
const roSearchState = useState({ text: "", selectedId: null });
|
||||
const [roSearch, setRoSearch] = roSearchState;
|
||||
|
||||
const [insertInvoice] = useMutation(INSERT_NEW_INVOICE);
|
||||
|
||||
const { data: RoAutoCompleteData } = useQuery(ACTIVE_JOBS_FOR_AUTOCOMPLETE, {
|
||||
fetchPolicy: "network-only",
|
||||
variables: { statuses: bodyshop.md_ro_statuses.open_statuses || ["Open"] },
|
||||
@@ -68,52 +73,49 @@ function InvoiceEnterModalContainer({
|
||||
|
||||
const handleFinish = values => {
|
||||
console.log("values", values);
|
||||
alert("Closing this modal.");
|
||||
// toggleModalVisible();
|
||||
// if (!jobLineEditModal.context.id) {
|
||||
// insertJobLine({
|
||||
// variables: {
|
||||
// lineInput: [{ jobid: jobLineEditModal.context.jobid, ...values }]
|
||||
// }
|
||||
// })
|
||||
// .then(r => {
|
||||
// if (jobLineEditModal.actions.refetch)
|
||||
// jobLineEditModal.actions.refetch();
|
||||
// toggleModalVisible();
|
||||
// notification["success"]({
|
||||
// message: t("joblines.successes.created")
|
||||
// });
|
||||
// })
|
||||
// .catch(error => {
|
||||
// notification["error"]({
|
||||
// message: t("joblines.errors.creating", {
|
||||
// message: error.message
|
||||
// })
|
||||
// });
|
||||
// });
|
||||
// } else {
|
||||
// updateJobLine({
|
||||
// variables: {
|
||||
// lineId: jobLineEditModal.context.id,
|
||||
// line: values
|
||||
// }
|
||||
// })
|
||||
// .then(r => {
|
||||
// notification["success"]({
|
||||
// message: t("joblines.successes.updated")
|
||||
// });
|
||||
// })
|
||||
// .catch(error => {
|
||||
// notification["success"]({
|
||||
// message: t("joblines.errors.updating", {
|
||||
// message: error.message
|
||||
// })
|
||||
// });
|
||||
// });
|
||||
// if (jobLineEditModal.actions.refetch)
|
||||
// jobLineEditModal.actions.refetch();
|
||||
// toggleModalVisible();
|
||||
// }
|
||||
console.log(
|
||||
"Assigned",
|
||||
Object.assign(
|
||||
{},
|
||||
values,
|
||||
{ jobid: roSearch.selectedId },
|
||||
{ vendorid: vendorSearch.selectedId },
|
||||
{
|
||||
invoicelines: {
|
||||
data: values.invoicelines.map(item => delete item.joblinename)
|
||||
}
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
insertInvoice({
|
||||
variables: {
|
||||
invoice: [
|
||||
Object.assign(
|
||||
{},
|
||||
values,
|
||||
{ jobid: roSearch.selectedId },
|
||||
{ vendorid: vendorSearch.selectedId },
|
||||
{ invoicelines: { data: values.invoicelines } }
|
||||
)
|
||||
]
|
||||
}
|
||||
})
|
||||
.then(r => {
|
||||
// if (jobLineEditModal.actions.refetch)
|
||||
// jobLineEditModal.actions.refetch();
|
||||
// toggleModalVisible();
|
||||
notification["success"]({
|
||||
message: t("invoices.successes.created")
|
||||
});
|
||||
})
|
||||
.catch(error => {
|
||||
notification["error"]({
|
||||
message: t("invoices.errors.creating", {
|
||||
message: error.message
|
||||
})
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
const handleCancel = () => {
|
||||
@@ -136,7 +138,8 @@ function InvoiceEnterModalContainer({
|
||||
lineData={lineData ? lineData.joblines : null}
|
||||
vendor={
|
||||
vendorSearch.selectedId
|
||||
? VendorAutoCompleteData.vendors.filter(
|
||||
? VendorAutoCompleteData &&
|
||||
VendorAutoCompleteData.vendors.filter(
|
||||
v => v.id === vendorSearch.selectedId
|
||||
)[0]
|
||||
: null
|
||||
|
||||
@@ -57,9 +57,9 @@ export default function InvoiceEnterModalLinesComponent({
|
||||
? ""
|
||||
: opt.value,
|
||||
actual_price: opt.cost ? opt.cost : 0,
|
||||
cost_center: opt.mod_lbr_ty
|
||||
cost_center: opt.part_type
|
||||
? responsibilityCenters.defaults[
|
||||
opt.mod_lbr_ty
|
||||
opt.part_type
|
||||
] || null
|
||||
: null
|
||||
};
|
||||
@@ -83,7 +83,7 @@ export default function InvoiceEnterModalLinesComponent({
|
||||
key={item.id}
|
||||
value={item.line_desc}
|
||||
cost={item.act_price ? item.act_price : 0}
|
||||
mod_lbr_ty={item.mod_lbr_ty}
|
||||
part_type={item.part_type}
|
||||
>
|
||||
<Row justify="center" align="middle">
|
||||
<Col span={12}> {item.line_desc}</Col>
|
||||
|
||||
Reference in New Issue
Block a user