QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-17 05:10:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Change Customer & Vendor List to ContactSelectList

Browse Source
This commit is contained in:
elforjani3
2020-11-03 17:48:12 +02:00
parent 64ca4d2a8a
commit ecc66593a9
10 changed files with 126 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
client/src/containers/Purchases/Bill/BillFormHeader.js
View File

@@ -13,7 +13,7 @@ import { momentFormatter, compose, tansformDateValue } from 'utils';
import classNames from 'classnames';
import { CLASSES } from 'common/classes';
import {
VendorSelecetList,
ContactSelecetList,
ErrorMessage,
FieldRequiredHint,
Row,
@@ -48,31 +48,6 @@ function BillFormHeader({
[setFieldValue],
);
const vendorNameRenderer = useCallback(
(accept, { handleClick }) => (
<MenuItem
key={accept.id}
text={accept.display_name}
onClick={handleClick}
/>
),
[],
);
// Filter vendor name
const filterVendorAccount = (query, vendor, _index, exactMatch) => {
const normalizedTitle = vendor.display_name.toLowerCase();
const normalizedQuery = query.toLowerCase();
if (exactMatch) {
return normalizedTitle === normalizedQuery;
} else {
return (
`${vendor.display_name} ${normalizedTitle}`.indexOf(normalizedQuery) >=
0
);
}
};
return (
<div className={classNames(CLASSES.PAGE_FORM_HEADER)}>
<div className={'page-form__primary-section'}>
@@ -91,10 +66,11 @@ function BillFormHeader({
<ErrorMessage name={'vendor_id'} {...{ errors, touched }} />
}
>
<VendorSelecetList
vendorsList={vendorItems}
selectedVendorId={values.vendor_id}
onItemSelect={onChangeSelected('vendor_id')}
<ContactSelecetList
contactsList={vendorItems}
selectedContactId={values.vendor_id}
defaultSelectText={ <T id={'select_vender_account'} /> }
onContactSelected={onChangeSelected('vendor_id')}
/>
</FormGroup>

34
client/src/containers/Purchases/PaymentMades/PaymentMadeFormHeader.js
View File

@@ -16,7 +16,7 @@ import { CLASSES } from 'common/classes';
import { momentFormatter, compose, tansformDateValue } from 'utils';
import {
AccountsSelectList,
VendorSelecetList,
ContactSelecetList,
ErrorMessage,
FieldRequiredHint,
Money,
@@ -68,16 +68,6 @@ function PaymentMadeFormHeader({
[setFieldValue],
);
const handleVenderRenderer = useCallback(
(vender, { handleClick }) => (
<MenuItem
key={vender.id}
text={vender.display_name}
onClick={handleClick}
/>
),
[],
);
const triggerFullAmountChanged = (value) => {
onFullAmountChanged && onFullAmountChanged(value);
@@ -87,19 +77,6 @@ function PaymentMadeFormHeader({
triggerFullAmountChanged(event.currentTarget.value);
};
const handleFilterVender = (query, vender, index, exactMatch) => {
const normalizedTitle = vender.display_name.toLowerCase();
const normalizedQuery = query.toLowerCase();
if (exactMatch) {
return normalizedTitle === normalizedQuery;
} else {
return (
`${vender.display_name} ${normalizedTitle}`.indexOf(normalizedQuery) >=
0
);
}
};
const onChangeSelect = useCallback(
(filedName) => {
return (item) => {
@@ -133,10 +110,11 @@ function PaymentMadeFormHeader({
<ErrorMessage name={'vendor_id'} {...{ errors, touched }} />
}
>
<VendorSelecetList
vendorsList={vendorItems}
selectedVendorId={values.vendor_id}
onItemSelect={onChangeSelect('vendor_id')}
<ContactSelecetList
contactsList={vendorItems}
selectedContactId={values.vendor_id}
defaultSelectText={ <T id={'select_vender_account'} /> }
onContactSelected={onChangeSelect('vendor_id')}
// buttonProps={{ disabled: !isNewMode }}
disabled={!isNewMode}
/>