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

feat: fix setting cash.

Browse Source
This commit is contained in:
elforjani13
2021-10-26 14:33:41 +02:00
parent 0a21c5fa41
commit 2fd78ca1c4
8 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/containers/Dialogs/MoneyOutDialog/MoneyOutDialogProvider.js
View File

@@ -4,6 +4,7 @@ import {
useAccounts,
useCreateCashflowTransaction,
useCashflowAccounts,
useSettingCashFlow,
} from 'hooks/query';
const MoneyInDialogContent = React.createContext();
@@ -22,6 +23,9 @@ function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
const { mutateAsync: createCashflowTransactionMutate } =
useCreateCashflowTransaction();
// Handle fetching settings.
const { isLoading: isSettingsLoading } = useSettingCashFlow();
// Submit payload.
const [submitPayload, setSubmitPayload] = React.useState({});
@@ -42,7 +46,11 @@ function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
};
return (
<DialogContent isLoading={isAccountsLoading || isCashFlowAccountsLoading}>
<DialogContent
isLoading={
isAccountsLoading || isCashFlowAccountsLoading || isSettingsLoading
}
>
<MoneyInDialogContent.Provider value={provider} {...props} />
</DialogContent>
);

6
src/containers/Dialogs/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.js
View File

@@ -1,5 +1,5 @@
import React from 'react';
import { FastField, ErrorMessage } from 'formik';
import { FastField, Field, ErrorMessage } from 'formik';
import {
Classes,
FormGroup,
@@ -112,7 +112,7 @@ function OtherExpnseFormFields({
</Col>
<Col xs={5}>
{/*------------ Transaction number -----------*/}
<FastField name={'transaction_number'}>
<Field name={'transaction_number'}>
{({ form, field, meta: { error, touched } }) => (
<FormGroup
label={<T id={'transaction_number'} />}
@@ -147,7 +147,7 @@ function OtherExpnseFormFields({
</ControlGroup>
</FormGroup>
)}
</FastField>
</Field>
</Col>
</Row>
{/*------------ amount -----------*/}

4
src/containers/Dialogs/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.js
View File

@@ -111,7 +111,7 @@ function OwnerDrawingsFormFields({
</Col>
<Col xs={5}>
{/*------------ Transaction number -----------*/}
<FastField name={'transaction_number'}>
<Field name={'transaction_number'}>
{({ form, field, meta: { error, touched } }) => (
<FormGroup
label={<T id={'transaction_number'} />}
@@ -146,7 +146,7 @@ function OwnerDrawingsFormFields({
</ControlGroup>
</FormGroup>
)}
</FastField>
</Field>
</Col>
</Row>
{/*------------ amount -----------*/}

6
src/containers/Dialogs/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.js
View File

@@ -1,5 +1,5 @@
import React from 'react';
import { FastField, ErrorMessage } from 'formik';
import { FastField, Field, ErrorMessage } from 'formik';
import {
Classes,
FormGroup,
@@ -112,7 +112,7 @@ function TransferToAccountFormFields({
</Col>
<Col xs={5}>
{/*------------ Transaction number -----------*/}
<FastField name={'transaction_number'}>
<Field name={'transaction_number'}>
{({ form, field, meta: { error, touched } }) => (
<FormGroup
label={<T id={'transaction_number'} />}
@@ -147,7 +147,7 @@ function TransferToAccountFormFields({
</ControlGroup>
</FormGroup>
)}
</FastField>
</Field>
</Col>
</Row>
{/*------------ amount -----------*/}