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

Merged in feature/IO-3255-simplified-part-management (pull request #2548)

Browse Source 
feature/IO-3255-simplified-parts-management - Remove some stuff in vendors
This commit is contained in:
Dave Richer
2025-09-10 19:59:10 +00:00
parent bd7db4dd02 f499859078
commit 23dd8fc9de
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
client/src/components/vendors-form/vendors-form.component.jsx
View File

@@ -14,16 +14,18 @@ import VendorsPhonebookAdd from "../vendors-phonebook-add/vendors-phonebook-add.
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors";
import { selectIsPartsEntry } from "../../redux/application/application.selectors.js";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop bodyshop: selectBodyshop,
isPartsEntry: selectIsPartsEntry
}); });
const mapDispatchToProps = () => ({ const mapDispatchToProps = () => ({
//setUserLanguage: language => dispatch(setUserLanguage(language)) //setUserLanguage: language => dispatch(setUserLanguage(language))
}); });
export default connect(mapStateToProps, mapDispatchToProps)(VendorsFormComponent); export default connect(mapStateToProps, mapDispatchToProps)(VendorsFormComponent);
export function VendorsFormComponent({ bodyshop, form, formLoading, handleDelete, selectedvendor }) { export function VendorsFormComponent({ bodyshop, form, formLoading, handleDelete, selectedvendor, isPartsEntry }) {
const { t } = useTranslation(); const { t } = useTranslation();
const client = useApolloClient(); const client = useApolloClient();
@@ -57,8 +59,7 @@ export function VendorsFormComponent({ bodyshop, form, formLoading, handleDelete
> >
{t("general.actions.delete")} {t("general.actions.delete")}
</Button> </Button>
{!isPartsEntry && <VendorsPhonebookAdd form={form} disabled={form.isFieldsTouched()} />}
<VendorsPhonebookAdd form={form} disabled={form.isFieldsTouched()} />
</Space> </Space>
} }
/> />
@@ -148,12 +149,18 @@ export function VendorsFormComponent({ bodyshop, form, formLoading, handleDelete
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow grow> <LayoutFormRow grow>
<Form.Item label={t("vendors.fields.discount")} name="discount"> {!isPartsEntry && (
<InputNumber min={0} max={1} precision={2} step={0.01} /> <>
</Form.Item> <Form.Item label={t("vendors.fields.discount")} name="discount">
<Form.Item label={t("vendors.fields.due_date")} name="due_date"> <InputNumber min={0} max={1} precision={2} step={0.01} />
<InputNumber min={0} /> </Form.Item>
</Form.Item>
<Form.Item label={t("vendors.fields.due_date")} name="due_date">
<InputNumber min={0} />
</Form.Item>
</>
)}
{ {
// <Form.Item // <Form.Item
// label={t("vendors.fields.cost_center")} // label={t("vendors.fields.cost_center")}