Merged in feature/ems-tax-calculation (pull request #1000)

Add error handling when unable to caclulate job totals.
This commit is contained in:
Patrick Fic
2023-10-11 18:13:31 +00:00
3 changed files with 81 additions and 82 deletions

View File

@@ -1,4 +1,4 @@
import { Collapse, Form, Input, InputNumber, Switch } from "antd";
import { Collapse, Form, InputNumber, Switch } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
@@ -563,13 +563,6 @@ export function JobsDetailRatesParts({
>
<Switch />
</Form.Item>
<Form.Item
style={{ display: "none" }}
label={t("jobs.fields.parts_tax_rates.prt_tx_ty1")}
name={["parts_tax_rates", "PAN", "prt_tx_ty1"]}
>
<Input />
</Form.Item>
</LayoutFormRow>
<LayoutFormRow header={t("joblines.fields.part_types.PAO")}>
<Form.Item

View File

@@ -75,12 +75,12 @@ function TaxFormItems({
typeNum,
typeNumIterator,
})}
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
// rules={[
// {
// required: true,
// //message: t("general.validation.required"),
// },
// ]}
name={["cieca_pft", `tax_type${typeNum}`]}
>
<Input disabled={jobRO} />

View File

@@ -139,7 +139,7 @@ export function JobsDetailPage({
},
},
});
try {
const newTotals = await Axios.post("/job/totalsssu", {
id: job.id,
});
@@ -212,7 +212,13 @@ export function JobsDetailPage({
form.setFieldsValue(transormJobToForm(job));
form.resetFields();
}
} catch (error) {
notification["error"]({
message: t("jobs.errors.totalscalc"),
});
} finally {
setLoading(false);
}
};
const menuExtra = (