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

IO-1819 Allow private estimate lines to be modified.

Browse Source
This commit is contained in:
Patrick Fic
2022-04-13 10:26:17 -07:00
parent 542637edb2
commit 44ff032acc
7 changed files with 59 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project version="1.2" be_version="2.7.1"> <babeledit_project be_version="2.7.1" version="1.2">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -4753,6 +4753,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>private</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>state</name> <name>state</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

14
client/src/components/job-detail-lines/job-lines.component.jsx
View File

@@ -41,9 +41,10 @@ import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.con
import _ from "lodash"; import _ from "lodash";
import JobCreateIOU from "../job-create-iou/job-create-iou.component"; import JobCreateIOU from "../job-create-iou/job-create-iou.component";
import JobLinesExpander from "./job-lines-expander.component"; import JobLinesExpander from "./job-lines-expander.component";
import { selectBodyshop } from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser bodyshop: selectBodyshop,
jobRO: selectJobReadOnly, jobRO: selectJobReadOnly,
technician: selectTechnician, technician: selectTechnician,
}); });
@@ -56,6 +57,7 @@ const mapDispatchToProps = (dispatch) => ({
}); });
export function JobLinesComponent({ export function JobLinesComponent({
bodyshop,
jobRO, jobRO,
technician, technician,
setPartsOrderContext, setPartsOrderContext,
@@ -75,6 +77,14 @@ export function JobLinesComponent({
filteredInfo: {}, filteredInfo: {},
}); });
const { t } = useTranslation(); const { t } = useTranslation();
const jobIsPrivate = bodyshop.md_ins_cos.find(
(c) => c.name === job.ins_co_nm
)?.private;
console.log(
"🚀 ~ file: job-lines.component.jsx ~ line 81 ~ jobIsPrivate",
jobIsPrivate
);
const columns = [ const columns = [
{ {
@@ -286,7 +296,7 @@ export function JobLinesComponent({
key: "actions", key: "actions",
render: (text, record) => ( render: (text, record) => (
<div> <div>
{record.manual_line && ( {(record.manual_line || jobIsPrivate) && (
<Space> <Space>
<Button <Button
disabled={jobRO} disabled={jobRO}

6
client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
View File

@@ -216,6 +216,7 @@ export function JobLinesUpsertModalComponent({
rules={[ rules={[
({ getFieldValue }) => ({ ({ getFieldValue }) => ({
validator(rule, value) { validator(rule, value) {
console.log(value);
if (!value || getFieldValue("part_type") !== "PAE") { if (!value || getFieldValue("part_type") !== "PAE") {
return Promise.resolve(); return Promise.resolve();
} }
@@ -226,7 +227,10 @@ export function JobLinesUpsertModalComponent({
}), }),
({ getFieldValue }) => ({ ({ getFieldValue }) => ({
validator(rule, value) { validator(rule, value) {
if (!!getFieldValue("part_type") === !!value) { console.log(value, !!value);
if (
!!getFieldValue("part_type") === (!!value || value === 0)
) {
return Promise.resolve(); return Promise.resolve();
} }
return Promise.reject( return Promise.reject(

25
client/src/components/shop-info/shop-info.general.component.jsx
View File

@@ -811,14 +811,23 @@ export default function ShopInfoGeneral({ form }) {
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Space> <Form.Item
<Form.Item label={t("bodyshop.fields.md_ins_co.zip")}
label={t("bodyshop.fields.md_ins_co.zip")} key={`${index}zip`}
key={`${index}zip`} name={[field.name, "zip"]}
name={[field.name, "zip"]} >
> <Input />
<Input /> </Form.Item>
</Form.Item> <Form.Item
label={t("bodyshop.fields.md_ins_co.private")}
key={`${index}private`}
name={[field.name, "private"]}
valuePropName="checked"
>
<Switch />
</Form.Item>
<Space wrap>
<DeleteFilled <DeleteFilled
onClick={() => { onClick={() => {
remove(field.name); remove(field.name);

1
client/src/translations/en_us/common.json
View File

@@ -295,6 +295,7 @@
"md_ins_co": { "md_ins_co": {
"city": "City", "city": "City",
"name": "Insurance Company Name", "name": "Insurance Company Name",
"private": "Private",
"state": "Province/State", "state": "Province/State",
"street1": "Street 1", "street1": "Street 1",
"street2": "Street 2", "street2": "Street 2",

1
client/src/translations/es/common.json
View File

@@ -295,6 +295,7 @@
"md_ins_co": { "md_ins_co": {
"city": "", "city": "",
"name": "", "name": "",
"private": "",
"state": "", "state": "",
"street1": "", "street1": "",
"street2": "", "street2": "",

1
client/src/translations/fr/common.json
View File

@@ -295,6 +295,7 @@
"md_ins_co": { "md_ins_co": {
"city": "", "city": "",
"name": "", "name": "",
"private": "",
"state": "", "state": "",
"street1": "", "street1": "",
"street2": "", "street2": "",