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

feat(manual journal): add exchange rate input.

Browse Source
This commit is contained in:
elforjani13
2022-02-21 16:03:57 +02:00
parent 7c9ad8438c
commit b15437c88e
4 changed files with 76 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/features.js
View File

@@ -2,5 +2,6 @@
export const Features = { export const Features = {
Warehouses: 'warehouses', Warehouses: 'warehouses',
Branches: 'branches' Branches: 'branches',
ManualJournal: 'manualJournal',
} }

72
src/containers/Accounting/MakeJournal/MakeJournalEntriesHeaderFields.js
View File

@@ -9,6 +9,7 @@ import { FastField, ErrorMessage } from 'formik';
import { DateInput } from '@blueprintjs/datetime'; import { DateInput } from '@blueprintjs/datetime';
import { FormattedMessage as T } from 'components'; import { FormattedMessage as T } from 'components';
import classNames from 'classnames'; import classNames from 'classnames';
import { Features } from 'common';
import { CLASSES } from 'common/classes'; import { CLASSES } from 'common/classes';
import { import {
@@ -23,8 +24,11 @@ import {
FieldHint, FieldHint,
FieldRequiredHint, FieldRequiredHint,
Icon, Icon,
If,
FeatureCan,
InputPrependButton, InputPrependButton,
CurrencySelectList, CurrencySelectList,
ExchangeRateInputGroup,
} from 'components'; } from 'components';
import withSettings from 'containers/Settings/withSettings'; import withSettings from 'containers/Settings/withSettings';
import { useMakeJournalFormContext } from './MakeJournalProvider'; import { useMakeJournalFormContext } from './MakeJournalProvider';
@@ -48,7 +52,12 @@ function MakeJournalEntriesHeader({
journalNextNumber, journalNextNumber,
journalNumberPrefix, journalNumberPrefix,
}) { }) {
const { currencies } = useMakeJournalFormContext(); const {
currencies,
isForeignJournal,
baseCurrency,
setSelactJournalCurrency,
} = useMakeJournalFormContext();
// Handle journal number change. // Handle journal number change.
const handleJournalNumberChange = () => { const handleJournalNumberChange = () => {
@@ -185,29 +194,44 @@ function MakeJournalEntriesHeader({
</FastField> </FastField>
{/*------------ Currency -----------*/} {/*------------ Currency -----------*/}
<FastField {/* <FeatureCan feature={Features.ManualJournal}> */}
name={'currency_code'} <FastField
currencies={currencies} name={'currency_code'}
shouldUpdate={currenciesFieldShouldUpdate} currencies={currencies}
> shouldUpdate={currenciesFieldShouldUpdate}
{({ form, field: { value }, meta: { error, touched } }) => ( >
<FormGroup {({ form, field: { value }, meta: { error, touched } }) => (
label={<T id={'currency'} />} <FormGroup
className={classNames('form-group--currency', CLASSES.FILL)} label={<T id={'currency'} />}
inline={true} className={classNames('form-group--currency', CLASSES.FILL)}
> inline={true}
<CurrencySelectList >
currenciesList={currencies} <CurrencySelectList
selectedCurrencyCode={value} currenciesList={currencies}
onCurrencySelected={(currencyItem) => { selectedCurrencyCode={value}
form.setFieldValue('currency_code', currencyItem.currency_code); onCurrencySelected={(currencyItem) => {
}} form.setFieldValue(
defaultSelectText={value} 'currency_code',
disabled={true} currencyItem.currency_code,
/> );
</FormGroup> setSelactJournalCurrency(currencyItem);
)} }}
</FastField> defaultSelectText={value}
/>
</FormGroup>
)}
</FastField>
{/* </FeatureCan> */}
{/* ----------- Exchange rate ----------- */}
<If condition={isForeignJournal}>
<ExchangeRateInputGroup
fromCurrency={'USD'}
toCurrency={'LYD'}
name={'exchange_rate'}
formGroupProps={{ label: ' ', inline: true }}
/>
</If>
</div> </div>
); );
} }

11
src/containers/Accounting/MakeJournal/MakeJournalEntriesPage.js
View File

@@ -6,15 +6,22 @@ import 'style/pages/ManualJournal/MakeJournal.scss';
import MakeJournalEntriesForm from './MakeJournalEntriesForm'; import MakeJournalEntriesForm from './MakeJournalEntriesForm';
import { MakeJournalProvider } from './MakeJournalProvider'; import { MakeJournalProvider } from './MakeJournalProvider';
import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
import { compose } from 'utils';
/** /**
* Make journal entries page. * Make journal entries page.
*/ */
export default function MakeJournalEntriesPage() { function MakeJournalEntriesPage({
// #withCurrentOrganization
organization: { base_currency },
}) {
const { id: journalId } = useParams(); const { id: journalId } = useParams();
return ( return (
<MakeJournalProvider journalId={journalId}> <MakeJournalProvider journalId={journalId} baseCurrency={base_currency}>
<MakeJournalEntriesForm /> <MakeJournalEntriesForm />
</MakeJournalProvider> </MakeJournalProvider>
); );
} }
export default compose(withCurrentOrganization())(MakeJournalEntriesPage);

23
src/containers/Accounting/MakeJournal/MakeJournalProvider.js
View File

@@ -1,4 +1,5 @@
import React, { createContext, useState } from 'react'; import React, { createContext, useState } from 'react';
import { isEqual, isUndefined } from 'lodash';
import DashboardInsider from 'components/Dashboard/DashboardInsider'; import DashboardInsider from 'components/Dashboard/DashboardInsider';
import { import {
useAccounts, useAccounts,
@@ -8,7 +9,7 @@ import {
useCreateJournal, useCreateJournal,
useEditJournal, useEditJournal,
useSettings, useSettings,
useSettingsManualJournals useSettingsManualJournals,
} from 'hooks/query'; } from 'hooks/query';
const MakeJournalFormContext = createContext(); const MakeJournalFormContext = createContext();
@@ -16,15 +17,13 @@ const MakeJournalFormContext = createContext();
/** /**
* Make journal form provider. * Make journal form provider.
*/ */
function MakeJournalProvider({ journalId, ...props }) { function MakeJournalProvider({ journalId, baseCurrency, ...props }) {
// Load the accounts list. // Load the accounts list.
const { data: accounts, isLoading: isAccountsLoading } = useAccounts(); const { data: accounts, isLoading: isAccountsLoading } = useAccounts();
// Load the customers list. // Load the customers list.
const { const { data: contacts, isLoading: isContactsLoading } =
data: contacts, useAutoCompleteContacts();
isLoading: isContactsLoading,
} = useAutoCompleteContacts();
// Load the currencies list. // Load the currencies list.
const { data: currencies, isLoading: isCurrenciesLoading } = useCurrencies(); const { data: currencies, isLoading: isCurrenciesLoading } = useCurrencies();
@@ -45,12 +44,18 @@ function MakeJournalProvider({ journalId, ...props }) {
// Submit form payload. // Submit form payload.
const [submitPayload, setSubmitPayload] = useState({}); const [submitPayload, setSubmitPayload] = useState({});
const [selectJournalCurrency, setSelactJournalCurrency] = useState(null);
const isForeignJournal =
!isEqual(selectJournalCurrency?.currency_code, baseCurrency) &&
!isUndefined(selectJournalCurrency?.currency_code);
const provider = { const provider = {
accounts, accounts,
contacts, contacts,
currencies, currencies,
manualJournal, manualJournal,
baseCurrency,
createJournalMutate, createJournalMutate,
editJournalMutate, editJournalMutate,
@@ -60,11 +65,13 @@ function MakeJournalProvider({ journalId, ...props }) {
isCurrenciesLoading, isCurrenciesLoading,
isJournalLoading, isJournalLoading,
isSettingsLoading, isSettingsLoading,
isForeignJournal,
isNewMode: !journalId, isNewMode: !journalId,
submitPayload, submitPayload,
setSubmitPayload setSubmitPayload,
selectJournalCurrency,
setSelactJournalCurrency,
}; };
return ( return (