Compare commits

...

1 Commits

Author SHA1 Message Date
elforjani13
dbf4666dfc BIG-163: add journal type select. 2022-04-03 17:42:04 +02:00
5 changed files with 96 additions and 16 deletions

View File

@@ -0,0 +1,8 @@
import intl from 'react-intl-universal';
export const journalTypes = [
{
name: intl.get('journal'),
value: 'Journal',
},
];

View File

@@ -4,6 +4,7 @@ import {
FormGroup,
Position,
ControlGroup,
Classes,
} from '@blueprintjs/core';
import { FastField, ErrorMessage } from 'formik';
import { DateInput } from '@blueprintjs/datetime';
@@ -11,6 +12,8 @@ import { FormattedMessage as T } from 'components';
import classNames from 'classnames';
import { CLASSES } from 'common/classes';
import { journalTypes } from '../../../common/journalTypes';
import { FFormGroup } from '../../../components';
import {
momentFormatter,
compose,
@@ -28,12 +31,13 @@ import {
} from 'components';
import withSettings from 'containers/Settings/withSettings';
import { useMakeJournalFormContext } from './MakeJournalProvider';
import { JournalExchangeRateInputField } from './components';
import { JournalExchangeRateInputField, JournalTypeSelect } from './components';
import withDialogActions from 'containers/Dialog/withDialogActions';
import {
currenciesFieldShouldUpdate,
useObserveJournalNoSettings,
} from './utils';
/**
* Make journal entries header.
*/
@@ -169,21 +173,18 @@ function MakeJournalEntriesHeader({
</FastField>
{/*------------ Journal type -----------*/}
<FastField name={'journal_type'}>
{({ form, field, meta: { error, touched } }) => (
<FormGroup
label={<T id={'journal_type'} />}
className={classNames('form-group--account-type', CLASSES.FILL)}
inline={true}
>
<InputGroup
intent={inputIntent({ error, touched })}
fill={true}
{...field}
/>
</FormGroup>
)}
</FastField>
<FFormGroup
name={'journal_type'}
label={<T id={'journal_type'} />}
inline={true}
className={classNames('form-group--select-list', Classes.FILL)}
>
<JournalTypeSelect
items={journalTypes}
name={'journal_type'}
popoverProps={{ minimal: true }}
/>
</FFormGroup>
{/*------------ Currency -----------*/}
<FastField

View File

@@ -9,6 +9,7 @@ import {
Icon,
Hint,
FormattedMessage as T,
FSelect,
} from 'components';
import {
AccountsListFieldCell,
@@ -183,3 +184,71 @@ export function JournalExchangeRateInputField({ ...props }) {
/>
);
}
/**
*
* @param {*} query
* @param {*} journal
* @param {*} _index
* @param {*} exactMatch
* @returns
*/
const itemPredicate = (query, journal, _index, exactMatch) => {
const normalizedTitle = journal.name.toLowerCase();
const normalizedQuery = query.toLowerCase();
if (exactMatch) {
return normalizedTitle === normalizedQuery;
} else {
return normalizedTitle.indexOf(normalizedQuery) >= 0;
}
};
/**
*
* @param {*} item
* @param {*} param1
* @returns
*/
const itemRenderer = (item, { handleClick, modifiers, query }) => {
return (
<MenuItem
active={modifiers.active}
disabled={modifiers.disabled}
text={item.name}
label={item.label}
key={item.id}
onClick={handleClick}
/>
);
};
const itemSelectProps = {
itemPredicate: itemPredicate,
itemRenderer: itemRenderer,
valueAccessor: 'name',
labelAccessor: 'name',
};
export function JournalTypeSelect({ items, ...rest }) {
return (
<FSelect
{...itemSelectProps}
{...rest}
items={items}
input={itemSelectButton}
/>
);
}
/**
* @param {*} label
* @returns
*/
function itemSelectButton({ label }) {
return (
<Button
text={label ? label : intl.get('make_journal.label.select_journal_type')}
/>
);
}

View File

@@ -1989,6 +1989,7 @@
"payment_made_form.label.total": "إجمالي",
"make_journal.label.subtotal": "المجموع",
"make_journal.label.total": "إجمالي",
"make_journal.label.select_journal_type":"حدد نوع القيد",
"expense.label.subtotal": "المجموع",
"expense.label.total": "إجمالي",
"expense.branch_button.label": "الفرع: {label}",

View File

@@ -1989,6 +1989,7 @@
"payment_made.form.internal_note.placeholder": "Internal note (Not visible to the vendor).",
"make_journal.label.subtotal": "Subtotal",
"make_journal.label.total": "TOTAL",
"make_journal.label.select_journal_type":"Select Journal Type",
"expense.label.subtotal": "Subtotal",
"expense.label.total": "TOTAL",
"expense.branch_button.label": "Branch: {label}",