admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/america (pull request #1001)

Browse Source 
Add error handling when unable to caclulate job totals.
This commit is contained in:
Patrick Fic
2023-10-11 18:14:13 +00:00
parent 25062e37f4 28386a4234
commit c394974dc8
3 changed files with 81 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/components/jobs-detail-rates/jobs-detail-rates.parts.component.jsx
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 React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
@@ -563,13 +563,6 @@ export function JobsDetailRatesParts({
> >
<Switch /> <Switch />
</Form.Item> </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>
<LayoutFormRow header={t("joblines.fields.part_types.PAO")}> <LayoutFormRow header={t("joblines.fields.part_types.PAO")}>
<Form.Item <Form.Item

12
client/src/components/jobs-detail-rates/jobs-detail-rates.taxes.component.jsx
View File

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

8
client/src/pages/jobs-detail/jobs-detail.page.component.jsx
View File

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