QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 12:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/breadcrumb/fix_localize'

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-05-20 07:06:15 +02:00
parent 741c78c5d0 67a23ce452
commit fa558a047c
78 changed files with 833 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/containers/Accounting/MakeJournalEntriesForm.js
View File

@@ -63,8 +63,8 @@ function MakeJournalEntriesForm({
}, [changePageTitle, changePageSubtitle, manualJournal]);
const validationSchema = Yup.object().shape({
journal_number: Yup.string().required(),
date: Yup.date().required(),
journal_number: Yup.string().required().label(formatMessage({id:'journal_number_'})),
date: Yup.date().required().label(formatMessage({id:'date'})),
reference: Yup.string(),
description: Yup.string(),
entries: Yup.array().of(
@@ -147,7 +147,7 @@ function MakeJournalEntriesForm({
// Validate the total credit should be eqials total debit.
if (totalCredit !== totalDebit) {
AppToaster.show({
message: 'credit_and_debit_not_equal',
message: formatMessage({id:'credit_and_debit_not_equal'}),
});
setSubmitting(false);
return;

4
client/src/containers/Accounting/MakeJournalEntriesPage.js
View File

@@ -26,11 +26,11 @@ function MakeJournalEntriesPage({
const handleFormSubmit = useCallback((payload) => {
payload.redirect &&
history.push('/dashboard/accounting/manual-journals');
history.push('/manual-journals');
}, [history]);
const handleCancel = useCallback(() => {
history.push('/dashboard/accounting/manual-journals');
history.push('/manual-journals');
}, [history]);
return (

2
client/src/containers/Accounting/ManualJournalActionsBar.js
View File

@@ -54,7 +54,7 @@ function ManualJournalActionsBar({
});
const onClickNewManualJournal = useCallback(() => {
history.push('/dashboard/accounting/make-journal-entry');
history.push('/make-journal-entry');
}, [history]);
const filterDropdown = FilterDropdown({

6
client/src/containers/Accounting/ManualJournalsList.js
View File

@@ -122,7 +122,7 @@ function ManualJournalsTable({
const handleEditJournal = useCallback(
(journal) => {
history.push(`/dashboard/accounting/manual-journals/${journal.id}/edit`);
history.push(`/manual-journals/${journal.id}/edit`);
},
[history]
);
@@ -182,8 +182,8 @@ function ManualJournalsTable({
<Route
exact={true}
path={[
'/dashboard/accounting/manual-journals/:custom_view_id/custom_view',
'/dashboard/accounting/manual-journals',
'/manual-journals/:custom_view_id/custom_view',
'/manual-journals',
]}>
<ManualJournalsViewTabs />

4
client/src/containers/Accounting/ManualJournalsViewTabs.js
View File

@@ -41,7 +41,7 @@ function ManualJournalsViewTabs({
const handleClickNewView = () => {
setTopbarEditView(null);
history.push('/dashboard/custom_views/manual_journals/new');
history.push('/custom_views/manual_journals/new');
};
const handleViewLinkClick = () => {
setTopbarEditView(customViewId);
@@ -63,7 +63,7 @@ function ManualJournalsViewTabs({
}, [customViewId]);
const tabs = manualJournalsViews.map((view) => {
const baseUrl = '/dashboard/accounting/manual-journals';
const baseUrl = '/manual-journals';
const link = (
<Link
to={`${baseUrl}/${view.id}/custom_view`}

2
client/src/containers/Accounts/AccountsActionsBar.js
View File

@@ -53,7 +53,7 @@ function AccountsActionsBar({
const onClickNewAccount = () => { openDialog('account-form', {}); };
const onClickViewItem = (view) => {
history.push(view
? `/dashboard/accounts/${view.id}/custom_view` : '/dashboard/accounts');
? `/accounts/${view.id}/custom_view` : '/accounts');
};
const viewsMenuItems = accountsViews.map((view) => {

10
client/src/containers/Accounts/AccountsChart.js
View File

@@ -98,7 +98,7 @@ function AccountsChart({
}
if (errors.find((e) => e.type === 'ACCOUNT.HAS.ASSOCIATED.TRANSACTIONS')) {
AppToaster.show({
message: 'cannot_delete_account_has_associated_transactions'
message: formatMessage({id:'cannot_delete_account_has_associated_transactions'})
});
}
}
@@ -313,8 +313,8 @@ const handleConfirmBulkActivate = useCallback(() => {
<Route
exact={true}
path={[
'/dashboard/accounts/:custom_view_id/custom_view',
'/dashboard/accounts',
'/accounts/:custom_view_id/custom_view',
'/accounts',
]}
>
<AccountsViewsTabs onViewChanged={handleViewChanged} />
@@ -373,8 +373,8 @@ const handleConfirmBulkActivate = useCallback(() => {
</Alert>
<Alert
cancelButtonText="Cancel"
confirmButtonText={`Delete (${selectedRowsCount})`}
cancelButtonText={<T id={'cancel'}/>}
confirmButtonText={`${formatMessage({id:'delete'})} (${selectedRowsCount})`}
icon="trash"
intent={Intent.DANGER}
isOpen={bulkDelete}

4
client/src/containers/Accounts/AccountsDataTable.js
View File

@@ -72,12 +72,12 @@ function AccountsDataTable({
<MenuDivider />
<If condition={account.active}>
<MenuItem
text='Inactivate Account'
text={<T id={'inactivate_account'}/>}
onClick={() => onInactiveAccount(account)} />
</If>
<If condition={!account.active}>
<MenuItem
text='Activate Account'
text={<T id={'activate_account'}/>}
onClick={() => onActivateAccount(account)} />
</If>
<MenuItem

8
client/src/containers/Accounts/AccountsViewsTabs.js
View File

@@ -19,7 +19,7 @@ import withDashboard from 'containers/Dashboard/withDashboard';
import withAccounts from 'containers/Accounts/withAccounts';
import withAccountsTableActions from 'containers/Accounts/withAccountsTableActions';
import withViewDetail from 'containers/Views/withViewDetails';
import { FormattedMessage as T, useIntl } from 'react-intl';
function AccountsViewsTabs({
// #withViewDetail
@@ -67,7 +67,7 @@ function AccountsViewsTabs({
// Handle click a new view tab.
const handleClickNewView = () => {
setTopbarEditView(null);
history.push('/dashboard/custom_views/accounts/new');
history.push('/custom_views/accounts/new');
};
// Handle view tab link click.
@@ -76,7 +76,7 @@ function AccountsViewsTabs({
};
const tabs = accountsViews.map((view) => {
const baseUrl = '/dashboard/accounts';
const baseUrl = '/accounts';
const link = (
<Link
@@ -98,7 +98,7 @@ function AccountsViewsTabs({
>
<Tab
id={'all'}
title={<Link to={`/dashboard/accounts`}>All</Link>}
title={<Link to={`/accounts`}><T id={'all'}/></Link>}
onClick={handleViewLinkClick}
/>
{ tabs }

12
client/src/containers/Authentication/InviteAccept.js
View File

@@ -33,14 +33,14 @@ function Invite({ requestInviteAccept, requestInviteMetaByToken }) {
}, [shown]);
const ValidationSchema = Yup.object().shape({
first_name: Yup.string().required(formatMessage({ id: 'required' })),
last_name: Yup.string().required(formatMessage({ id: 'required' })),
first_name: Yup.string().required().label(formatMessage({id:'first_name_'})),
last_name: Yup.string().required().label(formatMessage({id:'last_name_'})),
phone_number: Yup.string()
.matches()
.required(formatMessage({ id: 'required' })),
.required().label(formatMessage({id:''})),
password: Yup.string()
.min(4, 'Password has to be longer than 4 characters!')
.required('Password is required!'),
.min(4)
.required().label(formatMessage({id:'password'}))
});
const inviteMeta = useAsync(() => {
@@ -148,7 +148,7 @@ function Invite({ requestInviteAccept, requestInviteMetaByToken }) {
</h3>
<p>
<T id={'enter_your_personal_information'} />
<b>{inviteValue.organization_name}</b> Organization.
<b>{inviteValue.organization_name}</b> <T id={'organization'}/>
</p>
</div>

31
client/src/containers/Authentication/Login.js
View File

@@ -1,6 +1,8 @@
import React, { useMemo, useState } from 'react';
import { Link, useHistory } from 'react-router-dom';
import * as Yup from 'yup';
import { useFormik } from 'formik';
import { FormattedMessage as T, useIntl } from 'react-intl';
import {
@@ -34,14 +36,15 @@ function Login({
const [shown, setShown] = useState(false);
const passwordRevealer = () => { setShown(!shown); };
// Validation schema.
const loginValidationSchema = Yup.object().shape({
const loginValidationSchema = Yup.object().shape({
crediential: Yup.string()
.required(formatMessage({ id: 'required' }))
.email(formatMessage({ id: 'invalid_email_or_phone_numner' })),
.required()
.email().label(formatMessage({id:'email'})),
password: Yup.string()
.required(formatMessage({ id: 'required' }))
.min(4),
.required()
.min(4).label(formatMessage({id:'password'}))
});
// Formik validation schema and submit handler.
@@ -63,13 +66,13 @@ function Login({
crediential: values.crediential,
password: values.password,
}).then(() => {
history.go('/dashboard/homepage');
history.go('/homepage');
setSubmitting(false);
}).catch((errors) => {
const toastBuilders = [];
if (errors.find((e) => e.type === ERRORS_TYPES.INVALID_DETAILS)) {
toastBuilders.push({
message: formatMessage({id:'email_and_password_entered_did_not_match'}),
message: formatMessage({ id: 'email_and_password_entered_did_not_match' }),
intent: Intent.DANGER,
});
}
@@ -110,7 +113,7 @@ function Login({
<FormGroup
label={<T id={'email_or_phone_number'} />}
intent={(errors.crediential && touched.crediential) && Intent.DANGER}
helperText={<ErrorMessage name={'crediential'} {...{errors, touched}} />}
helperText={<ErrorMessage name={'crediential'} {...{ errors, touched }} />}
className={'form-group--crediential'}
>
<InputGroup
@@ -119,13 +122,13 @@ function Login({
{...getFieldProps('crediential')}
/>
</FormGroup>
<FormGroup
label={<T id={'password'} />}
labelInfo={passwordRevealerTmp}
intent={(errors.password && touched.password) && Intent.DANGER}
helperText={<ErrorMessage name={'password'} {...{errors, touched}} />}
className={'form-group--password has-password-revealer'}
helperText={<ErrorMessage name={'password'} {...{ errors, touched }} />}
className={'form-group--password has-password-revealer'}
>
<InputGroup
large={true}
@@ -134,12 +137,12 @@ function Login({
{...getFieldProps('password')}
/>
</FormGroup>
<div className={'login-form__checkbox-section'}>
<Checkbox
large={true}
className={'checkbox--remember-me'}>
<T id={'keep_me_logged_in'} />
<T id={'keep_me_logged_in'} />
</Checkbox>
</div>
@@ -155,7 +158,7 @@ function Login({
</Button>
</div>
</form>
<div class="authentication-page__footer-links">
<Link to={'/auth/send_reset_password'}>
<T id={'forget_my_password'} />

16
client/src/containers/Authentication/Register.js
View File

@@ -10,6 +10,7 @@ import {
FormGroup,
Spinner,
} from '@blueprintjs/core';
import { Row, Col } from 'react-grid-system';
import { Link, useHistory } from 'react-router-dom';
import withAuthenticationActions from './withAuthenticationActions';
@@ -29,18 +30,19 @@ function Register({ requestRegister }) {
}, [shown]);
const ValidationSchema = Yup.object().shape({
organization_name: Yup.string().required(formatMessage({ id: 'required' })),
first_name: Yup.string().required(formatMessage({ id: 'required' })),
last_name: Yup.string().required(formatMessage({ id: 'required' })),
organization_name: Yup.string().required().label(formatMessage({id:'organization_name_'})),
first_name: Yup.string().required().label(formatMessage({id:'first_name_'})),
last_name: Yup.string().required().label(formatMessage({id:'last_name_'})),
email: Yup.string()
.email()
.required(formatMessage({ id: 'required' })),
.required()
.label(formatMessage({ id: 'email' })),
phone_number: Yup.string()
.matches()
.required(formatMessage({ id: 'required' })),
.required().label(formatMessage({id:'phone_number_'})),
password: Yup.string()
.min(4, 'Password has to be longer than 8 characters!')
.required('Password is required!'),
.min(4)
.required().label(formatMessage({id:'password'})),
});
const initialValues = useMemo(

11
client/src/containers/Authentication/ResetPassword.js
View File

@@ -17,18 +17,21 @@ import withAuthenticationActions from './withAuthenticationActions';
import AuthInsider from 'containers/Authentication/AuthInsider';
import { FormattedMessage as T, useIntl } from 'react-intl';
function ResetPassword({ requestResetPassword }) {
const { formatMessage } = useIntl();
const { token } = useParams();
const history = useHistory();
const ValidationSchema = Yup.object().shape({
password: Yup.string()
.min(4, 'Password has to be longer than 4 characters!')
.required('Password is required!'),
.min(4)
.required().label(formatMessage({id:'password'})),
confirm_password: Yup.string()
.oneOf([Yup.ref('password'), null], 'Passwords must match')
.required('Confirm Password is required'),
.oneOf([Yup.ref('password'), null])
.required().label(formatMessage({id:'confirm_password'})),
});
const initialValues = useMemo(

12
client/src/containers/Authentication/SendResetPassword.js
View File

@@ -4,7 +4,6 @@ import { useFormik } from 'formik';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { Link, useHistory } from 'react-router-dom';
import { Button, InputGroup, Intent, FormGroup } from '@blueprintjs/core';
import { FormattedMessage } from 'react-intl';
import { compose } from 'utils';
@@ -21,9 +20,9 @@ function SendResetPassword({ requestSendResetPassword }) {
// Validation schema.
const ValidationSchema = Yup.object().shape({
crediential: Yup.string('')
.required(formatMessage({ id: 'required' }))
.email(formatMessage({ id: 'invalid_email_or_phone_numner' })),
crediential: Yup.string()
.required()
.email().label(formatMessage({id:''})),
});
const initialValues = useMemo(
@@ -52,8 +51,7 @@ function SendResetPassword({ requestSendResetPassword }) {
requestSendResetPassword(values.crediential)
.then((response) => {
AppToaster.show({
message: `Check your email for a link to reset your password.
If it doesn’t appear within a few minutes, check your spam folder.`,
message: formatMessage({id:'check_your_email_for_a_link_to_reset'}),
intent: Intent.SUCCESS,
});
history.push('/auth/login');
@@ -62,7 +60,7 @@ function SendResetPassword({ requestSendResetPassword }) {
.catch((errors) => {
if (errors.find((e) => e.type === 'EMAIL.NOT.REGISTERED')) {
AppToaster.show({
message: "We couldn't find your account with that email",
message: formatMessage({id:'we_couldn_t_find_your_account_with_that_email'}),
intent: Intent.DANGER,
});
}

6
client/src/containers/Dialogs/AccountFormDialog.js
View File

@@ -52,11 +52,11 @@ function AccountFormDialog({
}) {
const { formatMessage } = useIntl();
const accountFormValidationSchema = Yup.object().shape({
name: Yup.string().required(formatMessage({ id: 'required' })),
name: Yup.string().required().label(formatMessage({id:'account_name_'})),
code: Yup.number(),
account_type_id: Yup.string()
.nullable()
.required(formatMessage({ id: 'required' })),
.required().label(formatMessage({id:'account_type_id'})),
description: Yup.string().trim()
});
@@ -375,7 +375,7 @@ function AccountFormDialog({
text={
selectedSubaccount
? selectedSubaccount.name
: 'Select Parent Account'
: <T id={'select_parent_account'}/>
}
/>
</Select>

16
client/src/containers/Dialogs/CurrencyDialog.js
View File

@@ -46,13 +46,11 @@ function CurrencyDialog({
}) {
const {formatMessage} = useIntl();
const ValidationSchema = Yup.object().shape({
currency_name: Yup.string().required(
formatMessage({ id: 'required' })
),
const validationSchema = Yup.object().shape({
currency_name: Yup.string().required().label(formatMessage({id:'currency_name_'})),
currency_code: Yup.string()
.max(4)
.required(formatMessage({ id: 'required' })),
.required().label(formatMessage({id:'currency_code_'})),
});
const initialValues = useMemo(() => ({
currency_name: '',
@@ -63,9 +61,9 @@ function CurrencyDialog({
values,
errors,
touched,
isSubmitting,
setFieldValue,
getFieldProps,
isSubmitting,
handleSubmit,
resetForm,
} = useFormik({
@@ -74,13 +72,13 @@ function CurrencyDialog({
...(payload.action === 'edit' &&
pick(currency, Object.keys(initialValues))),
},
validationSchema: ValidationSchema,
validationSchema: validationSchema,
onSubmit: (values, { setSubmitting }) => {
if (payload.action === 'edit') {
requestEditCurrency(currency.id, values).then((response) => {
closeDialog(name);
AppToaster.show({
message: 'the_currency_has_been_edited',
message: formatMessage({id:'the_currency_has_been_successfully_edited'}),
intent: Intent.SUCCESS,
});
setSubmitting(false);
@@ -92,7 +90,7 @@ function CurrencyDialog({
requestSubmitCurrencies(values).then((response) => {
closeDialog(name);
AppToaster.show({
message: 'the_currency_has_been_submit',
message: formatMessage({id:'the_currency_has_been_successfully_created'}),
intent: Intent.SUCCESS,
});
setSubmitting(false);

10
client/src/containers/Dialogs/ExchangeRateDialog.js
View File

@@ -49,9 +49,9 @@ function ExchangeRateDialog({
const [selectedItems, setSelectedItems] = useState({});
const validationSchema = Yup.object().shape({
exchange_rate: Yup.number().required(),
currency_code: Yup.string().max(3).required(),
date: Yup.date().required(),
exchange_rate: Yup.number().required().label(formatMessage({id:'exchange_rate_'})),
currency_code: Yup.string().max(3).required(formatMessage({id:'currency_code_'})),
date: Yup.date().required().label(formatMessage({id:'date'})),
});
const initialValues = useMemo(() => ({
@@ -82,7 +82,7 @@ function ExchangeRateDialog({
.then((response) => {
closeDialog(name);
AppToaster.show({
message: 'the_exchange_rate_has_been_edited',
message: formatMessage({id:'the_exchange_rate_has_been_successfully_edited'})
});
setSubmitting(false);
})
@@ -94,7 +94,7 @@ function ExchangeRateDialog({
.then((response) => {
closeDialog(name);
AppToaster.show({
message: 'the_exchangeRate_has_been_submit',
message: formatMessage({id:'the_exchange_rate_has_been_successfully_created'})
});
setSubmitting(false);
})

10
client/src/containers/Dialogs/InviteUserDialog.js
View File

@@ -37,12 +37,12 @@ function InviteUserDialog({
}, false);
const validationSchema = Yup.object().shape({
first_name: Yup.string().required(formatMessage({ id: 'required' })),
last_name: Yup.string().required(formatMessage({ id: 'required' })),
first_name: Yup.string().required().label(formatMessage({id:'first_name_'})),
last_name: Yup.string().required().label(formatMessage({id:'last_name_'})),
email: Yup.string()
.email()
.required(formatMessage({ id: 'required' })),
phone_number: Yup.number().required(formatMessage({ id: 'required' })),
.required().label(formatMessage({id:'email'})),
phone_number: Yup.number().required().label(formatMessage({id:'phone_number_'})),
});
const initialValues = useMemo(
@@ -74,7 +74,7 @@ function InviteUserDialog({
.then((response) => {
closeDialog(name);
AppToaster.show({
message: 'the_user_details_has_been_updated',
message: formatMessage({id:'the_user_details_has_been_updated'}),
});
setSubmitting(false);
})

2
client/src/containers/Dialogs/ItemCategoryDialog.js
View File

@@ -61,7 +61,7 @@ function ItemCategoryDialog({
() => requestFetchItemCategories());
const validationSchema = Yup.object().shape({
name: Yup.string().required(),
name: Yup.string().required().label(formatMessage({id:'category_name_'})),
parent_category_id: Yup.string().nullable(),
description: Yup.string().trim()
});

4
client/src/containers/Dialogs/ItemFromDialog.js
View File

@@ -30,7 +30,7 @@ function ItemFromDialog({
const [state, setState] = useState({});
const { formatMessage } = useIntl();
const ValidationSchema = Yup.object().shape({
name: Yup.string().required(formatMessage({ id: 'required' })),
name: Yup.string().required().label(formatMessage({id:'category_name_'})),
description: Yup.string().trim(),
});
@@ -42,7 +42,7 @@ function ItemFromDialog({
submitItemCategory({ values })
.then((response) => {
AppToaster.show({
message: 'the_category_has_been_submit',
message: formatMessage({id:'the_category_has_been_successfully_created'}),
});
})
.catch((error) => {

2
client/src/containers/Dialogs/UserFormDialog.js
View File

@@ -36,7 +36,7 @@ function UserFormDialog({
}, false);
const validationSchema = Yup.object().shape({
email: Yup.string().email().required(),
email: Yup.string().email().required().label(formatMessage({id:'email'})),
});
const initialValues = {

2
client/src/containers/ExchangeRates/ExchangeRate.js
View File

@@ -68,7 +68,7 @@ function ExchangeRate({
requestDeleteExchangeRate(deleteExchangeRate.id).then(() => {
setDeleteExchangeRate(false);
AppToaster.show({
message: 'the_exchange_rate_has_been_delete',
message: formatMessage({id:'the_exchange_rate_has_been_successfully_deleted'}),
});
});
}, [deleteExchangeRate, requestDeleteExchangeRate]);

5
client/src/containers/ExchangeRates/ExchangeRateActionsBar.js
View File

@@ -19,7 +19,7 @@ import FilterDropdown from 'components/FilterDropdown';
import withResourceDetail from 'containers/Resources/withResourceDetails';
import { compose } from 'utils';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T ,useIntl } from 'react-intl';
function ExchangeRateActionsBar({
@@ -36,6 +36,7 @@ function ExchangeRateActionsBar({
onBulkDelete
}) {
const [filterCount, setFilterCount] = useState(0);
const {formatMessage} =useIntl()
const onClickNewExchangeRate = () => {
openDialog('exchangeRate-form', {});
@@ -86,7 +87,7 @@ function ExchangeRateActionsBar({
filterCount <= 0 ? (
<T id={'filter'} />
) : (
`${filterCount} filters applied`
`${filterCount} ${formatMessage({id:'filters_applied'})}`
)
}
icon={<Icon icon='filter' />}

2
client/src/containers/Expenses/ExpensesList.js
View File

@@ -36,7 +36,7 @@ function ExpensesList({
deleteExpense(deleteExpenseState.id).then(() => {
setDeleteExpense(false);
AppToaster.show({
message: 'the_expense_has_been_deleted'
message: formatMessage({id:'the_expense_has_been_successfully_deleted'})
});
});
};

13
client/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js
View File

@@ -1,8 +1,7 @@
import React, {useEffect, useMemo, useCallback, useState} from 'react';
import React, { useEffect, useMemo, useCallback, useState } from 'react';
import {compose} from 'utils';
import { compose } from 'utils';
import { useQuery } from 'react-query';
import { useIntl } from 'react-intl';
import moment from 'moment';
import BalanceSheetHeader from './BalanceSheetHeader';
@@ -17,6 +16,8 @@ import withSettings from 'containers/Settings/withSettings';
import withBalanceSheetActions from './withBalanceSheetActions';
import withBalanceSheetDetail from './withBalanceSheetDetail';
import { FormattedMessage as T, useIntl } from 'react-intl';
function BalanceSheet({
// #withDashboard
@@ -24,14 +25,14 @@ function BalanceSheet({
// #withBalanceSheetActions
fetchBalanceSheet,
// #withBalanceSheetDetail
balanceSheetLoading,
// #withPreferences
organizationSettings
}) {
const intl = useIntl();
const { formatMessage } = useIntl();
const [filter, setFilter] = useState({
from_date: moment().startOf('year').format('YYYY-MM-DD'),
to_date: moment().endOf('year').format('YYYY-MM-DD'),
@@ -52,7 +53,7 @@ function BalanceSheet({
}, []);
useEffect(() => {
changePageTitle('Balance Sheet');
changePageTitle(formatMessage({ id: 'balance_sheet' }));
}, []);
// Handle re-fetch balance sheet after filter change.

9
client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetActionsBar.js
View File

@@ -15,6 +15,7 @@ import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'
import classNames from 'classnames';
import FilterDropdown from 'components/FilterDropdown';
import { FormattedMessage as T, useIntl } from 'react-intl';
export default function JournalActionsBar({
@@ -33,7 +34,7 @@ export default function JournalActionsBar({
<Button
className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon='cog' />}
text='Customize Report'
text={<T id={'customize_report'}/>}
/>
<NavbarDivider />
@@ -44,19 +45,19 @@ export default function JournalActionsBar({
<Button
className={classNames(Classes.MINIMAL, 'button--filter')}
text="Filter"
text={<T id={'filter'}/>}
icon={ <Icon icon="filter" /> } />
</Popover>
<Button
className={Classes.MINIMAL}
icon={<Icon icon='file-export' />}
text='Print'
text={<T id={'print'}/>}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon='file-export' />}
text='Export'
text={<T id={'export'}/>}
/>
</NavbarGroup>
</DashboardActionsBar>

30
client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js
View File

@@ -1,13 +1,12 @@
import React, {useMemo, useCallback} from 'react';
import React, { useMemo, useCallback } from 'react';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import {Row, Col} from 'react-grid-system';
import {
import { Row, Col } from 'react-grid-system';
import {
Button,
FormGroup,
MenuItem,
} from "@blueprintjs/core";
import SelectList from 'components/SelectList';
import {useIntl} from 'react-intl';
import moment from 'moment';
import Icon from 'components/Icon';
import { useFormik } from 'formik';
@@ -15,13 +14,14 @@ import * as Yup from 'yup';
import FinancialStatementDateRange from 'containers/FinancialStatements/FinancialStatementDateRange';
import SelectDisplayColumnsBy from '../SelectDisplayColumnsBy';
import RadiosAccountingBasis from '../RadiosAccountingBasis';
import { FormattedMessage as T, useIntl } from 'react-intl';
export default function BalanceSheetHeader({
onSubmitFilter,
pageFilter,
}) {
const intl = useIntl();
const { formatMessage } = useIntl();
const formik = useFormik({
enableReinitialize: true,
@@ -32,8 +32,8 @@ export default function BalanceSheetHeader({
to_date: moment(pageFilter.to_date).toDate(),
},
validationSchema: Yup.object().shape({
from_date: Yup.date().required(),
to_date: Yup.date().min(Yup.ref('from_date')).required(),
from_date: Yup.date().required().label(formatMessage({id:'from_data'})),
to_date: Yup.date().min(Yup.ref('from_date')).required().label(formatMessage({id:'to_date'})),
}),
onSubmit: (values, actions) => {
onSubmitFilter(values);
@@ -50,18 +50,18 @@ export default function BalanceSheetHeader({
// Handle submit filter submit button.
const handleSubmitClick = useCallback(() => {
formik.submitForm();
}, [formik]);
}, [formik]);
const filterAccountsOptions = useMemo(() => [
{key: '', name: 'Accounts with Zero Balance'},
{key: 'all-trans', name: 'All Transactions' },
{ key: '', name: formatMessage({ id: 'accounts_with_zero_balance' }) },
{ key: 'all-trans', name: formatMessage({ id: 'all_transactions' }) },
], []);
const filterAccountRenderer = useCallback((item, { handleClick, modifiers, query }) => {
return (<MenuItem text={item.name} key={item.id} onClick={handleClick} />);
}, []);
const infoIcon = useMemo(() =>
const infoIcon = useMemo(() =>
(<Icon icon="info-circle" iconSize={12} />), []);
const handleAccountingBasisChange = useCallback((value) => {
@@ -80,7 +80,7 @@ export default function BalanceSheetHeader({
<Col sm={3}>
<FormGroup
label={'Filter Accounts'}
label={<T id={'filter_accounts'} />}
className="form-group--select-list bp3-fill"
inline={false}>
@@ -95,8 +95,8 @@ export default function BalanceSheetHeader({
<Col sm={3}>
<RadiosAccountingBasis
selectedValue={formik.values.basis}
onChange={handleAccountingBasisChange} />
selectedValue={formik.values.basis}
onChange={handleAccountingBasisChange} />
</Col>
<Col sm={3}>
@@ -105,7 +105,7 @@ export default function BalanceSheetHeader({
onClick={handleSubmitClick}
disabled={formik.isSubmitting}
className={'button--submit-filter mt2'}>
{ 'Calculate Report' }
<T id={'calculate_report'} />
</Button>
</Col>
</Row>

9
client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js
View File

@@ -12,6 +12,7 @@ import {
} from 'store/financialStatement/financialStatements.selectors';
import { compose, defaultExpanderReducer } from 'utils';
import { FormattedMessage as T, useIntl } from 'react-intl';
function BalanceSheetTable({
@@ -27,6 +28,8 @@ function BalanceSheetTable({
onFetchData,
loading,
}) {
const {formatMessage} = useIntl();
const columns = useMemo(() => [
{
// Build our expander column
@@ -68,18 +71,18 @@ function BalanceSheetTable({
disableResizing: true,
},
{
Header: 'Account Name',
Header: formatMessage({id:'account_name'}),
accessor: 'name',
className: "account_name",
},
{
Header: 'Code',
Header: formatMessage({id:'code'}),
accessor: 'code',
className: "code",
},
...(balanceSheetQuery.display_columns_type === 'total') ? [
{
Header: 'Total',
Header: formatMessage({id:'total'}),
accessor: 'balance.formatted_amount',
Cell: ({ cell }) => {
const row = cell.row.original;

3
client/src/containers/FinancialStatements/FinancialStatementDateRange.js
View File

@@ -2,7 +2,8 @@ import React, {useState, useCallback, useMemo} from 'react';
import {Row, Col} from 'react-grid-system';
import {momentFormatter} from 'utils';
import {DateInput} from '@blueprintjs/datetime';
import {useIntl} from 'react-intl';
import { FormattedMessage as T, useIntl } from 'react-intl';
import {
HTMLSelect,
FormGroup,

8
client/src/containers/FinancialStatements/GeneralLedger/GeneralLedger.js
View File

@@ -2,10 +2,11 @@ import React, { useEffect, useCallback, useState, useMemo } from 'react';
import moment from 'moment';
import GeneralLedgerTable from 'containers/FinancialStatements/GeneralLedger/GeneralLedgerTable';
import { useQuery } from 'react-query';
import { useIntl } from 'react-intl';
import GeneralLedgerHeader from './GeneralLedgerHeader';
import {compose} from 'utils';
import { compose } from 'utils';
import DashboardInsider from 'components/Dashboard/DashboardInsider'
import DashboardPageContent from 'components/Dashboard/DashboardPageContent';
@@ -30,6 +31,7 @@ function GeneralLedger({
// #withSettings
organizationSettings,
}) {
const { formatMessage } = useIntl()
const [filter, setFilter] = useState({
from_date: moment().startOf('year').format('YYYY-MM-DD'),
to_date: moment().endOf('year').format('YYYY-MM-DD'),
@@ -40,7 +42,7 @@ function GeneralLedger({
// Change page title of the dashboard.
useEffect(() => {
changePageTitle('General Ledger');
changePageTitle(formatMessage({id:'general_ledger'}));
}, []);
const fetchAccounts = useQuery(['accounts-list'],
@@ -74,7 +76,7 @@ function GeneralLedger({
setRefetch(true);
}, [setFilter]);
const handleFilterChanged = () => {};
const handleFilterChanged = () => { };
return (
<DashboardInsider>

9
client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerActionsBar.js
View File

@@ -14,6 +14,7 @@ import Icon from 'components/Icon';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'
import classNames from 'classnames';
import FilterDropdown from 'components/FilterDropdown';
import { FormattedMessage as T, useIntl } from 'react-intl';
/**
* General ledger actions bar.
@@ -34,7 +35,7 @@ export default function GeneralLedgerActionsBar({
<Button
className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon='cog' />}
text='Customize Report'
text={<T id={'customize_report'}/>}
/>
<NavbarDivider />
@@ -45,19 +46,19 @@ export default function GeneralLedgerActionsBar({
<Button
className={classNames(Classes.MINIMAL, 'button--filter')}
text="Filter"
text={<T id={'filter'}/>}
icon={ <Icon icon="filter" /> } />
</Popover>
<Button
className={Classes.MINIMAL}
icon={<Icon icon='file-export' />}
text='Print'
text={<T id={'print'}/>}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon='file-export' />}
text='Export'
text={<T id={'export'}/>}
/>
</NavbarGroup>
</DashboardActionsBar>

10
client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerHeader.js
View File

@@ -1,6 +1,7 @@
import React, {useState, useMemo, useEffect, useCallback} from 'react';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import {useIntl} from 'react-intl';
import { FormattedMessage as T, useIntl } from 'react-intl';
import {
Button,
FormGroup,
@@ -19,13 +20,12 @@ import FinancialStatementDateRange from 'containers/FinancialStatements/Financia
import * as Yup from 'yup';
import RadiosAccountingBasis from '../RadiosAccountingBasis';
function GeneralLedgerHeader({
onSubmitFilter,
pageFilter,
accounts,
}) {
const intl = useIntl();
const {formatMessage} = useIntl();
const formik = useFormik({
enableReinitialize: true,
@@ -64,7 +64,7 @@ function GeneralLedgerHeader({
<Row>
<Col sm={3}>
<FormGroup
label={'Specific Accounts'}
label={<T id={'specific_accounts'}/>}
className={classNames('form-group--select-list', Classes.FILL)}
>
<AccountsMultiSelect
@@ -84,7 +84,7 @@ function GeneralLedgerHeader({
onClick={handleSubmitClick}
disabled={formik.isSubmitting}
className={'button--submit-filter mt2'}>
{ 'Calculate Report' }
<T id={'calculate_report'}/>
</Button>
</Col>
</Row>

44
client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerTable.js
View File

@@ -5,6 +5,7 @@ import {
defaultExpanderReducer,
compose
} from 'utils';
import { FormattedMessage as T, useIntl } from 'react-intl';
import FinancialSheet from 'components/FinancialSheet';
import DataTable from 'components/DataTable';
@@ -31,9 +32,10 @@ function GeneralLedgerTable({
generalLedgerTableRows,
generalLedgerQuery,
}) {
// Account name column accessor.
const accountNameAccessor = useCallback((row) => {
switch(row.rowType) {
switch (row.rowType) {
case ROW_TYPE.OPENING_BALANCE:
return 'Opening Balance';
case ROW_TYPE.CLOSING_BALANCE:
@@ -59,32 +61,32 @@ function GeneralLedgerTable({
const transaction = cell.row.original
if (transaction.rowType === ROW_TYPE.ACCOUNT) {
return (!cell.row.isExpanded) ?
return (!cell.row.isExpanded) ?
(<Money amount={transaction.closing.amount} currency={"USD"} />) : '';
}
return (<Money amount={transaction.amount} currency={"USD"} />);
}, []);
const referenceLink = useCallback((row) => {
return (<a href="">{ row.referenceId }</a>);
return (<a href="">{row.referenceId}</a>);
});
const { formatMessage } = useIntl();
const columns = useMemo(() => [
{
// Build our expander column
id: 'expander', // Make sure it has an ID
className: 'expander',
className: 'expander',
Header: ({
getToggleAllRowsExpandedProps,
isAllRowsExpanded
}) => (
<span {...getToggleAllRowsExpandedProps()} className="toggle">
{isAllRowsExpanded ?
(<span class="arrow-down" />) :
(<span class="arrow-right" />)
}
</span>
),
<span {...getToggleAllRowsExpandedProps()} className="toggle">
{isAllRowsExpanded ?
(<span class="arrow-down" />) :
(<span class="arrow-right" />)
}
</span>
),
Cell: ({ row }) =>
// Use the row.canExpand and row.getToggleRowExpandedProps prop getter
// to build the toggle for expanding a row
@@ -110,37 +112,37 @@ function GeneralLedgerTable({
disableResizing: true,
},
{
Header: 'Account Name',
Header: formatMessage({id:'account_name'}),
accessor: accountNameAccessor,
className: "name",
},
{
Header: 'Date',
Header: formatMessage({id:'date'}),
accessor: dateAccessor,
className: "date",
},
{
Header: 'Transaction Type',
Header: formatMessage({id:'transaction_type'}),
accessor: 'referenceType',
className: 'transaction_type',
},
{
Header: 'Trans. NUM',
Header: formatMessage({id:'trans_num'}),
accessor: referenceLink,
className: 'transaction_number'
},
{
Header: 'Description',
Header: formatMessage({id:'description'}),
accessor: 'note',
className: 'description',
},
{
Header: 'Amount',
Header: formatMessage({id:'amount'}),
Cell: amountCell,
className: 'amount'
},
{
Header: 'Balance',
Header: formatMessage({id:'balance'}),
Cell: amountCell,
className: 'balance',
},
@@ -172,7 +174,7 @@ function GeneralLedgerTable({
expanded={expandedRows}
virtualizedRows={true}
fixedItemSize={37}
fixedSizeHeight={1000} />
fixedSizeHeight={1000} />
</FinancialSheet>
);
}
@@ -201,4 +203,4 @@ export default compose(
generalLedgerSheetLoading,
generalLedgerQuery
})),
)(GeneralLedgerTable);
)(GeneralLedgerTable);

9
client/src/containers/FinancialStatements/Journal/Journal.js
View File

@@ -1,8 +1,9 @@
import React, { useState, useCallback, useEffect } from 'react';
import { useQuery } from 'react-query';
import {compose} from 'utils';
import moment from 'moment';
import { useIntl } from 'react-intl';
import { compose } from 'utils';
import JournalTable from './JournalTable';
import JournalHeader from './JournalHeader';
@@ -15,6 +16,7 @@ import withDashboard from 'containers/Dashboard/withDashboard';
import withJournalActions from './withJournalActions';
function Journal({
// #withJournalActions
requestFetchJournalSheet,
@@ -30,10 +32,11 @@ function Journal({
to_date: moment().endOf('year').format('YYYY-MM-DD'),
basis: 'accural'
});
const { formatMessage } = useIntl();
const [refetch, setRefetch] = useState(false);
useEffect(() => {
changePageTitle('Journal Sheet');
changePageTitle(formatMessage({id:'journal_sheet'}));
}, []);
const fetchHook = useQuery(['journal', filter],

10
client/src/containers/FinancialStatements/Journal/JournalActionsBar.js
View File

@@ -14,7 +14,7 @@ import Icon from 'components/Icon';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'
import classNames from 'classnames';
import FilterDropdown from 'components/FilterDropdown';
import { FormattedMessage as T, useIntl } from 'react-intl';
export default function JournalActionsBar({
@@ -32,7 +32,7 @@ export default function JournalActionsBar({
<Button
className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon='cog' />}
text='Customize Report'
text={<T id={'customize_report'}/>}
/>
<NavbarDivider />
@@ -43,19 +43,19 @@ export default function JournalActionsBar({
<Button
className={classNames(Classes.MINIMAL, 'button--filter')}
text="Filter"
text={<T id={'filter'}/>}
icon={ <Icon icon="filter" /> } />
</Popover>
<Button
className={Classes.MINIMAL}
icon={<Icon icon='file-export' />}
text='Print'
text={<T id={'print'}/>}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon='file-export' />}
text='Export'
text={<T id={'export'}/>}
/>
</NavbarGroup>
</DashboardActionsBar>

14
client/src/containers/FinancialStatements/Journal/JournalHeader.js
View File

@@ -1,12 +1,12 @@
import React, {useCallback} from 'react';
import {Row, Col} from 'react-grid-system';
import React, { useCallback } from 'react';
import { Row, Col } from 'react-grid-system';
import {
Button,
Intent,
} from '@blueprintjs/core';
import moment from 'moment';
import { useFormik } from 'formik';
import { useIntl } from 'react-intl';
import { FormattedMessage as T, useIntl } from 'react-intl';
import * as Yup from 'yup';
import FinancialStatementDateRange from 'containers/FinancialStatements/FinancialStatementDateRange';
@@ -17,7 +17,7 @@ export default function JournalHeader({
pageFilter,
onSubmitFilter,
}) {
const intl = useIntl();
const { formatMessage } = useIntl();
const formik = useFormik({
enableReinitialize: true,
initialValues: {
@@ -38,18 +38,18 @@ export default function JournalHeader({
const handleSubmitClick = useCallback(() => {
formik.submitForm();
}, [formik]);
return (
<FinancialStatementHeader>
<FinancialStatementDateRange formik={formik} />
<Row>
<Col sm={3}>
<Button
type="submit"
onClick={handleSubmitClick}
className={'button--submit-filter'}>
{ 'Run Report' }
<T id={'run_report'} />
</Button>
</Col>
</Row>

19
client/src/containers/FinancialStatements/Journal/JournalTable.js
View File

@@ -12,6 +12,7 @@ import {
} from 'store/financialStatement/financialStatements.selectors';
import withJournal from './withJournal';
import { FormattedMessage as T, useIntl } from 'react-intl';
function JournalSheetTable({
@@ -31,46 +32,48 @@ function JournalSheetTable({
const exceptRowTypes = (rowType, value, types) => {
return (types.indexOf(rowType) !== -1) ? '' : value;
};
const {formatMessage} =useIntl();
const columns = useMemo(() => [
{
Header: 'Date',
Header: formatMessage({id:'date'}),
accessor: r => rowTypeFilter(r.rowType, moment(r.date).format('YYYY/MM/DD'), ['first_entry']),
className: 'date',
width: 85,
},
{
Header: 'Transaction Type',
Header: formatMessage({id:'transaction_type'}),
accessor: r => rowTypeFilter(r.rowType, r.transaction_type, ['first_entry']),
className: "transaction_type",
width: 145,
},
{
Header: 'Num.',
Header: formatMessage({id:'num'}),
accessor: r => rowTypeFilter(r.rowType, r.reference_id, ['first_entry']),
className: 'reference_id',
width: 70,
},
{
Header: 'Description',
Header: formatMessage({id:'description'}),
accessor: 'note',
},
{
Header: 'Acc. Code',
Header: formatMessage({id:'acc_code'}),
accessor: 'account.code',
width: 120,
className: 'account_code',
},
{
Header: 'Account',
Header: formatMessage({id:'account'}),
accessor: 'account.name',
},
{
Header: 'Credit',
Header: formatMessage({id:'credit'}),
accessor: r => exceptRowTypes(
r.rowType, (<Money amount={r.credit} currency={'USD'} />), ['space_entry']),
},
{
Header: 'Debit',
Header: formatMessage({id:'debit'}),
accessor: r => exceptRowTypes(
r.rowType, (<Money amount={r.debit} currency={'USD'} />), ['space_entry']),
},

7
client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossActionsBar.js
View File

@@ -9,6 +9,7 @@ import Icon from 'components/Icon';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'
import classNames from 'classnames';
import FilterDropdown from 'components/FilterDropdown';
import { FormattedMessage as T, useIntl } from 'react-intl';
export default function ProfitLossActionsBar({
@@ -26,19 +27,19 @@ export default function ProfitLossActionsBar({
<Button
className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon='cog' />}
text='Customize Report'
text={<T id={'customize_report'}/>}
/>
<NavbarDivider />
<Button
className={Classes.MINIMAL}
icon={<Icon icon='file-export' />}
text='Print'
text={<T id={'print'}/>}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon='file-export' />}
text='Export'
text={<T id={'export'}/>}
/>
</NavbarGroup>
</DashboardActionsBar>

18
client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.js
View File

@@ -1,11 +1,11 @@
import React, {useCallback} from 'react';
import {Row, Col} from 'react-grid-system';
import React, { useCallback } from 'react';
import { Row, Col } from 'react-grid-system';
import {
Button,
} from '@blueprintjs/core';
import moment from 'moment';
import {useFormik} from 'formik';
import {useIntl} from 'react-intl';
import { useFormik } from 'formik';
import { FormattedMessage as T, useIntl } from 'react-intl';
import * as Yup from 'yup';
import FinancialStatementDateRange from 'containers/FinancialStatements/FinancialStatementDateRange';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
@@ -17,7 +17,7 @@ export default function JournalHeader({
pageFilter,
onSubmitFilter,
}) {
const intl = useIntl();
const { formatMessage } = useIntl();
const formik = useFormik({
enableReinitialize: true,
initialValues: {
@@ -26,8 +26,8 @@ export default function JournalHeader({
to_date: moment(pageFilter.to_date).toDate()
},
validationSchema: Yup.object().shape({
from_date: Yup.date().required(),
to_date: Yup.date().min(Yup.ref('from_date')).required(),
from_date: Yup.date().required().label(formatMessage({id:'from_date'})),
to_date: Yup.date().min(Yup.ref('from_date')).required().label(formatMessage({id:'to_date'})),
}),
onSubmit: (values, actions) => {
onSubmitFilter(values);
@@ -60,7 +60,7 @@ export default function JournalHeader({
<Col sm={3}>
<RadiosAccountingBasis
selectedValue={formik.values.basis}
selectedValue={formik.values.basis}
onChange={handleAccountingBasisChange} />
</Col>
@@ -69,7 +69,7 @@ export default function JournalHeader({
type="submit"
onClick={handleSubmitClick}
className={'button--submit-filter mt2'}>
{ 'Run Report' }
<T id={'run_report'} />
</Button>
</Col>
</Row>

10
client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js
View File

@@ -9,6 +9,7 @@ import {
getFinancialSheetIndexByQuery,
} from 'store/financialStatement/financialStatements.selectors';
import withProfitLossDetail from './withProfitLoss';
import { FormattedMessage as T, useIntl } from 'react-intl';
function ProfitLossSheetTable({
@@ -22,6 +23,9 @@ function ProfitLossSheetTable({
onFetchData,
companyName,
}) {
const {formatMessage} =useIntl();
const columns = useMemo(() => [
{
// Build our expander column
@@ -63,18 +67,18 @@ function ProfitLossSheetTable({
disableResizing: true,
},
{
Header: 'Account Name',
Header: formatMessage({id:'account_name'}),
accessor: 'name',
className: "name",
},
{
Header: 'Acc. Code',
Header: formatMessage({id:'acc_code'}),
accessor: 'code',
className: "account_code",
},
...(profitLossQuery.display_columns_type === 'total') ? [
{
Header: 'Total',
Header: formatMessage({id:'total'}),
Cell: ({ cell }) => {
const row = cell.row.original;
if (row.total) {

8
client/src/containers/FinancialStatements/RadiosAccountingBasis.js
View File

@@ -9,20 +9,20 @@ import {
export default function RadiosAccountingBasis(props) {
const { onChange, ...rest } = props;
const intl = useIntl();
const {formatMessage} = useIntl();
return (
<RadioGroup
inline={true}
label={intl.formatMessage({'id': 'accounting_basis'})}
label={formatMessage({'id': 'accounting_basis'})}
name="basis"
onChange={handleStringChange((value) => {
onChange && onChange(value);
})}
className={'radio-group---accounting-basis'}
{...rest}>
<Radio label="Cash" value="cash" />
<Radio label="Accural" value="accural" />
<Radio label={formatMessage({id:'cash'})} value="cash" />
<Radio label={formatMessage({id:'accrual'})} value="accural" />
</RadioGroup>
);
}

5
client/src/containers/FinancialStatements/SelectDisplayColumnsBy.js
View File

@@ -6,6 +6,7 @@ import {
FormGroup,
MenuItem,
} from '@blueprintjs/core';
import { FormattedMessage as T, useIntl } from 'react-intl';
export default function SelectsListColumnsBy(props) {
const { onItemSelect, formGroupProps, selectListProps } = props;
@@ -30,12 +31,12 @@ export default function SelectsListColumnsBy(props) {
}, [setItemSelected, onItemSelect]);
const buttonLabel = useMemo(() =>
itemSelected ? itemSelected.name : 'Select display columns by...',
itemSelected ? itemSelected.name : <T id={'select_display_columns_by'}/>,
[itemSelected]);
return (
<FormGroup
label={'Display report columns'}
label={<T id={'display_report_columns'}/>}
className="form-group-display-columns-by form-group--select-list bp3-fill"
inline={false}
{...formGroupProps}>

7
client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceActionsBar.js
View File

@@ -14,6 +14,7 @@ import Icon from 'components/Icon';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'
import classNames from 'classnames';
import FilterDropdown from 'components/FilterDropdown';
import { FormattedMessage as T, useIntl } from 'react-intl';
export default function GeneralLedgerActionsBar({
@@ -31,19 +32,19 @@ export default function GeneralLedgerActionsBar({
<Button
className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon='cog' />}
text='Customize Report'
text={<T id={'customize_report'}/>}
/>
<NavbarDivider />
<Button
className={Classes.MINIMAL}
icon={<Icon icon='file-export' />}
text='Print'
text={<T id={'print'}/>}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon='file-export' />}
text='Export'
text={<T id={'export'}/>}
/>
</NavbarGroup>
</DashboardActionsBar>

15
client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheet.js
View File

@@ -1,21 +1,23 @@
import React, { useEffect, useCallback, useState, useMemo } from 'react';
import TrialBalanceSheetHeader from "./TrialBalanceSheetHeader";
import TrialBalanceSheetTable from './TrialBalanceSheetTable';
import { useQuery } from 'react-query';
import moment from 'moment';
import {compose} from 'utils';
import DashboardPageContent from 'components/Dashboard/DashboardPageContent';
import { useIntl } from 'react-intl';
import TrialBalanceSheetHeader from "./TrialBalanceSheetHeader";
import TrialBalanceSheetTable from './TrialBalanceSheetTable';
import TrialBalanceActionsBar from './TrialBalanceActionsBar';
import DashboardInsider from 'components/Dashboard/DashboardInsider';
import { compose } from 'utils';
import DashboardPageContent from 'components/Dashboard/DashboardPageContent';
import withDashboard from 'containers/Dashboard/withDashboard';
import withTrialBalanceActions from './withTrialBalanceActions';
import withTrialBalance from './withTrialBalance';
import withSettings from 'containers/Settings/withSettings';
function TrialBalanceSheet({
// #withDashboard
changePageTitle,
@@ -36,6 +38,7 @@ function TrialBalanceSheet({
none_zero: false,
});
const [refetch, setRefetch] = useState(false);
const { formatMessage } = useIntl();
const fetchHook = useQuery(['trial-balance', filter],
(key, query) => fetchTrialBalanceSheet(query),
@@ -48,7 +51,7 @@ function TrialBalanceSheet({
// Change page title of the dashboard.
useEffect(() => {
changePageTitle('Trial Balance Sheet');
changePageTitle(formatMessage({id:'trial_balance_sheet'}));
}, []);
const handleFilterSubmit = useCallback((filter) => {

18
client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetHeader.js
View File

@@ -1,12 +1,10 @@
import React, {useState, useCallback, useMemo} from 'react';
import React, { useCallback } from 'react';
import * as Yup from 'yup';
import {Row, Col} from 'react-grid-system';
import {
Button,
} from "@blueprintjs/core";
import moment from 'moment';
import {useIntl} from 'react-intl';
import { Row, Col } from 'react-grid-system';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { useFormik } from 'formik';
import { Button } from "@blueprintjs/core";
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import FinancialStatementDateRange from 'containers/FinancialStatements/FinancialStatementDateRange';
@@ -16,7 +14,7 @@ export default function TrialBalanceSheetHeader({
pageFilter,
onSubmitFilter,
}) {
const intl = useIntl();
const { formatMessage } = useIntl();
const formik = useFormik({
enableReinitialize: true,
initialValues: {
@@ -25,8 +23,8 @@ export default function TrialBalanceSheetHeader({
to_date: moment(pageFilter.to_date).toDate()
},
validationSchema: Yup.object().shape({
from_date: Yup.date().required(),
to_date: Yup.date().min(Yup.ref('from_date')).required(),
from_date: Yup.date().required().label(formatMessage({id:'from_date'})),
to_date: Yup.date().min(Yup.ref('from_date')).required().label(formatMessage({id:'to_date'})),
}),
onSubmit: (values, { setSubmitting }) => {
onSubmitFilter(values);
@@ -49,7 +47,7 @@ export default function TrialBalanceSheetHeader({
onClick={handleSubmitClick}
disabled={formik.isSubmitting}
className={'button--submit-filter'}>
{ 'Run Report' }
<T id={'run_report'} />
</Button>
</Col>
</Row>

25
client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetTable.js
View File

@@ -1,5 +1,7 @@
import React, {useEffect, useState, useCallback, useMemo} from 'react';
import React, {useCallback, useMemo} from 'react';
import { connect } from 'react-redux';
import { useIntl } from 'react-intl';
import FinancialSheet from 'components/FinancialSheet';
import DataTable from 'components/DataTable';
import Money from 'components/Money';
@@ -24,6 +26,9 @@ function TrialBalanceSheetTable({
loading,
companyName,
}) {
const {formatMessage} =useIntl();
const columns = useMemo(() => [
{
// Build our expander column
@@ -35,8 +40,7 @@ function TrialBalanceSheetTable({
}) => (
<span {...getToggleAllRowsExpandedProps()} className="toggle">
{isAllRowsExpanded ?
(<span class="arrow-down" />) :
(<span class="arrow-right" />)
(<span class="arrow-down" />) : (<span class="arrow-right" />)
}
</span>
),
@@ -55,40 +59,37 @@ function TrialBalanceSheetTable({
className: 'toggle',
})}
>
{row.isExpanded ?
(<span class="arrow-down" />) :
(<span class="arrow-right" />)
}
{row.isExpanded ? (<span class="arrow-down" />) : (<span class="arrow-right" />) }
</span>
) : null,
width: 20,
disableResizing: true,
},
{
Header: 'Account Name',
Header: formatMessage({id:'account_name'}),
accessor: 'name',
className: "name",
},
{
Header: 'Code',
Header: formatMessage({id:'code'}),
accessor: 'code',
className: "code",
width: 120,
},
{
Header: 'Credit',
Header: formatMessage({id:'credit'}),
accessor: r => (<Money amount={r.credit} currency="USD" />),
className: 'credit',
width: 120,
},
{
Header: 'Debit',
Header: formatMessage({id:'debit'}),
accessor: r => (<Money amount={r.debit} currency="USD" />),
className: 'debit',
width: 120,
},
{
Header: 'Balance',
Header: formatMessage({id:'balance'}),
accessor: r => (<Money amount={r.balance} currency="USD" />),
className: 'balance',
width: 120,

26
client/src/containers/Items/ItemForm.js
View File

@@ -57,21 +57,21 @@ const ItemForm = ({
});
const ItemTypeDisplay = useMemo(() => [
{ value: null, label: 'Select Item Type' },
{ value: 'service', label: 'Service' },
{ value: 'inventory', label: 'Inventory' },
{ value: 'non-inventory', label: 'Non-Inventory' },
{ value: null, label: formatMessage({id:'select_item_type'}) },
{ value: 'service', label: formatMessage({id:'service'}) },
{ value: 'inventory', label: formatMessage({id:'inventory'}) },
{ value: 'non-inventory', label: formatMessage({id:'non_inventory'}) },
], []);
const validationSchema = Yup.object().shape({
active: Yup.boolean(),
name: Yup.string().required(),
type: Yup.string().trim().required(),
name: Yup.string().required().label(formatMessage({id:'item_name_'})),
type: Yup.string().trim().required().label(formatMessage({id:'item_type_'})),
sku: Yup.string().trim(),
cost_price: Yup.number(),
sell_price: Yup.number(),
cost_account_id: Yup.number().required(),
sell_account_id: Yup.number().required(),
cost_account_id: Yup.number().required().label(formatMessage({id:'cost_account_id'})),
sell_account_id: Yup.number().required().label(formatMessage({id:'sell_account_id'})),
inventory_account_id: Yup.number().when('type', {
is: (value) => value === 'inventory',
then: Yup.number().required(),
@@ -308,7 +308,7 @@ const ItemForm = ({
rightIcon='caret-down'
text={getSelectedAccountLabel(
'category_id',
'Select category'
formatMessage({id:'select_category'})
)}
/>
</Select>
@@ -399,7 +399,7 @@ const ItemForm = ({
rightIcon='caret-down'
text={getSelectedAccountLabel(
'sell_account_id',
'Select account'
formatMessage({id:'select_account'})
)}
/>
</Select>
@@ -462,7 +462,8 @@ const ItemForm = ({
rightIcon='caret-down'
text={getSelectedAccountLabel(
'cost_account_id',
'Select account'
formatMessage({id:'select_account'})
)}
/>
</Select>
@@ -508,7 +509,8 @@ const ItemForm = ({
rightIcon='caret-down'
text={getSelectedAccountLabel(
'inventory_account_id',
'Select account'
formatMessage({id:'select_account'})
)}
/>
</Select>

39
client/src/containers/Items/ItemsActionsBar.js
View File

@@ -38,23 +38,26 @@ const ItemsActionsBar = ({
const { path } = useRouteMatch();
const history = useHistory();
const [filterCount, setFilterCount] = useState(0);
const viewsMenuItems = itemsViews.map(view =>
(<MenuItem href={`${path}/${view.id}/custom_view`} text={view.name} />));
const { formatMessage } = useIntl();
const viewsMenuItems = itemsViews.map((view) => (
<MenuItem href={`${path}/${view.id}/custom_view`} text={view.name} />
));
const onClickNewItem = () => {
history.push('/dashboard/items/new');
history.push('/items/new');
};
const hasSelectedRows = useMemo(() => selectedRows.length > 0, [selectedRows]);
const hasSelectedRows = useMemo(() => selectedRows.length > 0, [
selectedRows,
]);
const filterDropdown = FilterDropdown({
fields: resourceFields,
onFilterChange: (filterConditions) => {
setFilterCount(filterConditions.length);
onFilterChanged && onFilterChanged(filterConditions);
}
},
});
const onClickNewCategory = useCallback(() => {
openDialog('item-form', {});
}, [openDialog]);
@@ -71,7 +74,7 @@ const ItemsActionsBar = ({
<Button
className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon='table' />}
text={<T id={'table_views'}/>}
text={<T id={'table_views'} />}
rightIcon={'caret-down'}
/>
</Popover>
@@ -81,14 +84,14 @@ const ItemsActionsBar = ({
<Button
className={Classes.MINIMAL}
icon={<Icon icon='plus' />}
text={<T id={'new_item'}/>}
text={<T id={'new_item'} />}
onClick={onClickNewItem}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon='plus' />}
text={<T id={'new_category'}/>}
text={<T id={'new_category'} />}
onClick={onClickNewCategory}
/>
@@ -99,7 +102,13 @@ const ItemsActionsBar = ({
>
<Button
className={classNames(Classes.MINIMAL, 'button--filter')}
text={filterCount <= 0 ? <T id={'filter'}/> : `${filterCount} filters applied`}
text={
filterCount <= 0 ? (
<T id={'filter'} />
) : (
`${filterCount} ${formatMessage({ id: 'filters_applied' })}`
)
}
icon={<Icon icon='filter' />}
/>
</Popover>
@@ -109,19 +118,19 @@ const ItemsActionsBar = ({
className={Classes.MINIMAL}
intent={Intent.DANGER}
icon={<Icon icon='trash' />}
text={<T id={'delete'}/>}
text={<T id={'delete'} />}
/>
</If>
<Button
className={Classes.MINIMAL}
icon={<Icon icon='file-import' />}
text={<T id={'import'}/>}
text={<T id={'import'} />}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon='file-export' />}
text={<T id={'export'}/>}
text={<T id={'export'} />}
/>
</NavbarGroup>
</DashboardActionsBar>
@@ -135,5 +144,5 @@ export default compose(
})),
withResourceDetail(({ resourceFields }) => ({
resourceFields,
})),
}))
)(ItemsActionsBar);

6
client/src/containers/Items/ItemsList.js
View File

@@ -50,7 +50,7 @@ function ItemsList({
const { formatMessage } = useIntl();
useEffect(() => {
changePageTitle('Items List');
changePageTitle(formatMessage({id:'items_list'}));
}, [changePageTitle]);
const fetchHook = useQuery('items-resource', () => {
@@ -135,8 +135,8 @@ function ItemsList({
<Route
exact={true}
path={[
'/dashboard/items/:custom_view_id/custom_view',
'/dashboard/items'
'/items/:custom_view_id/custom_view',
'/items'
]}>
<ItemsViewsTabs
onViewChanged={handleCustomViewChanged} />

7
client/src/containers/Items/ItemsViewsTabs.js
View File

@@ -20,6 +20,7 @@ import withDashboard from 'containers/Dashboard/withDashboard';
import withViewDetail from 'containers/Views/withViewDetails';
import withItems from 'containers/Items/withItems';
import { FormattedMessage as T, useIntl } from 'react-intl';
function ItemsViewsTabs({
// #withViewDetail
@@ -45,7 +46,7 @@ function ItemsViewsTabs({
const handleClickNewView = () => {
setTopbarEditView(null);
history.push('/dashboard/custom_views/items/new');
history.push('/custom_views/items/new');
};
const handleViewLinkClick = () => {
@@ -73,7 +74,7 @@ function ItemsViewsTabs({
}, [customViewId]);
const tabs = itemsViews.map(view => {
const baseUrl = '/dashboard/items';
const baseUrl = '/items';
const link = (
<Link to={`${baseUrl}/${view.id}/custom_view`} onClick={handleViewLinkClick}>
{view.name}
@@ -93,7 +94,7 @@ function ItemsViewsTabs({
>
<Tab
id='all'
title={<Link to={`/dashboard/items`}>All</Link>}
title={<Link to={`/items`}><T id={'all'}/></Link>}
onClick={handleViewLinkClick} />
{tabs}

9
client/src/containers/Preferences/Accounts/Accounts.js
View File

@@ -2,16 +2,17 @@ import React from 'react';
import {Tabs, Tab} from '@blueprintjs/core';
import { useHistory } from 'react-router-dom';
import PreferencesSubContent from 'components/Preferences/PreferencesSubContent';
import { FormattedMessage as T, useIntl } from 'react-intl';
export default function AccountsPreferences() {
const history = useHistory();
const onChangeTabs = (currentTabId) => {
switch(currentTabId) {
default:
history.push('/dashboard/preferences/accounts/general');
history.push('/preferences/accounts/general');
break;
case 'custom_fields':
history.push('/dashboard/preferences/accounts/custom_fields');
history.push('/preferences/accounts/custom_fields');
break;
}
};
@@ -21,8 +22,8 @@ export default function AccountsPreferences() {
animate={true}
large={true}
onChange={onChangeTabs}>
<Tab id="general" title="General" />
<Tab id="custom_fields" title="Custom Fields" />
<Tab id="general" title={<T id={'general'}/>} />
<Tab id="custom_fields" title={<T id={'custom_fields'}/>} />
</Tabs>
<PreferencesSubContent preferenceTab="accounts" />

11
client/src/containers/Preferences/Accounts/AccountsCustomFields.js
View File

@@ -18,6 +18,7 @@ import {connect} from 'react-redux';
import {
fetchResourceFields,
} from 'store/customFields/customFields.actions';
import { FormattedMessage as T, useIntl } from 'react-intl';
function AccountsCustomFields({ fetchResourceFields, fields }) {
const fetchHook = useAsync(async () => {
@@ -30,13 +31,13 @@ function AccountsCustomFields({ fetchResourceFields, fields }) {
const actionMenuList = (column) => (
<Menu>
<MenuItem text="View Details" />
<MenuItem text={<T id={'view_details'}/>} />
<MenuDivider />
<MenuItem text="Edit Account" />
<MenuItem text="New Account" />
<MenuItem text={<T id={'edit_account'}/>} />
<MenuItem text={<T id={'new_account'}/>} />
<MenuDivider />
<MenuItem text="Inactivate Account" />
<MenuItem text="Delete Account" />
<MenuItem text={<T id={'inactivate_account'}/>} />
<MenuItem text={<T id={'delete_account'}/>} />
</Menu>
);

17
client/src/containers/Preferences/Currencies/CurrenciesList.js
View File

@@ -21,6 +21,7 @@ import AppToaster from 'components/AppToaster';
import withDashboard from 'connectors/Dashboard.connector';
import withCurrencies from 'containers/Currencies/withCurrencies';
import withCurrenciesActions from 'containers/Currencies/withCurrenciesActions';
import { FormattedMessage as T, useIntl } from 'react-intl';
function CurrenciesList({
@@ -36,7 +37,7 @@ function CurrenciesList({
onFetchData,
}) {
const [deleteCurrencyState, setDeleteCurrencyState] = useState(false);
const { formatMessage } = useIntl()
const fetchCurrencies = useQuery(['currencies-table'],
() => requestFetchCurrencies());
@@ -60,7 +61,7 @@ function CurrenciesList({
(response) => {
setDeleteCurrencyState(false);
AppToaster.show({
message: 'the_Currency_has_been_deleted',
message: formatMessage({id:'the_currency_has_been_successfully_deleted'}),
});
}
);
@@ -69,11 +70,11 @@ function CurrenciesList({
const actionMenuList = useCallback((currency) => (
<Menu>
<MenuItem
text='Edit Currency'
text={<T id={'edit_currency'} />}
onClick={() => handleEditCurrency(currency)} />
<MenuItem
text='Delete Currency'
text={<T id={'delete_currency'} />}
onClick={() => onDeleteCurrency(currency)}
/>
</Menu>
@@ -81,12 +82,12 @@ function CurrenciesList({
const columns = useMemo(() => [
{
Header: 'Currency Name',
Header: formatMessage({id:'currency_name'}),
accessor: 'currency_name',
width: 100,
},
{
Header: 'Currency Code',
Header: formatMessage({id:'currency_code'}),
accessor: 'currency_code',
className: 'currency_code',
width: 100,
@@ -125,8 +126,8 @@ function CurrenciesList({
/>
<Alert
cancelButtonText='Cancel'
confirmButtonText='Move to Trash'
cancelButtonText={<T id={'cancel'}/>}
confirmButtonText={<T id={'move_to_trash'}/>}
icon='trash'
intent={Intent.DANGER}
isOpen={deleteCurrencyState}

40
client/src/containers/Preferences/General/General.js
View File

@@ -12,7 +12,6 @@ import {
import classNames from 'classnames';
import { TimezonePicker } from '@blueprintjs/timezone';
import { Select } from '@blueprintjs/select';
import { useIntl } from 'react-intl';
import { useQuery } from 'react-query';
import { compose, optionsMapToArray } from 'utils';
@@ -22,6 +21,7 @@ import AppToaster from 'components/AppToaster';
import withSettings from 'containers/Settings/withSettings';
import withSettingsActions from 'containers/Settings/withSettingsActions';
import { FormattedMessage as T, useIntl } from 'react-intl';
function GeneralPreferences({
@@ -32,7 +32,7 @@ function GeneralPreferences({
requestSubmitOptions,
requestFetchOptions,
}) {
const intl = useIntl();
const {formatMessage} = useIntl();
const [selectedItems, setSelectedItems] = useState({});
const [timeZone, setTimeZone] = useState('');
@@ -65,16 +65,16 @@ function GeneralPreferences({
];
const validationSchema = Yup.object().shape({
name: Yup.string().required(intl.formatMessage({ id: 'required' })),
industry: Yup.string().required(intl.formatMessage({ id: 'required' })),
location: Yup.string().required(intl.formatMessage({ id: 'required' })),
name: Yup.string().required().label(formatMessage({id:'organization_name_'})),
industry: Yup.string().required().label(formatMessage({id:'organization_industry_'})),
location: Yup.string().required().label(formatMessage({id:'location'})),
base_currency: Yup.string().required(
intl.formatMessage({ id: 'required' })
formatMessage({ id: 'required' })
),
fiscal_year: Yup.string().required(intl.formatMessage({ id: 'required' })),
language: Yup.string().required(intl.formatMessage({ id: 'required' })),
// time_zone: Yup.object().required(intl.formatMessage({ id: 'required' })),
date_format: Yup.date().required(intl.formatMessage({ id: 'required' })),
fiscal_year: Yup.string().required().label(formatMessage({id:'base_currency_'})),
language: Yup.string().required().label(formatMessage({id:'language'})),
// time_zone: Yup.object().required()..label(formatMessage({id:''})),
date_format: Yup.date().required().label(formatMessage({id:'date_format_'})),
});
const {
@@ -180,7 +180,7 @@ function GeneralPreferences({
<div className='preferences__inside-content--general'>
<form onSubmit={handleSubmit}>
<FormGroup
label={'Organization Name'}
label={<T id={'organization_name'}/>}
inline={true}
intent={(errors.name && touched.name) && Intent.DANGER}
helperText={<ErrorMessage name='name' {...{errors, touched}} />}
@@ -193,7 +193,7 @@ function GeneralPreferences({
</FormGroup>
<FormGroup
label={'Organization Industry'}
label={<T id={'organization_industry'}/>}
inline={true}
intent={(errors.industry && touched.industry) && Intent.DANGER}
helperText={<ErrorMessage name='industry' {...{errors, touched}} />}
@@ -206,7 +206,7 @@ function GeneralPreferences({
</FormGroup>
<FormGroup
label={'Business Location'}
label={<T id={'business_location'}/>}
className={classNames(
'form-group--business-location',
'form-group--select-list',
@@ -235,7 +235,7 @@ function GeneralPreferences({
</FormGroup>
<FormGroup
label={'Base Currency'}
label={<T id={'base_currency'}/>}
className={classNames(
'form-group--base-currency',
'form-group--select-list',
@@ -264,7 +264,7 @@ function GeneralPreferences({
</FormGroup>
<FormGroup
label={'Fiscal Year'}
label={<T id={'fiscal_year'}/>}
className={classNames(
'form-group--fiscal-year',
'form-group--select-list',
@@ -293,7 +293,7 @@ function GeneralPreferences({
</FormGroup>
<FormGroup
label={'Language'}
label={<T id={'language'}/>}
inline={true}
className={classNames(
'form-group--language',
@@ -320,7 +320,7 @@ function GeneralPreferences({
</Select>
</FormGroup>
<FormGroup
label={'Time Zone'}
label={<T id={'time_zone'}/>}
inline={true}
className={classNames(
'form-group--time-zone',
@@ -338,7 +338,7 @@ function GeneralPreferences({
/>
</FormGroup>
<FormGroup
label={'Date Format'}
label={<T id={'date_format'}/>}
inline={true}
className={classNames(
'form-group--language',
@@ -371,9 +371,9 @@ function GeneralPreferences({
intent={Intent.PRIMARY}
type='submit'
>
{'Save'}
<T id={'save'}/>
</Button>
<Button onClick={'handleClose'}>Close</Button>
<Button onClick={'handleClose'}><T id={'close'}/></Button>
</div>
</form>
</div>

41
client/src/containers/Preferences/Users/UsersList.js
View File

@@ -25,6 +25,7 @@ import withUsers from 'containers/Users/withUsers';
import withUsersActions from 'containers/Users/withUsersActions';
import { compose } from 'utils';
import { FormattedMessage as T, useIntl } from 'react-intl';
function UsersListPreferences({
@@ -34,7 +35,7 @@ function UsersListPreferences({
// #withUsers
usersList,
// #withUsersActions
requestDeleteUser,
requestInactiveUser,
@@ -45,14 +46,14 @@ function UsersListPreferences({
}) {
const [deleteUserState, setDeleteUserState] = useState(false);
const [inactiveUserState, setInactiveUserState] = useState(false);
const fetchUsers = useQuery('users-table',
const { formatMessage } = useIntl()
const fetchUsers = useQuery('users-table',
() => requestFetchUsers());
const onInactiveUser = (user) => {
setInactiveUserState(user);
};
// Handle cancel inactive user alert
const handleCancelInactiveUser = useCallback(() => {
setInactiveUserState(false);
@@ -62,7 +63,7 @@ function UsersListPreferences({
const handleConfirmUserActive = useCallback(() => {
requestInactiveUser(inactiveUserState.id).then(() => {
setInactiveUserState(false);
AppToaster.show({ message: 'the_user_has_been_inactivated' });
AppToaster.show({ message: formatMessage({id:'the_user_has_been_successfully_inactivated'}) });
});
}, [inactiveUserState, requestInactiveUser, requestFetchUsers]);
@@ -99,7 +100,7 @@ function UsersListPreferences({
requestDeleteUser(deleteUserState.id).then((response) => {
setDeleteUserState(false);
AppToaster.show({
message: 'the_user_has_been_deleted',
message: formatMessage({id:'the_user_has_been_successfully_deleted'}),
});
});
};
@@ -107,11 +108,11 @@ function UsersListPreferences({
const actionMenuList = useCallback(
(user) => (
<Menu>
<MenuItem text='Edit User' onClick={onEditUser(user)} />
<MenuItem text={<T id={'edit_user'} />} onClick={onEditUser(user)} />
<MenuDivider />
<MenuItem text='Edit Invite ' onClick={onEditInviteUser(user)} />
<MenuItem text='Inactivate User' onClick={() => onInactiveUser(user)} />
<MenuItem text='Delete User' onClick={() => onDeleteUser(user)} />
<MenuItem text={<T id={'edit_invite'} />} onClick={onEditInviteUser(user)} />
<MenuItem text={<T id={'inactivate_user'} />} onClick={() => onInactiveUser(user)} />
<MenuItem text={<T id={'delete_user'} />} onClick={() => onDeleteUser(user)} />
</Menu>
),
[]
@@ -120,19 +121,19 @@ function UsersListPreferences({
const columns = useMemo(() => [
{
id: 'full_name',
Header: 'Full Name',
accessor: 'full_name',
Header:formatMessage({id:'full_name'}),
accessor: 'full_name',
width: 170,
},
{
id: 'email',
Header: 'Email',
Header: formatMessage({id:'email'}),
accessor: 'email',
width: 150,
},
{
id: 'phone_number',
Header: 'Phone Number',
Header: formatMessage({id:'phone_number'}),
accessor: 'phone_number',
width: 150,
},
@@ -140,8 +141,8 @@ function UsersListPreferences({
id: 'active',
Header: 'Status',
accessor: (user) => user.active ?
<Tag intent={Intent.SUCCESS} minimal={true}>Active</Tag> :
<Tag intent={Intent.WARNING} minimal={true}>Inactivate</Tag>,
<Tag intent={Intent.SUCCESS} minimal={true}><T id={'activate'} /></Tag> :
<Tag intent={Intent.WARNING} minimal={true}><T id={'inactivate'} /></Tag>,
width: 50,
className: 'status',
},
@@ -177,8 +178,8 @@ function UsersListPreferences({
/>
<Alert
cancelButtonText='Cancel'
confirmButtonText='Move to Trash'
cancelButtonText={<T id={'cancel'}/>}
confirmButtonText={<T id={'move_to_trash'}/>}
icon='trash'
intent={Intent.DANGER}
isOpen={deleteUserState}
@@ -192,8 +193,8 @@ function UsersListPreferences({
</Alert>
<Alert
cancelButtonText='Cancel'
confirmButtonText='Inactivate'
cancelButtonText={<T id={'cancel'}/>}
confirmButtonText={<T id={'inactivate'}/>}
icon='trash'
intent={Intent.WARNING}
isOpen={inactiveUserState}