Fixed invoice enter UUID error for noline entries BOD-221

This commit is contained in:
Patrick Fic
2020-08-04 14:14:13 -07:00
parent c1522ca5b2
commit 05e6ef08b1

View File

@@ -38,6 +38,8 @@ function InvoiceEnterModalContainer({
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const handleFinish = (values) => { const handleFinish = (values) => {
console.log("handleFinish -> values", values);
setLoading(true); setLoading(true);
const { upload, ...remainingValues } = values; const { upload, ...remainingValues } = values;
insertInvoice({ insertInvoice({
@@ -46,6 +48,11 @@ function InvoiceEnterModalContainer({
Object.assign({}, remainingValues, { Object.assign({}, remainingValues, {
invoicelines: { invoicelines: {
data: remainingValues.invoicelines.map((i) => { data: remainingValues.invoicelines.map((i) => {
console.log(
"Initial insert value",
i.joblineid,
i.joblineid === "noline"
);
return { return {
...i, ...i,
joblineid: i.joblineid === "noline" ? null : i.joblineid, joblineid: i.joblineid === "noline" ? null : i.joblineid,
@@ -62,7 +69,7 @@ function InvoiceEnterModalContainer({
updateJobLines({ updateJobLines({
variables: { variables: {
ids: remainingValues.invoicelines ids: remainingValues.invoicelines
.filter((il) => il.joblineid !== " noline") .filter((il) => il.joblineid !== "noline")
.map((li) => li.joblineid), .map((li) => li.joblineid),
status: bodyshop.md_order_statuses.default_received || "Received*", status: bodyshop.md_order_statuses.default_received || "Received*",
}, },
@@ -136,17 +143,19 @@ function InvoiceEnterModalContainer({
</Button> </Button>
{invoiceEnterModal.context && invoiceEnterModal.context.id ? null : ( {invoiceEnterModal.context && invoiceEnterModal.context.id ? null : (
<Button <Button
type='primary' type="primary"
loading={loading} loading={loading}
onClick={() => { onClick={() => {
setEnterAgain(true); setEnterAgain(true);
}}> }}
>
{t("general.actions.saveandnew")} {t("general.actions.saveandnew")}
</Button> </Button>
)} )}
</span> </span>
} }
destroyOnClose> destroyOnClose
>
<Form <Form
onFinish={handleFinish} onFinish={handleFinish}
autoComplete={"off"} autoComplete={"off"}
@@ -163,7 +172,8 @@ function InvoiceEnterModalContainer({
federal_tax_rate: bodyshop.invoice_tax_rates.federal_tax_rate || 0, federal_tax_rate: bodyshop.invoice_tax_rates.federal_tax_rate || 0,
state_tax_rate: bodyshop.invoice_tax_rates.state_tax_rate || 0, state_tax_rate: bodyshop.invoice_tax_rates.state_tax_rate || 0,
local_tax_rate: bodyshop.invoice_tax_rates.local_tax_rate || 0, local_tax_rate: bodyshop.invoice_tax_rates.local_tax_rate || 0,
}}> }}
>
<InvoiceFormContainer form={form} /> <InvoiceFormContainer form={form} />
</Form> </Form>
</Modal> </Modal>