feat: money in .

src/containers/Dialogs/MoneyInDialog/MoneyInContentFields.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import OwnerContributionFormFields from './OwnerContribution/OwnerContributionFormFields';
+import OtherIncomeFormFields from './OtherIncome/OtherIncomeFormFields';
+import TransferFromAccountFormFields from './TransferFromAccount/TransferFromAccountFormFields';
+
+export default function MoneyInContentFields({ accountType }) {
+  const handleTransactionType = () => {
+    switch (accountType) {
+      case 'owner_contribution':
+        return <OwnerContributionFormFields />;
+
+      case 'other_income':
+        return <OtherIncomeFormFields />;
+
+      case 'transfer_from_account':
+        return <TransferFromAccountFormFields />;
+      default:
+        break;
+    }
+  };
+
+  return <React.Fragment>{handleTransactionType()}</React.Fragment>;
+}

src/containers/Dialogs/MoneyInDialog/MoneyInDialogContent.js

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { MoneyInDialogProvider } from './MoneyInDialogProvider';
-import MoneyInDialogForm from './MoneyInDialogForm';
+import MoneyInForm from './MoneyInForm';
 
 /**
  * Money in dialog content.
@@ -13,8 +13,12 @@ export default function MoneyInDialogContent({
   accountType,
 }) {
   return (
-    <MoneyInDialogProvider accountId={accountId} dialogName={dialogName}>
-      <MoneyInDialogForm accountType={accountType} />
+    <MoneyInDialogProvider
+      accountId={accountId}
+      accountType={accountType}
+      dialogName={dialogName}
+    >
+      <MoneyInForm />
     </MoneyInDialogProvider>
   );
 }

src/containers/Dialogs/MoneyInDialog/MoneyInDialogForm.js

@@ -1,24 +0,0 @@
-import React from 'react';
-import OwnerContributionForm from './OwnerContribution/OwnerContributionForm';
-import OtherIncomeForm from './OtherIncome/OtherIncomeForm';
-import TransferFromAccountForm from './TransferFromAccount/TransferFromAccountForm';
-
-export default function MoneyInDialogForm({ accountType }) {
-  // Handle from transaction.
-  const handleFromTransaction = () => {
-    switch (accountType) {
-      case 'OWNER_CONTRIBUTION':
-        return <OwnerContributionForm />;
-
-      case 'OTHER_INCOME':
-        return <OtherIncomeForm />;
-
-      case 'TRANSFER_FROM_ACCOUNT':
-        return <TransferFromAccountForm />;
-      default:
-        break;
-    }
-  };
-
-  return <React.Fragment>{handleFromTransaction()}</React.Fragment>;
-}

src/containers/Dialogs/MoneyInDialog/MoneyInDialogProvider.js

@@ -1,16 +1,29 @@
 import React from 'react';
 import { DialogContent } from 'components';
-import { useCreateCashflowTransaction, useAccounts } from 'hooks/query';
+import {
+  useCreateCashflowTransaction,
+  useAccounts,
+  useCashflowAccounts,
+} from 'hooks/query';
 
 const MoneyInDialogContent = React.createContext();
 
 /**
  * Money in dialog provider.
  */
-function MoneyInDialogProvider({ accountId, dialogName, ...props }) {
+function MoneyInDialogProvider({
+  accountId,
+  accountType,
+  dialogName,
+  ...props
+}) {
   // Fetches accounts list.
   const { isFetching: isAccountsLoading, data: accounts } = useAccounts();
 
+  // Fetch cash flow list .
+  const { data: cashflowAccounts, isLoading: isCashFlowAccountsLoading } =
+    useCashflowAccounts({}, { keepPreviousData: true });
+
   const { mutateAsync: createCashflowTransactionMutate } =
     useCreateCashflowTransaction();
 
@@ -21,8 +34,11 @@ function MoneyInDialogProvider({ accountId, dialogName, ...props }) {
   const provider = {
     accounts,
     accountId,
+    accountType,
     isAccountsLoading,
 
+    cashflowAccounts,
+
     submitPayload,
     dialogName,
 
@@ -31,7 +47,7 @@ function MoneyInDialogProvider({ accountId, dialogName, ...props }) {
   };
 
   return (
-    <DialogContent isLoading={isAccountsLoading}>
+    <DialogContent isLoading={isAccountsLoading || isCashFlowAccountsLoading}>
       <MoneyInDialogContent.Provider value={provider} {...props} />
     </DialogContent>
   );

src/containers/Dialogs/MoneyInDialog/MoneyInForm.js

@@ -8,10 +8,11 @@ import intl from 'react-intl-universal';
 import 'style/pages/CashFlow/CashflowTransactionForm.scss';
 
 import { AppToaster } from 'components';
-import { CreateOtherIncomeFormSchema } from './OtherIncomeForm.schema';
-import OtherIncomeFormContent from './OtherIncomeFormContent';
 
-import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
+import MoneyInFormContent from './MoneyInFormContent';
+import { CreateMoneyInFormSchema } from './MoneyInForm.schema';
+
+import { useMoneyInDailogContext } from './MoneyInDialogProvider';
 
 import withDialogActions from 'containers/Dialog/withDialogActions';
 import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
@@ -22,7 +23,7 @@ const defaultInitialValues = {
   date: moment(new Date()).format('YYYY-MM-DD'),
   amount: '',
   transaction_number: '',
-  transaction_type: 'other_income',
+  transaction_type: '',
   reference_no: '',
   cashflow_account_id: '',
   credit_account_id: '',
@@ -30,10 +31,7 @@ const defaultInitialValues = {
   published: '',
 };
 
-/**
- * Other income form.
- */
-function OtherIncomeForm({
+function MoneyInForm({
   // #withDialogActions
   closeDialog,
 
@@ -43,6 +41,7 @@ function OtherIncomeForm({
   const {
     dialogName,
     accountId,
+    accountType,
     createCashflowTransactionMutate,
     submitPayload,
   } = useMoneyInDailogContext();
@@ -51,6 +50,7 @@ function OtherIncomeForm({
   const initialValues = {
     ...defaultInitialValues,
     currency_code: base_currency,
+    transaction_type: accountType,
     cashflow_account_id: accountId,
   };
 
@@ -76,17 +76,19 @@ function OtherIncomeForm({
   };
 
   return (
-    <Formik
-      validationSchema={CreateOtherIncomeFormSchema}
-      initialValues={initialValues}
-      onSubmit={handleFormSubmit}
-    >
-      <OtherIncomeFormContent />
-    </Formik>
+    <div>
+      <Formik
+        validationSchema={CreateMoneyInFormSchema}
+        initialValues={initialValues}
+        onSubmit={handleFormSubmit}
+      >
+        <MoneyInFormContent />
+      </Formik>
+    </div>
   );
 }
 
 export default compose(
   withDialogActions,
   withCurrentOrganization(),
-)(OtherIncomeForm);
+)(MoneyInForm);

src/containers/Dialogs/MoneyInDialog/MoneyInForm.schema.js

@@ -8,9 +8,7 @@ const Schema = Yup.object().shape({
   transaction_number: Yup.string(),
   transaction_type: Yup.string().required(),
   reference_no: Yup.string(),
-  credit_account_id: Yup.number()
-    .required()
-    .label(intl.get('other_income_account')),
+  credit_account_id: Yup.number().required(),
   cashflow_account_id: Yup.string().required(),
   description: Yup.string()
     .min(3)
@@ -19,4 +17,4 @@ const Schema = Yup.object().shape({
   published: Yup.boolean(),
 });
 
-export const CreateOtherIncomeFormSchema = Schema;
+export const CreateMoneyInFormSchema = Schema;

src/containers/Dialogs/MoneyInDialog/MoneyInFormContent.js

@@ -0,0 +1,17 @@
+import React from 'react';
+import { Form } from 'formik';
+
+import MoneyInFormFields from './MoneyInFormFields';
+import MoneyInFloatingActions from './MoneyInFloatingActions';
+
+/**
+ * Money In form content.
+ */
+export default function MoneyInFormContent() {
+  return (
+    <Form>
+      <MoneyInFormFields />
+      <MoneyInFloatingActions />
+    </Form>
+  );
+}

src/containers/Dialogs/MoneyInDialog/MoneyInFormFields.js

@@ -0,0 +1,27 @@
+import React from 'react';
+import { Classes } from '@blueprintjs/core';
+
+import { If } from 'components';
+
+import MoneyInContentFields from './MoneyInContentFields';
+import TransactionTypeFields from './TransactionTypeFields';
+import { useMoneyInDailogContext } from './MoneyInDialogProvider';
+
+/**
+ * Money in form fields.
+ */
+function MoneyInFormFields() {
+  // Money in dialog context.
+  const { accountId, accountType } = useMoneyInDailogContext();
+
+  return (
+    <div className={Classes.DIALOG_BODY}>
+      <If condition={!accountId}>
+        <TransactionTypeFields />
+      </If>
+      <MoneyInContentFields accountType={accountType} />
+    </div>
+  );
+}
+
+export default MoneyInFormFields;

src/containers/Dialogs/MoneyInDialog/OtherIncome/OtherIncomeFormContent.js

@@ -1,17 +0,0 @@
-import React from 'react';
-import { Form } from 'formik';
-
-import OtherIncomeFormFields from './OtherIncomeFormFields';
-import MoneyInFloatingActions from '../MoneyInFloatingActions';
-
-/**
- * Other income form content.
- */
-export default function OtherIncomeFormContent() {
-  return (
-    <Form>
-      <OtherIncomeFormFields />
-      <MoneyInFloatingActions />
-    </Form>
-  );
-}

src/containers/Dialogs/MoneyInDialog/OtherIncome/OtherIncomeFormFields.js

@@ -41,7 +41,7 @@ function OtherIncomeFormFields() {
   const amountFieldRef = useAutofocus();
 
   return (
-    <div className={Classes.DIALOG_BODY}>
+    <React.Fragment>
       <Row>
         <Col xs={5}>
           {/*------------ Date -----------*/}
@@ -187,7 +187,7 @@ function OtherIncomeFormFields() {
           </FormGroup>
         )}
       </FastField>
-    </div>
+    </React.Fragment>
   );
 }
 

src/containers/Dialogs/MoneyInDialog/OwnerContribution/OwnerContributionForm.js

@@ -1,92 +0,0 @@
-import React from 'react';
-import moment from 'moment';
-import { Intent } from '@blueprintjs/core';
-import { Formik } from 'formik';
-import { omit } from 'lodash';
-import intl from 'react-intl-universal';
-
-import 'style/pages/CashFlow/CashflowTransactionForm.scss';
-
-import { AppToaster } from 'components';
-import { CreateOwnerContributionFormSchema } from './OwnerContributionForm.schema';
-import OwnerContributionFormContent from './OwnerContributionFormContent';
-
-import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
-
-import withDialogActions from 'containers/Dialog/withDialogActions';
-import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
-
-import { compose } from 'utils';
-
-const defaultInitialValues = {
-  date: moment(new Date()).format('YYYY-MM-DD'),
-  amount: '',
-  transaction_number: '',
-  transaction_type: 'owner_contribution',
-  reference_no: '',
-  cashflow_account_id: '',
-  credit_account_id: '',
-  description: '',
-  published: '',
-};
-
-/**
- * Owner contribution form
- */
-function OwnerContributionForm({
-  // #withDialogActions
-  closeDialog,
-
-  // #withCurrentOrganization
-  organization: { base_currency },
-}) {
-  const {
-    dialogName,
-    accountId,
-    submitPayload,
-    createCashflowTransactionMutate,
-  } = useMoneyInDailogContext();
-
-  // Initial form values.
-  const initialValues = {
-    ...defaultInitialValues,
-    currency_code: base_currency,
-    cashflow_account_id: accountId,
-  };
-
-  // Handles the form submit.
-  const handleFormSubmit = (values, { setSubmitting, setErrors }) => {
-    const form = {
-      ...omit(values, ['currency_code']),
-      published: submitPayload.publish,
-    };
-    setSubmitting(true);
-    createCashflowTransactionMutate(form)
-      .then(() => {
-        closeDialog(dialogName);
-
-        AppToaster.show({
-          message: intl.get('cash_flow_transaction_success_message'),
-          intent: Intent.SUCCESS,
-        });
-      })
-      .finally(() => {
-        setSubmitting(true);
-      });
-  };
-
-  return (
-    <Formik
-      validationSchema={CreateOwnerContributionFormSchema}
-      initialValues={initialValues}
-      onSubmit={handleFormSubmit}
-    >
-      <OwnerContributionFormContent />
-    </Formik>
-  );
-}
-
-export default compose(
-  withDialogActions,
-  withCurrentOrganization(),
-)(OwnerContributionForm);

src/containers/Dialogs/MoneyInDialog/OwnerContribution/OwnerContributionForm.schema.js

@@ -1,22 +0,0 @@
-import * as Yup from 'yup';
-import intl from 'react-intl-universal';
-import { DATATYPES_LENGTH } from 'common/dataTypes';
-
-const Schema = Yup.object().shape({
-  date: Yup.date().required().label(intl.get('date')),
-  amount: Yup.number().required().label(intl.get('amount')),
-  transaction_number: Yup.string(),
-  transaction_type: Yup.string().required(),
-  reference_no: Yup.string(),
-  credit_account_id: Yup.number()
-    .required()
-    .label(intl.get('cash_flow_transaction.label_equity_account')),
-  cashflow_account_id: Yup.string().required(),
-  description: Yup.string()
-    .min(3)
-    .max(DATATYPES_LENGTH.TEXT)
-    .label(intl.get('description')),
-  published: Yup.boolean(),
-});
-
-export const CreateOwnerContributionFormSchema = Schema;

src/containers/Dialogs/MoneyInDialog/OwnerContribution/OwnerContributionFormContent.js

@@ -1,17 +0,0 @@
-import React from 'react';
-import { Form } from 'formik';
-
-import OwnerContributionFormFields from './OwnerContributionFormFields';
-import MoneyInFloatingActions from '../MoneyInFloatingActions';
-
-/**
- * Owner contribution form content.
- */
-export default function OwnerContributionFormContent() {
-  return (
-    <Form>
-      <OwnerContributionFormFields />
-      <MoneyInFloatingActions />
-    </Form>
-  );
-}

src/containers/Dialogs/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.js

@@ -39,7 +39,7 @@ function OwnerContributionFormFields() {
 
   const amountFieldRef = useAutofocus();
   return (
-    <div className={Classes.DIALOG_BODY}>
+    <React.Fragment>
       <Row>
         <Col xs={5}>
           {/*------------ Date -----------*/}
@@ -183,7 +183,7 @@ function OwnerContributionFormFields() {
           </FormGroup>
         )}
       </FastField>
-    </div>
+    </React.Fragment>
   );
 }
 

src/containers/Dialogs/MoneyInDialog/TransactionTypeFields.js

@@ -0,0 +1,94 @@
+import React from 'react';
+import { FastField, ErrorMessage } from 'formik';
+import { Classes, FormGroup } from '@blueprintjs/core';
+import classNames from 'classnames';
+import {
+  FormattedMessage as T,
+  AccountsSuggestField,
+  FieldRequiredHint,
+  ListSelect,
+  Col,
+  Row,
+} from 'components';
+
+import { inputIntent } from 'utils';
+import { CLASSES } from 'common/classes';
+import { addMoneyIn } from '../../../common/cashflowOptions';
+
+import { useMoneyInDailogContext } from './MoneyInDialogProvider';
+
+/**
+ * Transaction type fields.
+ */
+export default function TransactionTypeFields() {
+  // Money in dialog context.
+  const { cashflowAccounts } = useMoneyInDailogContext();
+
+  return (
+    <div className="trasnaction-type-fileds">
+      <Row>
+        <Col xs={5}>
+          {/*------------ Current account -----------*/}
+          <FastField name={'cashflow_account_id'}>
+            {({ form, field: { value }, meta: { error, touched } }) => (
+              <FormGroup
+                label={'Current account'}
+                labelInfo={<FieldRequiredHint />}
+                intent={inputIntent({ error, touched })}
+                helperText={<ErrorMessage name="cashflow_account_id" />}
+                minimal={true}
+                className={classNames(
+                  CLASSES.FILL,
+                  'form-group--cashflow_account_id',
+                )}
+              >
+                <AccountsSuggestField
+                  accounts={cashflowAccounts}
+                  onAccountSelected={({ id }) =>
+                    form.setFieldValue('cashflow_account_id', id)
+                  }
+                  inputProps={{
+                    intent: inputIntent({ error, touched }),
+                  }}
+                />
+              </FormGroup>
+            )}
+          </FastField>
+          {/*------------ Transaction type -----------*/}
+        </Col>
+        <Col xs={5}>
+          <FastField name={'transaction_type'}>
+            {({
+              form: { values, setFieldValue },
+              field: { value },
+              meta: { error, touched },
+            }) => (
+              <FormGroup
+                label={<T id={'transaction_type'} />}
+                labelInfo={<FieldRequiredHint />}
+                helperText={<ErrorMessage name="transaction_type" />}
+                intent={inputIntent({ error, touched })}
+                className={classNames(
+                  CLASSES.FILL,
+                  'form-group--transaction_type',
+                )}
+              >
+                <ListSelect
+                  items={addMoneyIn}
+                  onItemSelect={(type) => {
+                    setFieldValue('transaction_type', type.value);
+                  }}
+                  filterable={false}
+                  selectedItem={value}
+                  selectedItemProp={'value'}
+                  textProp={'name'}
+                  popoverProps={{ minimal: true }}
+                />
+              </FormGroup>
+            )}
+          </FastField>
+        </Col>
+      </Row>
+    </div>
+  );
+}

src/containers/Dialogs/MoneyInDialog/TransferFromAccount/TransferFromAccountForm.js

@@ -1,92 +0,0 @@
-import React from 'react';
-import moment from 'moment';
-import { Intent } from '@blueprintjs/core';
-import { Formik } from 'formik';
-import { omit } from 'lodash';
-import intl from 'react-intl-universal';
-
-import 'style/pages/CashFlow/CashflowTransactionForm.scss';
-
-import { AppToaster } from 'components';
-import { CreateTransferFromAccountFormSchema } from './TransferFromAccountForm.schema';
-import TransferFromAccountFormContent from './TransferFromAccountFormContent';
-
-import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
-
-import withDialogActions from 'containers/Dialog/withDialogActions';
-import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
-
-import { compose } from 'utils';
-
-const defaultInitialValues = {
-  date: moment(new Date()).format('YYYY-MM-DD'),
-  amount: '',
-  transaction_number: '',
-  transaction_type: 'transfer_from_account',
-  reference_no: '',
-  cashflow_account_id: '',
-  credit_account_id: '',
-  description: '',
-  published: '',
-};
-
-/**
- * Transfer from account form.
- */
-function TransferFromAccountForm({
-  // #withDialogActions
-  closeDialog,
-
-  // #withCurrentOrganization
-  organization: { base_currency },
-}) {
-  const {
-    dialogName,
-    accountId,
-    createCashflowTransactionMutate,
-    submitPayload,
-  } = useMoneyInDailogContext();
-
-  // Initial form values.
-  const initialValues = {
-    ...defaultInitialValues,
-    currency_code: base_currency,
-    cashflow_account_id: accountId,
-  };
-
-  // Handles the form submit.
-  const handleFormSubmit = (values, { setSubmitting, setErrors }) => {
-    const form = {
-      ...omit(values, ['currency_code']),
-      published: submitPayload.publish,
-    };
-    setSubmitting(true);
-    createCashflowTransactionMutate(form)
-      .then(() => {
-        closeDialog(dialogName);
-
-        AppToaster.show({
-          message: intl.get('cash_flow_transaction_success_message'),
-          intent: Intent.SUCCESS,
-        });
-      })
-      .finally(() => {
-        setSubmitting(true);
-      });
-  };
-
-  return (
-    <Formik
-      validationSchema={CreateTransferFromAccountFormSchema}
-      initialValues={initialValues}
-      onSubmit={handleFormSubmit}
-    >
-      <TransferFromAccountFormContent />
-    </Formik>
-  );
-}
-
-export default compose(
-  withDialogActions,
-  withCurrentOrganization(),
-)(TransferFromAccountForm);

src/containers/Dialogs/MoneyInDialog/TransferFromAccount/TransferFromAccountForm.schema.js

@@ -1,22 +0,0 @@
-import * as Yup from 'yup';
-import intl from 'react-intl-universal';
-import { DATATYPES_LENGTH } from 'common/dataTypes';
-
-const Schema = Yup.object().shape({
-  date: Yup.date().required().label(intl.get('date')),
-  amount: Yup.number().required().label(intl.get('amount')),
-  transaction_number: Yup.string(),
-  transaction_type: Yup.string().required(),
-  reference_no: Yup.string(),
-  credit_account_id: Yup.number()
-    .required()
-    .label(intl.get('cash_flow_transaction.label_transfer_account')),
-  cashflow_account_id: Yup.string().required(),
-  description: Yup.string()
-    .min(3)
-    .max(DATATYPES_LENGTH.TEXT)
-    .label(intl.get('description')),
-  published: Yup.boolean(),
-});
-
-export const CreateTransferFromAccountFormSchema = Schema;

src/containers/Dialogs/MoneyInDialog/TransferFromAccount/TransferFromAccountFormContent.js

@@ -1,14 +0,0 @@
-import React from 'react';
-import { Form } from 'formik';
-
-import TransferFromAccountFormFields from './TransferFromAccountFormFields';
-import MoneyInFloatingActions from '../MoneyInFloatingActions';
-
-export default function TransferFromAccountFormContent() {
-  return (
-    <Form>
-      <TransferFromAccountFormFields />
-      <MoneyInFloatingActions />
-    </Form>
-  );
-}

src/containers/Dialogs/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.js

@@ -41,7 +41,7 @@ function TransferFromAccountFormFields() {
   const amountFieldRef = useAutofocus();
 
   return (
-    <div className={Classes.DIALOG_BODY}>
+    <React.Fragment>
       <Row>
         <Col xs={5}>
           {/*------------ Date -----------*/}
@@ -190,7 +190,7 @@ function TransferFromAccountFormFields() {
           </FormGroup>
         )}
       </FastField>
-    </div>
+    </React.Fragment>
   );
 }
 

src/containers/Dialogs/MoneyInDialog/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { FormattedMessage as T } from 'components';
+import intl from 'react-intl-universal';
 import { Dialog, DialogSuspense } from 'components';
 import withDialogRedux from 'components/DialogReduxConnect';
 import { compose } from 'redux';
@@ -11,13 +11,15 @@ const MoneyInDialogContent = React.lazy(() => import('./MoneyInDialogContent'));
  */
 function MoneyInDialog({
   dialogName,
-  payload = { action: '', account_type: null, account_id: null },
+  payload = { account_type: '', account_id: null },
   isOpen,
 }) {
   return (
     <Dialog
       name={dialogName}
-      title={<T id={'cash_flow_transaction.money_in'} />}
+      title={intl.get('cash_flow_transaction.money_in', {
+        value: payload.account_type?.name,
+      })}
       isOpen={isOpen}
       canEscapeJeyClose={true}
       autoFocus={true}
@@ -27,7 +29,7 @@ function MoneyInDialog({
         <MoneyInDialogContent
           dialogName={dialogName}
           accountId={payload.account_id}
-          accountType={payload.account_type}
+          accountType={payload.account_type?.value}
         />
       </DialogSuspense>
     </Dialog>