mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-20 06:40:31 +00:00
feat(refund vendor):add exchange rate muted & branch.
This commit is contained in:
@@ -61,6 +61,7 @@ function RefundCreditNoteFormFields({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={Classes.DIALOG_BODY}>
|
<div className={Classes.DIALOG_BODY}>
|
||||||
|
|
||||||
<FeatureCan feature={Features.Branches}>
|
<FeatureCan feature={Features.Branches}>
|
||||||
<Row>
|
<Row>
|
||||||
<Col xs={5}>
|
<Col xs={5}>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { useFormikContext } from 'formik';
|
import { useFormikContext } from 'formik';
|
||||||
import { isEqual, isUndefined, isNull, first } from 'lodash';
|
import { first } from 'lodash';
|
||||||
|
|
||||||
import { useRefundCreditNoteContext } from './RefundCreditNoteFormProvider';
|
import { useRefundCreditNoteContext } from './RefundCreditNoteFormProvider';
|
||||||
|
|
||||||
@@ -18,5 +18,3 @@ export const useSetPrimaryBranchToForm = () => {
|
|||||||
}
|
}
|
||||||
}, [isBranchesSuccess, setFieldValue, branches]);
|
}, [isBranchesSuccess, setFieldValue, branches]);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -3,14 +3,13 @@ import { Formik } from 'formik';
|
|||||||
import { Intent } from '@blueprintjs/core';
|
import { Intent } from '@blueprintjs/core';
|
||||||
import intl from 'react-intl-universal';
|
import intl from 'react-intl-universal';
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import { omit, defaultTo } from 'lodash';
|
import { omit } from 'lodash';
|
||||||
|
|
||||||
import { AppToaster } from 'components';
|
import { AppToaster } from 'components';
|
||||||
import { useRefundVendorCreditContext } from './RefundVendorCreditFormProvider';
|
import { useRefundVendorCreditContext } from './RefundVendorCreditFormProvider';
|
||||||
import { CreateVendorRefundCreditFormSchema } from './RefundVendorCreditForm.schema';
|
import { CreateVendorRefundCreditFormSchema } from './RefundVendorCreditForm.schema';
|
||||||
import RefundVendorCreditFormContent from './RefundVendorCreditFormContent';
|
import RefundVendorCreditFormContent from './RefundVendorCreditFormContent';
|
||||||
|
|
||||||
import withSettings from 'containers/Settings/withSettings';
|
|
||||||
import withDialogActions from 'containers/Dialog/withDialogActions';
|
import withDialogActions from 'containers/Dialog/withDialogActions';
|
||||||
import { compose, transactionNumber } from 'utils';
|
import { compose, transactionNumber } from 'utils';
|
||||||
|
|
||||||
@@ -20,6 +19,7 @@ const defaultInitialValues = {
|
|||||||
reference_no: '',
|
reference_no: '',
|
||||||
description: '',
|
description: '',
|
||||||
amount: '',
|
amount: '',
|
||||||
|
exchange_rate: 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -10,5 +10,6 @@ const Schema = Yup.object().shape({
|
|||||||
.required()
|
.required()
|
||||||
.label(intl.get('deposit_account_')),
|
.label(intl.get('deposit_account_')),
|
||||||
description: Yup.string().nullable().max(DATATYPES_LENGTH.TEXT),
|
description: Yup.string().nullable().max(DATATYPES_LENGTH.TEXT),
|
||||||
|
exchange_rate: Yup.number(),
|
||||||
});
|
});
|
||||||
export const CreateVendorRefundCreditFormSchema = Schema;
|
export const CreateVendorRefundCreditFormSchema = Schema;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import intl from 'react-intl-universal';
|
import intl from 'react-intl-universal';
|
||||||
import { FastField, ErrorMessage } from 'formik';
|
import styled from 'styled-components';
|
||||||
|
import { FastField, ErrorMessage, useFormikContext } from 'formik';
|
||||||
import {
|
import {
|
||||||
Classes,
|
Classes,
|
||||||
FormGroup,
|
FormGroup,
|
||||||
@@ -12,13 +13,21 @@ import {
|
|||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { CLASSES } from 'common/classes';
|
import { CLASSES } from 'common/classes';
|
||||||
import { DateInput } from '@blueprintjs/datetime';
|
import { DateInput } from '@blueprintjs/datetime';
|
||||||
|
import { isEqual } from 'lodash';
|
||||||
import {
|
import {
|
||||||
Icon,
|
Icon,
|
||||||
|
Col,
|
||||||
|
Row,
|
||||||
|
If,
|
||||||
FieldRequiredHint,
|
FieldRequiredHint,
|
||||||
AccountsSuggestField,
|
AccountsSuggestField,
|
||||||
InputPrependText,
|
InputPrependText,
|
||||||
MoneyInputGroup,
|
MoneyInputGroup,
|
||||||
FormattedMessage as T,
|
FormattedMessage as T,
|
||||||
|
ExchangeRateMutedField,
|
||||||
|
BranchSelect,
|
||||||
|
BranchSelectButton,
|
||||||
|
FeatureCan,
|
||||||
} from 'components';
|
} from 'components';
|
||||||
import {
|
import {
|
||||||
inputIntent,
|
inputIntent,
|
||||||
@@ -28,42 +37,113 @@ import {
|
|||||||
compose,
|
compose,
|
||||||
} from 'utils';
|
} from 'utils';
|
||||||
import { useAutofocus } from 'hooks';
|
import { useAutofocus } from 'hooks';
|
||||||
|
import { Features } from 'common';
|
||||||
import { ACCOUNT_TYPE } from 'common/accountTypes';
|
import { ACCOUNT_TYPE } from 'common/accountTypes';
|
||||||
|
import { useSetPrimaryBranchToForm } from './utils';
|
||||||
import { useRefundVendorCreditContext } from './RefundVendorCreditFormProvider';
|
import { useRefundVendorCreditContext } from './RefundVendorCreditFormProvider';
|
||||||
|
import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Refund Vendor credit form fields.
|
* Refund Vendor credit form fields.
|
||||||
*/
|
*/
|
||||||
function RefundVendorCreditFormFields() {
|
function RefundVendorCreditFormFields({
|
||||||
const { accounts } = useRefundVendorCreditContext();
|
// #withCurrentOrganization
|
||||||
|
organization: { base_currency },
|
||||||
|
}) {
|
||||||
|
const { accounts, branches } = useRefundVendorCreditContext();
|
||||||
|
const { values } = useFormikContext();
|
||||||
|
|
||||||
const amountFieldRef = useAutofocus();
|
const amountFieldRef = useAutofocus();
|
||||||
|
|
||||||
|
// Sets the primary branch to form.
|
||||||
|
useSetPrimaryBranchToForm();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={Classes.DIALOG_BODY}>
|
<div className={Classes.DIALOG_BODY}>
|
||||||
{/* ------------- Refund date ------------- */}
|
<FeatureCan feature={Features.Branches}>
|
||||||
<FastField name={'refund_date'}>
|
<Row>
|
||||||
{({ form, field: { value }, meta: { error, touched } }) => (
|
<Col xs={5}>
|
||||||
<FormGroup
|
<FormGroup
|
||||||
label={<T id={'refund_vendor_credit.dialog.refund_date'} />}
|
label={<T id={'branch'} />}
|
||||||
labelInfo={<FieldRequiredHint />}
|
className={classNames('form-group--select-list', Classes.FILL)}
|
||||||
className={classNames('form-group--select-list', CLASSES.FILL)}
|
>
|
||||||
intent={inputIntent({ error, touched })}
|
<BranchSelect
|
||||||
helperText={<ErrorMessage name="refund_date" />}
|
name={'branch_id'}
|
||||||
>
|
branches={branches}
|
||||||
<DateInput
|
input={BranchSelectButton}
|
||||||
{...momentFormatter('YYYY/MM/DD')}
|
popoverProps={{ minimal: true }}
|
||||||
value={tansformDateValue(value)}
|
/>
|
||||||
onChange={handleDateChange((formattedDate) => {
|
</FormGroup>
|
||||||
form.setFieldValue('refund_date', formattedDate);
|
</Col>
|
||||||
})}
|
</Row>
|
||||||
popoverProps={{ position: Position.BOTTOM, minimal: true }}
|
<BranchRowDivider />
|
||||||
inputProps={{
|
</FeatureCan>
|
||||||
leftIcon: <Icon icon={'date-range'} />,
|
<Row>
|
||||||
}}
|
<Col xs={5}>
|
||||||
/>
|
{/* ------------- Refund date ------------- */}
|
||||||
</FormGroup>
|
<FastField name={'refund_date'}>
|
||||||
)}
|
{({ form, field: { value }, meta: { error, touched } }) => (
|
||||||
</FastField>
|
<FormGroup
|
||||||
|
label={<T id={'refund_vendor_credit.dialog.refund_date'} />}
|
||||||
|
labelInfo={<FieldRequiredHint />}
|
||||||
|
className={classNames('form-group--select-list', CLASSES.FILL)}
|
||||||
|
intent={inputIntent({ error, touched })}
|
||||||
|
helperText={<ErrorMessage name="refund_date" />}
|
||||||
|
>
|
||||||
|
<DateInput
|
||||||
|
{...momentFormatter('YYYY/MM/DD')}
|
||||||
|
value={tansformDateValue(value)}
|
||||||
|
onChange={handleDateChange((formattedDate) => {
|
||||||
|
form.setFieldValue('refund_date', formattedDate);
|
||||||
|
})}
|
||||||
|
popoverProps={{ position: Position.BOTTOM, minimal: true }}
|
||||||
|
inputProps={{
|
||||||
|
leftIcon: <Icon icon={'date-range'} />,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</FormGroup>
|
||||||
|
)}
|
||||||
|
</FastField>
|
||||||
|
</Col>
|
||||||
|
|
||||||
|
<Col xs={5}>
|
||||||
|
{/* ------------ Form account ------------ */}
|
||||||
|
<FastField name={'deposit_account_id'}>
|
||||||
|
{({ form, field: { value }, meta: { error, touched } }) => (
|
||||||
|
<FormGroup
|
||||||
|
label={
|
||||||
|
<T id={'refund_vendor_credit.dialog.deposit_to_account'} />
|
||||||
|
}
|
||||||
|
className={classNames(
|
||||||
|
'form-group--deposit_account_id',
|
||||||
|
'form-group--select-list',
|
||||||
|
CLASSES.FILL,
|
||||||
|
)}
|
||||||
|
labelInfo={<FieldRequiredHint />}
|
||||||
|
intent={inputIntent({ error, touched })}
|
||||||
|
helperText={<ErrorMessage name={'deposit_account_id'} />}
|
||||||
|
>
|
||||||
|
<AccountsSuggestField
|
||||||
|
selectedAccountId={value}
|
||||||
|
accounts={accounts}
|
||||||
|
onAccountSelected={({ id }) =>
|
||||||
|
form.setFieldValue('deposit_account_id', id)
|
||||||
|
}
|
||||||
|
inputProps={{
|
||||||
|
placeholder: intl.get('select_account'),
|
||||||
|
}}
|
||||||
|
filterByTypes={[
|
||||||
|
ACCOUNT_TYPE.BANK,
|
||||||
|
ACCOUNT_TYPE.CASH,
|
||||||
|
ACCOUNT_TYPE.FIXED_ASSET,
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
</FormGroup>
|
||||||
|
)}
|
||||||
|
</FastField>
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
|
||||||
{/* ------------- Amount ------------- */}
|
{/* ------------- Amount ------------- */}
|
||||||
<FastField name={'amount'}>
|
<FastField name={'amount'}>
|
||||||
{({
|
{({
|
||||||
@@ -93,6 +173,19 @@ function RefundVendorCreditFormFields() {
|
|||||||
</FormGroup>
|
</FormGroup>
|
||||||
)}
|
)}
|
||||||
</FastField>
|
</FastField>
|
||||||
|
|
||||||
|
<If condition={!isEqual(base_currency, values.currency_code)}>
|
||||||
|
{/*------------ exchange rate -----------*/}
|
||||||
|
<ExchangeRateMutedField
|
||||||
|
name={'exchange_rate'}
|
||||||
|
fromCurrency={base_currency}
|
||||||
|
toCurrency={values.currency_code}
|
||||||
|
formGroupProps={{ label: '', inline: false }}
|
||||||
|
date={values.date}
|
||||||
|
exchangeRate={values.exchange_rate}
|
||||||
|
/>
|
||||||
|
</If>
|
||||||
|
|
||||||
{/* ------------ Reference No. ------------ */}
|
{/* ------------ Reference No. ------------ */}
|
||||||
<FastField name={'reference_no'}>
|
<FastField name={'reference_no'}>
|
||||||
{({ form, field, meta: { error, touched } }) => (
|
{({ form, field, meta: { error, touched } }) => (
|
||||||
@@ -111,38 +204,6 @@ function RefundVendorCreditFormFields() {
|
|||||||
)}
|
)}
|
||||||
</FastField>
|
</FastField>
|
||||||
|
|
||||||
{/* ------------ Form account ------------ */}
|
|
||||||
<FastField name={'deposit_account_id'}>
|
|
||||||
{({ form, field: { value }, meta: { error, touched } }) => (
|
|
||||||
<FormGroup
|
|
||||||
label={<T id={'refund_vendor_credit.dialog.deposit_to_account'} />}
|
|
||||||
className={classNames(
|
|
||||||
'form-group--deposit_account_id',
|
|
||||||
'form-group--select-list',
|
|
||||||
CLASSES.FILL,
|
|
||||||
)}
|
|
||||||
labelInfo={<FieldRequiredHint />}
|
|
||||||
intent={inputIntent({ error, touched })}
|
|
||||||
helperText={<ErrorMessage name={'deposit_account_id'} />}
|
|
||||||
>
|
|
||||||
<AccountsSuggestField
|
|
||||||
selectedAccountId={value}
|
|
||||||
accounts={accounts}
|
|
||||||
onAccountSelected={({ id }) =>
|
|
||||||
form.setFieldValue('deposit_account_id', id)
|
|
||||||
}
|
|
||||||
inputProps={{
|
|
||||||
placeholder: intl.get('select_account'),
|
|
||||||
}}
|
|
||||||
filterByTypes={[
|
|
||||||
ACCOUNT_TYPE.BANK,
|
|
||||||
ACCOUNT_TYPE.CASH,
|
|
||||||
ACCOUNT_TYPE.FIXED_ASSET,
|
|
||||||
]}
|
|
||||||
/>
|
|
||||||
</FormGroup>
|
|
||||||
)}
|
|
||||||
</FastField>
|
|
||||||
{/* --------- Statement --------- */}
|
{/* --------- Statement --------- */}
|
||||||
<FastField name={'description'}>
|
<FastField name={'description'}>
|
||||||
{({ form, field, meta: { error, touched } }) => (
|
{({ form, field, meta: { error, touched } }) => (
|
||||||
@@ -158,4 +219,10 @@ function RefundVendorCreditFormFields() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export default RefundVendorCreditFormFields;
|
export default compose(withCurrentOrganization())(RefundVendorCreditFormFields);
|
||||||
|
|
||||||
|
export const BranchRowDivider = styled.div`
|
||||||
|
height: 1px;
|
||||||
|
background: #ebf1f6;
|
||||||
|
margin-bottom: 13px;
|
||||||
|
`;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { pick } from 'lodash';
|
|||||||
import {
|
import {
|
||||||
useAccounts,
|
useAccounts,
|
||||||
useVendorCredit,
|
useVendorCredit,
|
||||||
|
useBranches,
|
||||||
useCreateRefundVendorCredit,
|
useCreateRefundVendorCredit,
|
||||||
} from 'hooks/query';
|
} from 'hooks/query';
|
||||||
|
|
||||||
@@ -18,6 +19,13 @@ function RefundVendorCreditFormProvider({
|
|||||||
// Handle fetch accounts data.
|
// Handle fetch accounts data.
|
||||||
const { data: accounts, isLoading: isAccountsLoading } = useAccounts();
|
const { data: accounts, isLoading: isAccountsLoading } = useAccounts();
|
||||||
|
|
||||||
|
// Fetches the branches list.
|
||||||
|
const {
|
||||||
|
data: branches,
|
||||||
|
isLoading: isBranchesLoading,
|
||||||
|
isSuccess: isBranchesSuccess,
|
||||||
|
} = useBranches();
|
||||||
|
|
||||||
// Handle fetch vendor credit details.
|
// Handle fetch vendor credit details.
|
||||||
const { data: vendorCredit, isLoading: isVendorCreditLoading } =
|
const { data: vendorCredit, isLoading: isVendorCreditLoading } =
|
||||||
useVendorCredit(vendorCreditId, {
|
useVendorCredit(vendorCreditId, {
|
||||||
@@ -35,12 +43,18 @@ function RefundVendorCreditFormProvider({
|
|||||||
amount: vendorCredit.credits_remaining,
|
amount: vendorCredit.credits_remaining,
|
||||||
},
|
},
|
||||||
accounts,
|
accounts,
|
||||||
|
branches,
|
||||||
dialogName,
|
dialogName,
|
||||||
|
isBranchesSuccess,
|
||||||
createRefundVendorCreditMutate,
|
createRefundVendorCreditMutate,
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<DialogContent isLoading={isAccountsLoading || isVendorCreditLoading}>
|
<DialogContent
|
||||||
|
isLoading={
|
||||||
|
isAccountsLoading || isVendorCreditLoading || isBranchesLoading
|
||||||
|
}
|
||||||
|
>
|
||||||
<RefundVendorCreditContext.Provider value={provider} {...props} />
|
<RefundVendorCreditContext.Provider value={provider} {...props} />
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
);
|
);
|
||||||
|
|||||||
20
src/containers/Dialogs/RefundVendorCreditDialog/utils.js
Normal file
20
src/containers/Dialogs/RefundVendorCreditDialog/utils.js
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { useFormikContext } from 'formik';
|
||||||
|
import { first } from 'lodash';
|
||||||
|
|
||||||
|
import { useRefundVendorCreditContext } from './RefundVendorCreditFormProvider';
|
||||||
|
|
||||||
|
export const useSetPrimaryBranchToForm = () => {
|
||||||
|
const { setFieldValue } = useFormikContext();
|
||||||
|
const { branches, isBranchesSuccess } = useRefundVendorCreditContext();
|
||||||
|
|
||||||
|
React.useEffect(() => {
|
||||||
|
if (isBranchesSuccess) {
|
||||||
|
const primaryBranch = branches.find((b) => b.primary) || first(branches);
|
||||||
|
|
||||||
|
if (primaryBranch) {
|
||||||
|
setFieldValue('branch_id', primaryBranch.id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, [isBranchesSuccess, setFieldValue, branches]);
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user