mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-16 04:40:32 +00:00
fix bugs in make journal page.
This commit is contained in:
@@ -11,6 +11,7 @@ import {
|
||||
const AccountCellRenderer = ({
|
||||
column: { id, value },
|
||||
row: { index, original },
|
||||
cell: { value: initialValue },
|
||||
payload: { accounts, updateData, errors },
|
||||
}) => {
|
||||
const handleAccountSelected = useCallback((account) => {
|
||||
|
||||
@@ -4,9 +4,9 @@ import {
|
||||
} from '@blueprintjs/core';
|
||||
|
||||
const InputEditableCell = ({
|
||||
value: initialValue,
|
||||
row: { index },
|
||||
column: { id },
|
||||
column: { id, },
|
||||
cell: { value: initialValue },
|
||||
payload,
|
||||
}) => {
|
||||
const [value, setValue] = useState(initialValue)
|
||||
|
||||
@@ -14,8 +14,13 @@ const MoneyFieldCellRenderer = ({
|
||||
setValue(value);
|
||||
}, []);
|
||||
|
||||
function isNumeric(data) {
|
||||
return !isNaN(parseFloat(data)) && isFinite(data) && data.constructor !== Array;
|
||||
}
|
||||
|
||||
const onBlur = () => {
|
||||
payload.updateData(index, id, parseFloat(value));
|
||||
const updateValue = isNumeric(value) ? parseFloat(value) : value;
|
||||
payload.updateData(index, id, updateValue);
|
||||
};
|
||||
|
||||
return (<MoneyInputGroup
|
||||
|
||||
@@ -13,12 +13,14 @@ export default function MakeJournalEntriesFooter({
|
||||
<div>
|
||||
<div class="form__floating-footer">
|
||||
<Button
|
||||
disabled={formik.isSubmitting}
|
||||
intent={Intent.PRIMARY}
|
||||
type="submit">
|
||||
Save
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
disabled={formik.isSubmitting}
|
||||
intent={Intent.PRIMARY}
|
||||
type="submit"
|
||||
className={'ml1'}>
|
||||
@@ -26,6 +28,7 @@ export default function MakeJournalEntriesFooter({
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
disabled={formik.isSubmitting}
|
||||
type="submit"
|
||||
className={'button-secondary ml1'}>
|
||||
Save as Draft
|
||||
|
||||
@@ -49,8 +49,8 @@ function MakeJournalEntriesForm({
|
||||
|
||||
const defaultEntry = useMemo(() => ({
|
||||
account_id: null,
|
||||
credit: null,
|
||||
debit: null,
|
||||
credit: 0,
|
||||
debit: 0,
|
||||
note: '',
|
||||
}), []);
|
||||
|
||||
@@ -71,7 +71,7 @@ function MakeJournalEntriesForm({
|
||||
defaultEntry,
|
||||
],
|
||||
},
|
||||
onSubmit: (values) => {
|
||||
onSubmit: (values, actions) => {
|
||||
const form = values.entries.filter((entry) => (
|
||||
(entry.credit || entry.debit)
|
||||
));
|
||||
@@ -95,8 +95,9 @@ function MakeJournalEntriesForm({
|
||||
AppToaster.show({
|
||||
message: 'manual_journal_has_been_submit',
|
||||
});
|
||||
actions.setSubmitting(false);
|
||||
}).catch((error) => {
|
||||
|
||||
actions.setSubmitting(false);
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user