From 50489dd68297d941cc906b6628778af75a88411c Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Tue, 5 Oct 2021 14:15:21 -0700 Subject: [PATCH] IO-1415 Add tax part & refresh line ticket on line edit --- bodyshop_translations.babel | 21 +++++++++++++++++++ .../job-lines-upsert-modal.component.jsx | 13 +++++++++--- .../job-lines-upsert-modal.container.jsx | 2 ++ client/src/translations/en_us/common.json | 1 + client/src/translations/es/common.json | 1 + client/src/translations/fr/common.json | 1 + 6 files changed, 36 insertions(+), 3 deletions(-) diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 513fa13f6..9bef52030 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -16920,6 +16920,27 @@ + + tax_part + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + total false diff --git a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx index 05b909d8c..50aad1b52 100644 --- a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx +++ b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx @@ -1,4 +1,4 @@ -import { Form, Input, InputNumber, Modal, Select } from "antd"; +import { Form, Input, InputNumber, Modal, Select, Switch } from "antd"; import React, { useEffect } from "react"; import { useTranslation } from "react-i18next"; import InputCurrency from "../form-items-formatted/currency-form-item.component"; @@ -184,9 +184,9 @@ export default function JobLinesUpsertModalComponent({ > - + {/* - + */} + + + diff --git a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx index 89b9c406e..b3a28aeb5 100644 --- a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx +++ b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx @@ -44,6 +44,7 @@ function JobLinesUpsertModalContainer({ }, ], }, + refetchQueries: ["GET_LINE_TICKET_BY_PK"], }); if (!r.errors) { await Axios.post("/job/totalsssu", { @@ -69,6 +70,7 @@ function JobLinesUpsertModalContainer({ lineId: jobLineEditModal.context.id, line: values, }, + refetchQueries: ["GET_LINE_TICKET_BY_PK"], }); if (!r.errors) { notification["success"]({ diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index cf5b1c7d5..d07ec4dd6 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -1055,6 +1055,7 @@ "profitcenter_part": "Profit Center: Part", "prt_dsmk_p": "Line Markup %", "status": "Status", + "tax_part": "Tax Part", "total": "Total", "unq_seq": "Seq #" }, diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 3254fb148..11e0ca003 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -1055,6 +1055,7 @@ "profitcenter_part": "", "prt_dsmk_p": "", "status": "Estado", + "tax_part": "", "total": "", "unq_seq": "Seq #" }, diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index fdd764d37..f99dc4e90 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -1055,6 +1055,7 @@ "profitcenter_part": "", "prt_dsmk_p": "", "status": "Statut", + "tax_part": "", "total": "", "unq_seq": "Seq #" },