diff --git a/client/src/components/Authentication.js b/client/src/components/Authentication.js index 3c7ed95c5..84c534c8d 100644 --- a/client/src/components/Authentication.js +++ b/client/src/components/Authentication.js @@ -8,7 +8,7 @@ export default function AuthenticationWrapper({ isAuthenticated = false, ...rest }) { - const to = { pathname: '/dashboard/homepage' }; + const to = { pathname: '/homepage' }; return ( diff --git a/client/src/components/Dashboard/Dashboard.js b/client/src/components/Dashboard/Dashboard.js index d4cea68a7..e2d5f189a 100644 --- a/client/src/components/Dashboard/Dashboard.js +++ b/client/src/components/Dashboard/Dashboard.js @@ -11,13 +11,13 @@ export default function Dashboard() { return (
- + - + diff --git a/client/src/components/Dashboard/DashboardBreadcrumbs.js b/client/src/components/Dashboard/DashboardBreadcrumbs.js index 82b6faa08..a6d0905b0 100644 --- a/client/src/components/Dashboard/DashboardBreadcrumbs.js +++ b/client/src/components/Dashboard/DashboardBreadcrumbs.js @@ -3,38 +3,33 @@ import { CollapsibleList, MenuItem, Classes, - Boundary + Boundary, } from '@blueprintjs/core'; import classNames from 'classnames'; +import withBreadcrumbs from 'react-router-breadcrumbs-hoc'; +import routes from 'routes/dashboard'; +import { useHistory } from 'react-router-dom'; -export default function DashboardBreadcrumbs() { - function renderBreadcrumb(props) { - if (props.href != null) { - return {props.text}; - } else { - return ( - - {props.text} - - ); - } - } - return ( +function DashboardBreadcrumbs( {breadcrumbs }){ + const history = useHistory(); + + return( } - visibleItemRenderer={renderBreadcrumb} - collapseFrom={Boundary.START} - visibleItemCount={0} - > - - - - - - + className={Classes.BREADCRUMBS} + dropdownTarget={} + collapseFrom={Boundary.START} + visibleItemCount={0}> + { + breadcrumbs.map(({ breadcrumb,match })=>{ + return ( history.push(match.url) } />) + }) + } - ); + ) } + +export default withBreadcrumbs(routes)(DashboardBreadcrumbs) diff --git a/client/src/components/Dashboard/DashboardContentRoute.js b/client/src/components/Dashboard/DashboardContentRoute.js index be45197a9..ad7291ed2 100644 --- a/client/src/components/Dashboard/DashboardContentRoute.js +++ b/client/src/components/Dashboard/DashboardContentRoute.js @@ -5,7 +5,7 @@ import routes from 'routes/dashboard' export default function DashboardContentRoute() { return ( - + { routes.map((route, index) => ( { - history.push(`/dashboard/custom_views/${editViewId}/edit`); + history.push(`/custom_views/${editViewId}/edit`); }; const maybleRenderPageSubtitle = pageSubtitle &&

{pageSubtitle}

; @@ -48,7 +48,7 @@ function DashboardTopbar({ role='img' focusable='false' > - Menu + <T id={'menu'}/> ( - - - - + } /> + } /> + } shouldDismissPopover={false} /> + } disabled={true} /> - + } onClick={onClickLogout} /> ), [onClickLogout]); diff --git a/client/src/components/Expenses/ExpenseForm.js b/client/src/components/Expenses/ExpenseForm.js index e9fd77bf7..a902ac1b7 100644 --- a/client/src/components/Expenses/ExpenseForm.js +++ b/client/src/components/Expenses/ExpenseForm.js @@ -32,14 +32,14 @@ export default function ExpenseForm({ selectedPaymentAccount: null }); const validationSchema = Yup.object().shape({ - date: Yup.date().required(), - description: Yup.string().trim(), - expense_account_id: Yup.number().required(), - payment_account_id: Yup.number().required(), - amount: Yup.number().required(), - currency_code: Yup.string().required(), - publish: Yup.boolean(), - exchange_rate: Yup.number() + date: Yup.date().required().label(formatMessage({id:'date'})), + description: Yup.string().trim().label(formatMessage({id:'description'})), + expense_account_id: Yup.number().required().label(formatMessage({id:'expense_account_id'})), + payment_account_id: Yup.number().required().label(formatMessage({id:'payment_account_id'})), + amount: Yup.number().required().label(formatMessage({id:'amount'})), + currency_code: Yup.string().required().label(formatMessage({id:'currency_code_'})), + publish: Yup.boolean().label(formatMessage({id:'publish'})), + exchange_rate: Yup.number().label(formatMessage({id:'exchange_rate_'})) }); const formik = useFormik({ @@ -52,7 +52,7 @@ export default function ExpenseForm({ submitExpense(values) .then(response => { AppToaster.show({ - message: 'the_expense_has_been_submit' + message: formatMessage({id:'the_expense_has_been_successfully_created'}) }); }) .catch(error => {}); @@ -108,11 +108,11 @@ export default function ExpenseForm({ const paymentAccountLabel = state.selectedPaymentAccount ? state.selectedPaymentAccount.name - : 'Select Payment Account'; + : ; const expenseAccountLabel = state.selectedExpenseAccount ? state.selectedExpenseAccount.name - : 'Select Expense Account'; + : ; const handleClose = () => {}; diff --git a/client/src/components/Expenses/ExpensesActionsBar.js b/client/src/components/Expenses/ExpensesActionsBar.js index 79d02e13a..9386dcfd7 100644 --- a/client/src/components/Expenses/ExpensesActionsBar.js +++ b/client/src/components/Expenses/ExpensesActionsBar.js @@ -50,7 +50,7 @@ export default function ExpensesActionsBar({ } - href='/dashboard/expenses/new' + href='/expenses/new' text={} onClick={onClickNewAccount} /> diff --git a/client/src/components/Expenses/ExpensesViewsTabs.js b/client/src/components/Expenses/ExpensesViewsTabs.js index 400517d65..40e7ac342 100644 --- a/client/src/components/Expenses/ExpensesViewsTabs.js +++ b/client/src/components/Expenses/ExpensesViewsTabs.js @@ -17,7 +17,7 @@ function AccountsViewsTabs({ views }) { const {path} = useRouteMatch(); const handleClickNewView = () => { - history.push('/dashboard/custom_views/new'); + history.push('/custom_views/new'); }; const tabs = views.map((view) => { diff --git a/client/src/components/FilterDropdown.js b/client/src/components/FilterDropdown.js index d04ebab3e..30397f06a 100644 --- a/client/src/components/FilterDropdown.js +++ b/client/src/components/FilterDropdown.js @@ -19,9 +19,11 @@ export default function FilterDropdown({ fields, onFilterChange, }) { + const {formatMessage} =useIntl(); + const conditionalsItems = useMemo(() => [ - { value: 'and', label: 'AND' }, - { value: 'or', label: 'OR' }, + { value: 'and', label:formatMessage({id:'and'}) }, + { value: 'or', label: formatMessage({id:'or'}) }, ], []); const resourceFields = useMemo(() => [ @@ -29,11 +31,11 @@ export default function FilterDropdown({ ], [fields]); const compatatorsItems = useMemo(() => [ - {value: '', label: 'Select a compatator'}, - {value: 'equals', label: 'Equals'}, - {value: 'not_equal', label: 'Not Equal'}, - {value: 'contain', label: 'Contain'}, - {value: 'not_contain', label: 'Not Contain'}, + {value: '', label:formatMessage({id:'select_a_comparator'})}, + {value: 'equals', label: formatMessage({id:'equals'})}, + {value: 'not_equal', label: formatMessage({id:'not_equal'})}, + {value: 'contain', label: formatMessage({id:'contain'})}, + {value: 'not_contain', label: formatMessage({id:'not_contain'})}, ], []); const defaultFilterCondition = useMemo(() => ({ diff --git a/client/src/components/FinancialSheet.js b/client/src/components/FinancialSheet.js index 11fa5b958..aed91dbba 100644 --- a/client/src/components/FinancialSheet.js +++ b/client/src/components/FinancialSheet.js @@ -2,6 +2,7 @@ import React, { useMemo, useCallback } from 'react'; import moment from 'moment'; import classnames from 'classnames'; import LoadingIndicator from 'components/LoadingIndicator'; +import { FormattedMessage as T, useIntl } from 'react-intl'; export default function FinancialSheet({ companyName, @@ -18,42 +19,44 @@ export default function FinancialSheet({ const formattedFromDate = moment(fromDate).format('DD MMMM YYYY'); const formattedToDate = moment(toDate).format('DD MMMM YYYY'); const nameModifer = name ? `financial-sheet--${name}` : ''; - - const methodsLabels = useMemo(() => ({ - 'cash': 'Cash', - 'accural': 'Accural', - }), []); + const { formatMessage } = useIntl(); + const methodsLabels = useMemo( + () => ({ + cash: formatMessage({id:'cash'}), + accrual: formatMessage({id:'accrual'}), + }), + [] + ); const getBasisLabel = useCallback((b) => methodsLabels[b], [methodsLabels]); - const basisLabel = useMemo(() => getBasisLabel(basis), [getBasisLabel, basis]); + const basisLabel = useMemo(() => getBasisLabel(basis), [ + getBasisLabel, + basis, + ]); return (
-
-

- { companyName } -

-
{ sheetType }
-
- From { formattedFromDate } | To { formattedToDate } +
+

{companyName}

+
{sheetType}
+
+ {formattedFromDate} | {formattedToDate}
-
- { children } -
-
- { accountingBasis } -
+
{children}
+
{accountingBasis}
- { (basisLabel) && ( -
- Accounting Basis: { basisLabel } + {basisLabel && ( +
+ {basisLabel}
- )} + )}
); -} \ No newline at end of file +} diff --git a/client/src/components/Preferences/PreferencesContentRoute.js b/client/src/components/Preferences/PreferencesContentRoute.js index fcf0fa0aa..7981fda09 100644 --- a/client/src/components/Preferences/PreferencesContentRoute.js +++ b/client/src/components/Preferences/PreferencesContentRoute.js @@ -4,11 +4,11 @@ import preferencesRoutes from 'routes/preferences' export default function DashboardContentRoute() { - const defaultTab = '/dashboard/preferences/general'; + const defaultTab = '/preferences/general'; return ( - - + + { preferencesRoutes.map((route, index) => ( diff --git a/client/src/components/Preferences/PreferencesTopbar.js b/client/src/components/Preferences/PreferencesTopbar.js index 605d5577f..212a69324 100644 --- a/client/src/components/Preferences/PreferencesTopbar.js +++ b/client/src/components/Preferences/PreferencesTopbar.js @@ -11,16 +11,16 @@ export default function PreferencesTopbar() {

Accounts

- + diff --git a/client/src/components/PrivateRoute.js b/client/src/components/PrivateRoute.js index 6793eee9d..cfbf55815 100644 --- a/client/src/components/PrivateRoute.js +++ b/client/src/components/PrivateRoute.js @@ -17,7 +17,7 @@ function PrivateRoute({ isAuthenticated ? () : ( diff --git a/client/src/config/preferencesMenu.js b/client/src/config/preferencesMenu.js index 5bad60ee7..f65e307bd 100644 --- a/client/src/config/preferencesMenu.js +++ b/client/src/config/preferencesMenu.js @@ -1,26 +1,29 @@ +import React from 'react' +import { FormattedMessage as T, useIntl } from 'react-intl'; + export default [ { - text: 'General', + text: , disabled: false, - href: '/dashboard/preferences/general', + href: '/preferences/general', }, { - text: 'Users', - href: '/dashboard/preferences/users', + text: , + href: '/preferences/users', }, { - text: 'Currencies', + text: , - href: '/dashboard/preferences/currencies', + href: '/preferences/currencies', }, { - text: 'Accountant', + text: , disabled: false, - href: '/dashboard/preferences/accountant', + href: '/preferences/accountant', }, { - text: 'Accounts', + text: , disabled: false, - href: '/dashboard/preferences/accounts', + href: '/preferences/accounts', }, ]; diff --git a/client/src/config/sidebarMenu.js b/client/src/config/sidebarMenu.js index 8798155f2..f93c29cb1 100644 --- a/client/src/config/sidebarMenu.js +++ b/client/src/config/sidebarMenu.js @@ -1,3 +1,5 @@ +import React from 'react' +import { FormattedMessage as T, useIntl } from 'react-intl'; export default [ { @@ -6,9 +8,9 @@ export default [ { icon: 'homepage', iconSize: 20, - text: 'Homepage', + text: , disabled: false, - href: '/dashboard/homepage', + href: '/homepage', }, { divider: true, @@ -16,19 +18,19 @@ export default [ { icon: 'homepage', iconSize: 20, - text: 'Items', + text: , children: [ { - text: 'Items List', - href: '/dashboard/items', + text: , + href: '/items', }, { - text: 'New Item', - href: '/dashboard/items/new', + text: , + href: '/items/new', }, { - text: 'Category List', - href: '/dashboard/items/categories', + text: , + href: '/items/categories', }, ], }, @@ -38,42 +40,42 @@ export default [ { icon: 'balance-scale', iconSize: 20, - text: 'Financial', + text: , children: [ { - text: 'Accounts Chart', - href: '/dashboard/accounts', + text: , + href: '/accounts', }, { - text: 'Manual Journal', - href: '/dashboard/accounting/manual-journals', + text: , + href: '/manual-journals', }, { - text: 'Make Journal', - href: '/dashboard/accounting/make-journal-entry', + text: , + href: '/make-journal-entry', }, { - text: 'Exchange Rate', - href: '/dashboard/ExchangeRates', + text: , + href: '/ExchangeRates', }, ], }, { icon: 'university', iconSize: 20, - text: 'Banking', + text: , children: [], }, { icon: 'shopping-cart', iconSize: 20, - text: 'Sales', + text: , children: [], }, { icon: 'balance-scale', iconSize: 20, - text: 'Purchases', + text: , children: [ { icon: 'cut', @@ -86,42 +88,42 @@ export default [ { icon: 'analytics', iconSize: 18, - text: 'Financial Reports', + text: , children: [ { - text: 'Balance Sheet', - href: '/dashboard/accounting/balance-sheet', + text: , + href: '/balance-sheet', }, { - text: 'Trial Balance Sheet', - href: '/dashboard/accounting/trial-balance-sheet', + text: , + href: '/trial-balance-sheet', }, { - text: 'Journal', - href: '/dashboard/accounting/journal-sheet', + text: , + href: '/journal-sheet', }, { - text: 'General Ledger', - href: '/dashboard/accounting/general-ledger', + text: , + href: '/general-ledger', }, { - text: 'Profit Loss Sheet', - href: '/dashboard/accounting/profit-loss-sheet', + text: , + href: '/profit-loss-sheet', }, ], }, { - text: 'Expenses', + text: , icon: 'receipt', iconSize: 18, children: [ { - text: 'Expenses List', - href: '/dashboard/expenses', + text: , + href: '/expenses', }, { - text: 'New Expenses', - href: '/dashboard/expenses/new', + text: , + href: '/expenses/new', }, ], }, @@ -129,11 +131,11 @@ export default [ divider: true, }, { - text: 'Preferences', - href: '/dashboard/preferences', + text: , + href: '/preferences', }, { - text: 'Auditing System', - href: '/dashboard/auditing/list', + text: , + href: '/auditing/list', }, ]; diff --git a/client/src/containers/Accounting/MakeJournalEntriesForm.js b/client/src/containers/Accounting/MakeJournalEntriesForm.js index 2538e460b..4f72313ce 100644 --- a/client/src/containers/Accounting/MakeJournalEntriesForm.js +++ b/client/src/containers/Accounting/MakeJournalEntriesForm.js @@ -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; diff --git a/client/src/containers/Accounting/MakeJournalEntriesPage.js b/client/src/containers/Accounting/MakeJournalEntriesPage.js index 81edda382..1a7c93085 100644 --- a/client/src/containers/Accounting/MakeJournalEntriesPage.js +++ b/client/src/containers/Accounting/MakeJournalEntriesPage.js @@ -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 ( diff --git a/client/src/containers/Accounting/ManualJournalActionsBar.js b/client/src/containers/Accounting/ManualJournalActionsBar.js index fc12e0650..8d052611f 100644 --- a/client/src/containers/Accounting/ManualJournalActionsBar.js +++ b/client/src/containers/Accounting/ManualJournalActionsBar.js @@ -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({ diff --git a/client/src/containers/Accounting/ManualJournalsList.js b/client/src/containers/Accounting/ManualJournalsList.js index 5d5de9eae..36ec25621 100644 --- a/client/src/containers/Accounting/ManualJournalsList.js +++ b/client/src/containers/Accounting/ManualJournalsList.js @@ -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({ diff --git a/client/src/containers/Accounting/ManualJournalsViewTabs.js b/client/src/containers/Accounting/ManualJournalsViewTabs.js index a3bd8c3bc..fe4042945 100644 --- a/client/src/containers/Accounting/ManualJournalsViewTabs.js +++ b/client/src/containers/Accounting/ManualJournalsViewTabs.js @@ -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 = ( { 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) => { diff --git a/client/src/containers/Accounts/AccountsChart.js b/client/src/containers/Accounts/AccountsChart.js index bf69d8cbb..0b7a368c2 100644 --- a/client/src/containers/Accounts/AccountsChart.js +++ b/client/src/containers/Accounts/AccountsChart.js @@ -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(() => { @@ -373,8 +373,8 @@ const handleConfirmBulkActivate = useCallback(() => { } + confirmButtonText={`${formatMessage({id:'delete'})} (${selectedRowsCount})`} icon="trash" intent={Intent.DANGER} isOpen={bulkDelete} diff --git a/client/src/containers/Accounts/AccountsDataTable.js b/client/src/containers/Accounts/AccountsDataTable.js index 915117d83..7ff42622e 100644 --- a/client/src/containers/Accounts/AccountsDataTable.js +++ b/client/src/containers/Accounts/AccountsDataTable.js @@ -72,12 +72,12 @@ function AccountsDataTable({ } onClick={() => onInactiveAccount(account)} /> } onClick={() => onActivateAccount(account)} /> { 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 = ( All} + title={} onClick={handleViewLinkClick} /> { tabs } diff --git a/client/src/containers/Authentication/InviteAccept.js b/client/src/containers/Authentication/InviteAccept.js index 753836aeb..cb746408a 100644 --- a/client/src/containers/Authentication/InviteAccept.js +++ b/client/src/containers/Authentication/InviteAccept.js @@ -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 }) {

- {inviteValue.organization_name} Organization. + {inviteValue.organization_name}

diff --git a/client/src/containers/Authentication/Login.js b/client/src/containers/Authentication/Login.js index bc6f1925b..fe6b47ce8 100644 --- a/client/src/containers/Authentication/Login.js +++ b/client/src/containers/Authentication/Login.js @@ -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({ } intent={(errors.crediential && touched.crediential) && Intent.DANGER} - helperText={} + helperText={} className={'form-group--crediential'} > - + } labelInfo={passwordRevealerTmp} intent={(errors.password && touched.password) && Intent.DANGER} - helperText={} - className={'form-group--password has-password-revealer'} + helperText={} + className={'form-group--password has-password-revealer'} > - +
- +
@@ -155,7 +158,7 @@ function Login({
- +
diff --git a/client/src/containers/Authentication/Register.js b/client/src/containers/Authentication/Register.js index fc7d9233c..3c89112c6 100644 --- a/client/src/containers/Authentication/Register.js +++ b/client/src/containers/Authentication/Register.js @@ -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( diff --git a/client/src/containers/Authentication/ResetPassword.js b/client/src/containers/Authentication/ResetPassword.js index 43d5d3f75..4a5d6ee4a 100644 --- a/client/src/containers/Authentication/ResetPassword.js +++ b/client/src/containers/Authentication/ResetPassword.js @@ -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( diff --git a/client/src/containers/Authentication/SendResetPassword.js b/client/src/containers/Authentication/SendResetPassword.js index ee85ed052..e551734b0 100644 --- a/client/src/containers/Authentication/SendResetPassword.js +++ b/client/src/containers/Authentication/SendResetPassword.js @@ -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, }); } diff --git a/client/src/containers/Dialogs/AccountFormDialog.js b/client/src/containers/Dialogs/AccountFormDialog.js index 1ed18e91f..e358208e1 100644 --- a/client/src/containers/Dialogs/AccountFormDialog.js +++ b/client/src/containers/Dialogs/AccountFormDialog.js @@ -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' + : } /> diff --git a/client/src/containers/Dialogs/CurrencyDialog.js b/client/src/containers/Dialogs/CurrencyDialog.js index bb7872aac..51ea46fb2 100644 --- a/client/src/containers/Dialogs/CurrencyDialog.js +++ b/client/src/containers/Dialogs/CurrencyDialog.js @@ -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); diff --git a/client/src/containers/Dialogs/ExchangeRateDialog.js b/client/src/containers/Dialogs/ExchangeRateDialog.js index 5f89197ad..7541a572d 100644 --- a/client/src/containers/Dialogs/ExchangeRateDialog.js +++ b/client/src/containers/Dialogs/ExchangeRateDialog.js @@ -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); }) diff --git a/client/src/containers/Dialogs/InviteUserDialog.js b/client/src/containers/Dialogs/InviteUserDialog.js index 01e03b8a6..dab39129c 100644 --- a/client/src/containers/Dialogs/InviteUserDialog.js +++ b/client/src/containers/Dialogs/InviteUserDialog.js @@ -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); }) diff --git a/client/src/containers/Dialogs/ItemCategoryDialog.js b/client/src/containers/Dialogs/ItemCategoryDialog.js index 22a8c7c7f..c00c9004f 100644 --- a/client/src/containers/Dialogs/ItemCategoryDialog.js +++ b/client/src/containers/Dialogs/ItemCategoryDialog.js @@ -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() }); diff --git a/client/src/containers/Dialogs/ItemFromDialog.js b/client/src/containers/Dialogs/ItemFromDialog.js index d110e1edb..9f84a5b31 100644 --- a/client/src/containers/Dialogs/ItemFromDialog.js +++ b/client/src/containers/Dialogs/ItemFromDialog.js @@ -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) => { diff --git a/client/src/containers/Dialogs/UserFormDialog.js b/client/src/containers/Dialogs/UserFormDialog.js index 506426eef..32e89206c 100644 --- a/client/src/containers/Dialogs/UserFormDialog.js +++ b/client/src/containers/Dialogs/UserFormDialog.js @@ -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 = { diff --git a/client/src/containers/ExchangeRates/ExchangeRate.js b/client/src/containers/ExchangeRates/ExchangeRate.js index 8782fbdff..effb1a8e1 100644 --- a/client/src/containers/ExchangeRates/ExchangeRate.js +++ b/client/src/containers/ExchangeRates/ExchangeRate.js @@ -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]); diff --git a/client/src/containers/ExchangeRates/ExchangeRateActionsBar.js b/client/src/containers/ExchangeRates/ExchangeRateActionsBar.js index 580a893a7..26018a16f 100644 --- a/client/src/containers/ExchangeRates/ExchangeRateActionsBar.js +++ b/client/src/containers/ExchangeRates/ExchangeRateActionsBar.js @@ -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 ? ( ) : ( - `${filterCount} filters applied` + `${filterCount} ${formatMessage({id:'filters_applied'})}` ) } icon={} diff --git a/client/src/containers/Expenses/ExpensesList.js b/client/src/containers/Expenses/ExpensesList.js index 06a88cef5..41a8122bb 100644 --- a/client/src/containers/Expenses/ExpensesList.js +++ b/client/src/containers/Expenses/ExpensesList.js @@ -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'}) }); }); }; diff --git a/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js b/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js index 1e6cf2da6..e205a71d8 100644 --- a/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js +++ b/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js @@ -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. diff --git a/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetActionsBar.js b/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetActionsBar.js index a3c4d9bac..467557ee2 100644 --- a/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetActionsBar.js +++ b/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetActionsBar.js @@ -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({ diff --git a/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js b/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js index 0b4d184fd..cb043fab2 100644 --- a/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js +++ b/client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js @@ -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; diff --git a/client/src/containers/FinancialStatements/FinancialStatementDateRange.js b/client/src/containers/FinancialStatements/FinancialStatementDateRange.js index 34479a3c2..efc264a41 100644 --- a/client/src/containers/FinancialStatements/FinancialStatementDateRange.js +++ b/client/src/containers/FinancialStatements/FinancialStatementDateRange.js @@ -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, diff --git a/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedger.js b/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedger.js index d528fb2d4..9bbea9bf1 100644 --- a/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedger.js +++ b/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedger.js @@ -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 ( diff --git a/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerActionsBar.js b/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerActionsBar.js index c43331426..244648896 100644 --- a/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerActionsBar.js +++ b/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerActionsBar.js @@ -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({ diff --git a/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerTable.js b/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerTable.js index 5dcf28f49..679718f60 100644 --- a/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerTable.js +++ b/client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerTable.js @@ -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) ? () : ''; } return (); }, []); const referenceLink = useCallback((row) => { - return ({ row.referenceId }); + return ({row.referenceId}); }); - + 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 }) => ( - - {isAllRowsExpanded ? - () : - () - } - - ), + + {isAllRowsExpanded ? + () : + () + } + + ), 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} /> ); } @@ -201,4 +203,4 @@ export default compose( generalLedgerSheetLoading, generalLedgerQuery })), -)(GeneralLedgerTable); \ No newline at end of file +)(GeneralLedgerTable); diff --git a/client/src/containers/FinancialStatements/Journal/Journal.js b/client/src/containers/FinancialStatements/Journal/Journal.js index 31eb3a584..cd95965f3 100644 --- a/client/src/containers/FinancialStatements/Journal/Journal.js +++ b/client/src/containers/FinancialStatements/Journal/Journal.js @@ -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], diff --git a/client/src/containers/FinancialStatements/Journal/JournalActionsBar.js b/client/src/containers/FinancialStatements/Journal/JournalActionsBar.js index 9e792d07d..c4b2a1896 100644 --- a/client/src/containers/FinancialStatements/Journal/JournalActionsBar.js +++ b/client/src/containers/FinancialStatements/Journal/JournalActionsBar.js @@ -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({ diff --git a/client/src/containers/FinancialStatements/Journal/JournalTable.js b/client/src/containers/FinancialStatements/Journal/JournalTable.js index df277350a..26f280161 100644 --- a/client/src/containers/FinancialStatements/Journal/JournalTable.js +++ b/client/src/containers/FinancialStatements/Journal/JournalTable.js @@ -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, (), ['space_entry']), }, { - Header: 'Debit', + Header: formatMessage({id:'debit'}), accessor: r => exceptRowTypes( r.rowType, (), ['space_entry']), }, diff --git a/client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossActionsBar.js b/client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossActionsBar.js index 763b6dda7..c476a1d36 100644 --- a/client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossActionsBar.js +++ b/client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossActionsBar.js @@ -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({ diff --git a/client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js b/client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js index 1d4de0a86..704933e59 100644 --- a/client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js +++ b/client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js @@ -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) { diff --git a/client/src/containers/FinancialStatements/RadiosAccountingBasis.js b/client/src/containers/FinancialStatements/RadiosAccountingBasis.js index ac3eee2e0..bdcf502f9 100644 --- a/client/src/containers/FinancialStatements/RadiosAccountingBasis.js +++ b/client/src/containers/FinancialStatements/RadiosAccountingBasis.js @@ -9,20 +9,20 @@ import { export default function RadiosAccountingBasis(props) { const { onChange, ...rest } = props; - const intl = useIntl(); + const {formatMessage} = useIntl(); return ( { onChange && onChange(value); })} className={'radio-group---accounting-basis'} {...rest}> - - + + ); } \ No newline at end of file diff --git a/client/src/containers/FinancialStatements/SelectDisplayColumnsBy.js b/client/src/containers/FinancialStatements/SelectDisplayColumnsBy.js index 54ab6aa74..a3989ef3d 100644 --- a/client/src/containers/FinancialStatements/SelectDisplayColumnsBy.js +++ b/client/src/containers/FinancialStatements/SelectDisplayColumnsBy.js @@ -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 : , [itemSelected]); return ( } className="form-group-display-columns-by form-group--select-list bp3-fill" inline={false} {...formGroupProps}> diff --git a/client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceActionsBar.js b/client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceActionsBar.js index 9bcec4b82..b9089c97b 100644 --- a/client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceActionsBar.js +++ b/client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceActionsBar.js @@ -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({ diff --git a/client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetTable.js b/client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetTable.js index eb740a9cc..25271f05e 100644 --- a/client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetTable.js +++ b/client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetTable.js @@ -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({ }) => ( {isAllRowsExpanded ? - () : - () + () : () } ), @@ -55,40 +59,37 @@ function TrialBalanceSheetTable({ className: 'toggle', })} > - {row.isExpanded ? - () : - () - } + {row.isExpanded ? () : () } ) : 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 => (), className: 'credit', width: 120, }, { - Header: 'Debit', + Header: formatMessage({id:'debit'}), accessor: r => (), className: 'debit', width: 120, }, { - Header: 'Balance', + Header: formatMessage({id:'balance'}), accessor: r => (), className: 'balance', width: 120, diff --git a/client/src/containers/Items/ItemForm.js b/client/src/containers/Items/ItemForm.js index a3935981e..41856af91 100644 --- a/client/src/containers/Items/ItemForm.js +++ b/client/src/containers/Items/ItemForm.js @@ -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'}) )} /> @@ -399,7 +399,7 @@ const ItemForm = ({ rightIcon='caret-down' text={getSelectedAccountLabel( 'sell_account_id', - 'Select account' + formatMessage({id:'select_account'}) )} /> @@ -462,7 +462,8 @@ const ItemForm = ({ rightIcon='caret-down' text={getSelectedAccountLabel( 'cost_account_id', - 'Select account' + formatMessage({id:'select_account'}) + )} /> @@ -508,7 +509,8 @@ const ItemForm = ({ rightIcon='caret-down' text={getSelectedAccountLabel( 'inventory_account_id', - 'Select account' + formatMessage({id:'select_account'}) + )} /> diff --git a/client/src/containers/Items/ItemsActionsBar.js b/client/src/containers/Items/ItemsActionsBar.js index 9d4a62a4c..99f647168 100644 --- a/client/src/containers/Items/ItemsActionsBar.js +++ b/client/src/containers/Items/ItemsActionsBar.js @@ -38,23 +38,26 @@ const ItemsActionsBar = ({ const { path } = useRouteMatch(); const history = useHistory(); const [filterCount, setFilterCount] = useState(0); - - const viewsMenuItems = itemsViews.map(view => - ()); + const { formatMessage } = useIntl(); + const viewsMenuItems = itemsViews.map((view) => ( + + )); 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 = ({ - +
diff --git a/client/src/containers/Preferences/Users/UsersList.js b/client/src/containers/Preferences/Users/UsersList.js index b3f38c844..7d0039ba8 100644 --- a/client/src/containers/Preferences/Users/UsersList.js +++ b/client/src/containers/Preferences/Users/UsersList.js @@ -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) => ( - + } onClick={onEditUser(user)} /> - - onInactiveUser(user)} /> - onDeleteUser(user)} /> + } onClick={onEditInviteUser(user)} /> + } onClick={() => onInactiveUser(user)} /> + } onClick={() => onDeleteUser(user)} /> ), [] @@ -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 ? - Active : - Inactivate, + : + , width: 50, className: 'status', }, @@ -177,8 +178,8 @@ function UsersListPreferences({ /> } + confirmButtonText={} icon='trash' intent={Intent.DANGER} isOpen={deleteUserState} @@ -192,8 +193,8 @@ function UsersListPreferences({ } + confirmButtonText={} icon='trash' intent={Intent.WARNING} isOpen={inactiveUserState} diff --git a/client/src/index.js b/client/src/index.js index f2ae83e6f..4db7f18b1 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -6,7 +6,12 @@ import App from 'components/App'; import * as serviceWorker from 'serviceWorker'; import createStore from 'store/createStore'; import AppProgress from 'components/NProgress/AppProgress'; +import { setLocale } from 'yup'; +import {locale} from 'lang/en/locale'; + + +setLocale(locale) ReactDOM.render( diff --git a/client/src/lang/en/index.js b/client/src/lang/en/index.js index d882c7fed..b32e523f8 100644 --- a/client/src/lang/en/index.js +++ b/client/src/lang/en/index.js @@ -1,10 +1,10 @@ export default { hello_world: 'Hello World', - email_or_phone_number: 'Email or phone number', + 'email_or_phone_number': 'Email or phone number', password: 'Password', login: 'Login', - invalid_email_or_phone_numner: 'Invalid email or phone number.', - required: 'Required', + invalid_email_or_phone_number: 'Invalid email or phone number.', + 'required': 'Required', reset_password: 'Reset Password', the_user_has_been_suspended_from_admin: 'The user has been suspended from the administrator.', email_and_password_entered_did_not_match: @@ -67,6 +67,7 @@ export default { edit_account: 'Edit Account', new_account: 'New Account', edit_currency: 'Edit Currency', + delete_currency: 'Delete Currency', new_currency: 'New Currency', currency_name: 'Currency Name', currency_code: 'Currency Code', @@ -74,7 +75,6 @@ export default { new_exchange_rate: 'New Exchange Rate', delete_exchange_rate: 'Delete Exchange Rate', exchange_rate: 'Exchange Rate', - currency_code: 'Currency Code', edit_invite: 'Edit invite', edit_category: 'Edit Category', delete_category: 'Delete Category', @@ -118,7 +118,7 @@ export default { cancel: 'Cancel', move_to_trash: 'Move to Trash', save_new: 'Save & New', - journal_number: 'Journal number', + journal_number: 'Journal Number', credit_currency: 'Credit ({currency})', debit_currency: 'Debit ({currency})', note: 'Note', @@ -137,6 +137,7 @@ export default { inactivate: 'Inactivate', activate: 'Activate', inactivate_account: 'Inactivate Account', + activate_account:'Activate Account', delete_account: 'Delete Account', code: 'Code', type: 'Type', @@ -167,51 +168,162 @@ export default { new_custom_view: 'New Custom View', view_name: 'View Name', new_conditional: 'New Conditional', - 'item': 'Item', - 'account': 'Account', - 'service_has_been_successful_created': '{service} {name} has been successfully created.', - 'service_has_been_successful_edited': '{service} {name} has been successfully edited.', - 'you_are_about_permanently_delete_this_journal': `You're about to permanently delete this journal and all its transactions on accounts and attachments, and all of its data.

If you're not sure, you can archive this journal instead.`, - 'once_delete_these_accounts_you_will_not_able_restore_them': 'Once you delete these accounts, you won\'t be able to retrieve them later. Are you sure you want to delete them?', - 'once_delete_these_service_you_will_not_able_restore_it': 'Once you delete these {service}, you won\'t be able to retrieve them later. Are you sure you want to delete this {service}?', - 'you_could_not_delete_predefined_accounts': 'You could\'t delete predefined accounts.', - 'cannot_delete_account_has_associated_transactions': 'you could\'t not delete account that has associated transactions.', - 'the_account_has_been_successfully_inactivated': 'The account has been successfully inactivated.', - 'the_account_has_been_successfully_activated': 'The account has been successfully activated.', - 'the_account_has_been_successfully_deleted': 'The account has been successfully deleted.', - 'the_accounts_has_been_successfully_deleted': 'The accounts have been successfully deleted.', - 'are_sure_to_inactive_this_account': 'Are you sure you want to inactive this account? You will be able to activate it later', - 'are_sure_to_activate_this_account': 'Are you sure you want to activate this account? You will be able to inactivate it later', - 'once_delete_this_account_you_will_able_to_restore_it': `Once you delete this account, you won\'t be able to restore it later. Are you sure you want to delete this account?

If you're not sure, you can inactivate this account instead.`, - 'the_journal_has_been_successfully_created': 'The journal #{number} has been successfully created.', - 'the_journal_has_been_successfully_edited': 'The journal #{number} has been successfully edited.', - 'the_journal_has_been_successfully_deleted': 'The journal #{number} has been successfully deleted.', - 'the_journals_has_been_successfully_deleted': 'The journals {count} have been successfully deleted.', - 'credit': 'Credit', - 'debit': 'Debit', - 'once_delete_this_item_you_will_able_to_restore_it': `Once you delete this item, you won\'t be able to restore the item later. Are you sure you want to delete ?

If you're not sure, you can inactivate it instead.`, - 'the_item_has_been_successfully_deleted': 'The item has been successfully deleted.', - 'the_item_category_has_been_successfully_created': 'The item category has been successfully created.', - 'the_item_category_has_been_successfully_edited': 'The item category has been successfully edited.', - 'once_delete_these_views_you_will_not_able_restore_them': 'Once you delete the custom view, you won\'t be able to restore it later. Are you sure you want to delete this view?', - 'the_custom_view_has_been_successfully_deleted': 'The custom view has been successfully deleted.', - 'teammate_invited_to_organization_account': 'Your teammate has been invited to the organization account.', - 'select_account_type': 'Select account type', - 'the_item_category_has_been_successfully_deleted': 'The item category has been successfully deleted.', - 'once_delete_this_item_category_you_will_able_to_restore_it': 'Once you delete this item category, you won\'t be able to restore the item later. Are you sure you want to delete?', - 'once_delete_this_journal_category_you_will_able_to_restore_it': 'Once you delete this journal, you won\'t be able to restore the item later. Are you sure you want to delete?', - 'all': 'All', - 'once_delete_these_journalss_you_will_not_able_restore_them': 'Once you delete these journals, you won\'t be able to retrieve them later. Are you sure you want to delete them?', - 'journal_number_is_already_used': 'Journal number is already used.', - - the_item_categories_has_been_successfully_deleted:'The item categories has been successfully deleted', - once_delete_these_item_categories_you_will_not_able_restore_them:'Once you delete these item categories, you won\'t be able to retrieve them later. Are you sure you want to delete them?', - once_delete_this_exchange_rate_you_will_able_to_restore_it: `Once you delete this exchange rate, you won\'t be able to restore it later. Are you sure you want to delete?`, - once_delete_these_exchange_rates_you_will_not_able_restore_them:'Once you delete these item categories, you won\'t be able to retrieve them later. Are you sure you want to delete them?', - the_accounts_has_been_successfully_activated:'The Accounts has been Successfully activated', - are_sure_to_activate_this_accounts: 'Are you sure you want to activate this accounts? You will be able to inactivate it later', - are_sure_to_inactive_this_accounts: 'Are you sure you want to inactive this accounts? You will be able to activate it later', - the_accounts_has_been_successfully_inactivated: 'The accounts has been successfully inactivated.', - + item: 'Item', + service_has_been_successful_created: '{service} {name} has been successfully created.', + service_has_been_successful_edited: '{service} {name} has been successfully edited.', + you_are_about_permanently_delete_this_journal: `You're about to permanently delete this journal and all its transactions on accounts and attachments, and all of its data.

If you're not sure, you can archive this journal instead.`, + once_delete_these_accounts_you_will_not_able_restore_them: 'Once you delete these accounts, you won\'t be able to retrieve them later. Are you sure you want to delete them?', + once_delete_these_service_you_will_not_able_restore_it: 'Once you delete these {service}, you won\'t be able to retrieve them later. Are you sure you want to delete this {service}?', + you_could_not_delete_predefined_accounts: 'You could\'t delete predefined accounts.', + cannot_delete_account_has_associated_transactions: 'you could\'t not delete account that has associated transactions.', + the_account_has_been_successfully_inactivated: 'The account has been successfully inactivated.', + the_account_has_been_successfully_activated: 'The account has been successfully activated.', + the_account_has_been_successfully_deleted: 'The account has been successfully deleted.', + the_accounts_has_been_successfully_deleted: 'The accounts have been successfully deleted.', + are_sure_to_inactive_this_account: 'Are you sure you want to inactive this account? You will be able to activate it later', + are_sure_to_activate_this_account: 'Are you sure you want to activate this account? You will be able to inactivate it later', + once_delete_this_account_you_will_able_to_restore_it: `Once you delete this account, you won\'t be able to restore it later. Are you sure you want to delete this account?

If you're not sure, you can inactivate this account instead.`, + the_journal_has_been_successfully_created: 'The journal #{number} has been successfully created.', + the_journal_has_been_successfully_edited: 'The journal #{number} has been successfully edited.', + credit: 'Credit', + debit: 'Debit', + once_delete_this_item_you_will_able_to_restore_it: `Once you delete this item, you won\'t be able to restore the item later. Are you sure you want to delete ?

If you're not sure, you can inactivate it instead.`, + the_item_has_been_successfully_deleted: 'The item has been successfully deleted.', + the_item_category_has_been_successfully_created: 'The item category has been successfully created.', + the_item_category_has_been_successfully_edited: 'The item category has been successfully edited.', + once_delete_these_views_you_will_not_able_restore_them: 'Once you delete the custom view, you won\'t be able to restore it later. Are you sure you want to delete this view?', + the_custom_view_has_been_successfully_deleted: 'The custom view has been successfully deleted.', + teammate_invited_to_organization_account: 'Your teammate has been invited to the organization account.', + select_account_type: 'Select account type', + menu:'Menu', + graph:'Graph', + map:'Map', + table:'Table', + nucleus:'Nucleus', + logout:'Logout', + the_expense_has_been_successfully_created: 'The expense has been successfully created.', + select_payment_account:'Select Payment Account', + select_expense_account:'Select Expense Account', + and:'And', + or:'OR', + select_a_comparator:'Select a comparator', + equals:'Equals', + not_equal:'Not Equal', + contain:'Contain', + not_contain:'Not Contain', + cash:'Cash', + accrual:'Accrual', + from:'From', + to:'To', + accounting_basis:'Accounting Basis:', + general:'General', + users:'Users', + currencies:'Currencies', + accountant:'Accountant', + accounts:'Accounts', + homepage:'Homepage', + items_list:'Items List', + new_item:'New Item', + items:'Items', + category_list:'Category List', + financial:'Financial', + accounts_chart:'Accounts Chart', + manual_journal:'Manual Journal', + make_journal:'Make Journal', + exchange_rate:'Exchange Rate', + banking:'Banking', + sales:'Sales', + purchases:'Purchases', + financial_reports:'Financial Reports', + balance_sheet:'Balance Sheet', + trial_balance_sheet:'Trial Balance Sheet', + journal:'Journal', + general_ledger:'General Ledger', + profit_loss_sheet:'Profit Loss Sheet', + expenses:'Expenses', + expenses_list:'Expenses List', + new_expenses:'New Expenses', + preferences:'Preferences', + auditing_system:'Auditing System', + all:'All', + organization:'Organization.', + check_your_email_for_a_link_to_reset: 'Check your email for a link to reset your password.If it doesn’t appear within a few minutes, check your spam folder.', + we_couldn_t_find_your_account_with_that_email:'We couldn\'t find your account with that email.', + select_parent_account:'Select Parent Account', + the_exchange_rate_has_been_successfully_edited:'The exchange rate has been successfully edited', + the_exchange_rate_has_been_successfully_created:'The exchange rate has been successfully created', + the_exchange_rate_has_been_successfully_deleted: 'The exchange rate has been successfully deleted.', + the_user_details_has_been_updated:'The user details has been updated', + the_category_has_been_successfully_created: 'The category has been successfully created.', + filters_applied:'filters applied', + the_expense_has_been_successfully_deleted: 'The expense has been successfully deleted.', + select_item_type:'Select Item Type', + service:'Service', + inventory:'Inventory', + non_inventory:'Non-Inventory', + select_category:'Select category', + select_account:'Select Account', + custom_fields:'Custom Fields', + the_currency_has_been_successfully_deleted:'The currency has been successfully deleted', + organization_industry:'Organization Industry', + business_location:'Business Location', + base_currency:'Base Currency', + fiscal_year:'Fiscal Year', + language:'Language', + time_zone:'Time Zone', + date_format:'Date Format', + edit_user:'Edit User', + edit_invite:'Edit Invite', + inactivate_user:'Inactivate User', + delete_user:'Delete User', + full_name:'Full Name', + the_user_has_been_successfully_inactivated: 'The user has been successfully inactivated.', + the_user_has_been_successfully_deleted: 'The user has been successfully deleted.', + customize_report:'Customize Report', + print:'Print', + export:'Export', + accounts_with_zero_balance:'Accounts with Zero Balance', + all_transactions:'All Transactions', + filter_accounts:'Filter Accounts', + calculate_report:'Calculate Report', + total:'Total', + specific_accounts:'Specific Accounts', + trans_num:'Trans. NUM', + journal_sheet:'Journal Sheet', + run_report:'Run Report', + num:'Num.', + acc_code:'Acc. Code', + display_report_columns:'Display report columns', + select_display_columns_by:'Select display columns by...', + credit_and_debit_not_equal:'credit and debit not equal', + the_currency_has_been_successfully_edited:'The currency has been successfully edited', + the_currency_has_been_successfully_created:'The currency has been successfully created', + // Name Labels + expense_account_id :'Expense account', + payment_account_id: 'Payment account', + currency_code_: 'Currency code', + publish:'Publish', + exchange_rate_:'Exchange rate', + journal_number_:'Journal number', + first_name_: 'First name', + last_name_:'Last name', + phone_number_:'Phone number', + organization_name_:'Organization name', + confirm_password:'Confirm password', + crediential:'Email or Phone number', + account_type_id:'Account type', + account_name_:'Account name', + currency_name_:'Currency name', + cost_account_id:'Cost account', + sell_account_id:'Sell account', + item_type_:'Item type', + item_name_:'Item name', + organization_industry_:'Organization industry', + base_currency_:'Base currency', + date_format_:'Date format', + view_name_:'View name' }; + + + diff --git a/client/src/lang/en/locale.js b/client/src/lang/en/locale.js new file mode 100644 index 000000000..132f85bb6 --- /dev/null +++ b/client/src/lang/en/locale.js @@ -0,0 +1,60 @@ +import printValue from '../printValue'; +export const locale = { + + mixed: { + default: "${path} is invalid", + required: "${path} is a required field ", + oneOf: "${path} must be one of the following values: ${values}", + notOneOf: "${path} must not be one of the following values: ${values}", + notType: ({ path, type, value, originalValue }) => { + let isCast = originalValue != null && originalValue !== value; + let msg = + `${path} must beeeeee a \`${type}\` type, ` + + `but the final value was: \`${printValue(value, true)}\`` + + (isCast + ? ` (cast from the value \`${printValue(originalValue, true)}\`).` + : '.'); + + if (value === null) { + msg += `\n If "null" is intended as an empty value be sure to mark the schema as \`.nullable()\``; + } + + return msg; + }, + defined: '${path} must be defined', + }, + string: { + length: "${path} must be exactly ${length} characters", + min: "${path} must be at least ${min} characters", + max: "${path} must be at most ${max} characters", + matches: '${path} must match the following: "${regex}"', + email: "${path} must be a valid email", + url: "${path} must be a valid URL", + trim: "${path} must be a trimmed string", + lowercase: "${path} must be a lowercase string", + uppercase: "${path} must be a upper case string" + }, + number: { + min: "${path} must be greater than or equal to ${min}", + max: "${path} must be less than or equal to ${max}", + lessThan: "${path} must be less than ${less}", + moreThan: "${path} must be greater than ${more}", + notEqual: "${path} must be not equal to ${notEqual}", + positive: "${path} must be a positive number", + negative: "${path} must be a negative number", + integer: "${path} must be an integer" + }, + date: { + min: "${path} field must be later than ${min}", + max: "${path} field must be at earlier than ${max}" + }, + boolean : {}, + object: { + noUnknown: + "${path} field cannot have keys not specified in the object shape" + }, + array: { + min: "${path} field must have at least ${min} items", + max: "${path} field must have less than or equal to ${max} items" + } +}; diff --git a/client/src/lang/printValue.js b/client/src/lang/printValue.js new file mode 100644 index 000000000..3bf5f0a6f --- /dev/null +++ b/client/src/lang/printValue.js @@ -0,0 +1,48 @@ +const toString = Object.prototype.toString; +const errorToString = Error.prototype.toString; +const regExpToString = RegExp.prototype.toString; +const symbolToString = + typeof Symbol !== 'undefined' ? Symbol.prototype.toString : () => ''; +const SYMBOL_REGEXP = /^Symbol\((.*)\)(.*)$/; + +function printNumber(val) { + if (val != +val) return 'NaN'; + const isNegativeZero = val === 0 && 1 / val < 0; + return isNegativeZero ? '-0' : '' + val; +} + +function printSimpleValue(val, quoteStrings = false) { + if (val == null || val === true || val === false) return '' + val; + + const typeOf = typeof val; + if (typeOf === 'number') return printNumber(val); + if (typeOf === 'string') return quoteStrings ? `"${val}"` : val; + if (typeOf === 'function') + return '[Function ' + (val.name || 'anonymous') + ']'; + if (typeOf === 'symbol') + return symbolToString.call(val).replace(SYMBOL_REGEXP, 'Symbol($1)'); + + const tag = toString.call(val).slice(8, -1); + if (tag === 'Date') + return isNaN(val.getTime()) ? '' + val : val.toISOString(val); + if (tag === 'Error' || val instanceof Error) + return '[' + errorToString.call(val) + ']'; + if (tag === 'RegExp') return regExpToString.call(val); + + return null; +} + +export default function printValue(value, quoteStrings) { + let result = printSimpleValue(value, quoteStrings); + if (result !== null) return result; + + return JSON.stringify( + value, + function(key, value) { + let result = printSimpleValue(this[key], quoteStrings); + if (result !== null) return result; + return value; + }, + 2, + ); +} \ No newline at end of file diff --git a/client/src/routes/dashboard.js b/client/src/routes/dashboard.js index b558fa2ac..19fdec1fc 100644 --- a/client/src/routes/dashboard.js +++ b/client/src/routes/dashboard.js @@ -1,136 +1,153 @@ import LazyLoader from 'components/LazyLoader'; -const BASE_URL = '/dashboard'; +// const BASE_URL = '/dashboard'; export default [ // Homepage { - path: `${BASE_URL}/homepage`, + path: `/homepage`, component: LazyLoader({ loader: () => import('containers/Homepage/Homepage'), }), + breadcrumb: 'Home', }, // Accounts. { - path: `${BASE_URL}/accounts`, + path: `/accounts`, component: LazyLoader({ loader: () => import('containers/Accounts/AccountsChart'), }), + breadcrumb: 'Accounts Chart', }, // Custom views. { - path: `${BASE_URL}/custom_views/:resource_slug/new`, + path: `/custom_views/:resource_slug/new`, component: LazyLoader({ loader: () => import('containers/Views/ViewFormPage'), }), + breadcrumb: 'New', }, { - path: `${BASE_URL}/custom_views/:view_id/edit`, + path: `/custom_views/:view_id/edit`, component: LazyLoader({ loader: () => import('containers/Views/ViewFormPage'), }), + breadcrumb: 'Edit', }, // Expenses. { - path: `${BASE_URL}/expenses/new`, + path: `/expenses/new`, component: LazyLoader({ loader: () => import('containers/Expenses/ExpenseForm'), }), + breadcrumb: 'New Expense', }, { - path: `${BASE_URL}/expenses`, + path: `/expenses`, component: LazyLoader({ loader: () => import('containers/Expenses/ExpensesList'), }), + breadcrumb: 'Expenses', }, // Accounting { - path: `${BASE_URL}/accounting/make-journal-entry`, + path: `/make-journal-entry`, component: LazyLoader({ loader: () => import('containers/Accounting/MakeJournalEntriesPage'), }), + breadcrumb: 'Make Journal Entry', }, { - path: `${BASE_URL}/accounting/manual-journals/:id/edit`, + path: `/manual-journals/:id/edit`, component: LazyLoader({ loader: () => import('containers/Accounting/MakeJournalEntriesPage'), }), + breadcrumb: 'Edit', }, { - path: `${BASE_URL}/accounting/manual-journals`, + path: `/manual-journals`, component: LazyLoader({ loader: () => import('containers/Accounting/ManualJournalsList'), }), + breadcrumb: 'Manual Journals', }, { - path: `${BASE_URL}/items/categories`, + path: `/items/categories`, component: LazyLoader({ loader: () => import('containers/Items/ItemCategoriesList'), }), + breadcrumb: 'Categories', }, { - path: `${BASE_URL}/items/new`, + path: `/items/new`, component: LazyLoader({ loader: () => import('containers/Items/ItemFormPage'), }), + breadcrumb: 'New Item', }, // Items { - path: `${BASE_URL}/items`, + path: `/items`, component: LazyLoader({ loader: () => import('containers/Items/ItemsList'), }), + breadcrumb: 'Items', }, // Financial Reports. { - path: `${BASE_URL}/accounting/general-ledger`, + path: `/general-ledger`, component: LazyLoader({ loader: () => import('containers/FinancialStatements/GeneralLedger/GeneralLedger'), }), + breadcrumb: 'General Ledger', }, { - path: `${BASE_URL}/accounting/balance-sheet`, + path: `/balance-sheet`, component: LazyLoader({ loader: () => import('containers/FinancialStatements/BalanceSheet/BalanceSheet'), }), + breadcrumb: 'Balance Sheet', }, { - path: `${BASE_URL}/accounting/trial-balance-sheet`, + path: `/trial-balance-sheet`, component: LazyLoader({ loader: () => import( 'containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheet' ), + breadcrumb: 'Trial Balance Sheet', }), }, { - path: `${BASE_URL}/accounting/profit-loss-sheet`, + path: `/profit-loss-sheet`, component: LazyLoader({ loader: () => import( 'containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet' ), + breadcrumb: 'Profit Loss Sheet', }), }, { - path: `${BASE_URL}/accounting/journal-sheet`, + path: `/journal-sheet`, component: LazyLoader({ loader: () => import('containers/FinancialStatements/Journal/Journal'), }), + breadcrumb: 'Journal Sheet', }, { - path: `${BASE_URL}/ExchangeRates`, + path: `/ExchangeRates`, component: LazyLoader({ - loader: () => - import('containers/ExchangeRates/ExchangeRate'), + loader: () => import('containers/ExchangeRates/ExchangeRate'), }), + breadcrumb: 'Exchange Rates', }, ]; diff --git a/client/src/routes/preferences.js b/client/src/routes/preferences.js index 7439409c7..d751c0b40 100644 --- a/client/src/routes/preferences.js +++ b/client/src/routes/preferences.js @@ -4,7 +4,7 @@ import Accountant from 'containers/Preferences/Accountant/Accountant'; import Accounts from 'containers/Preferences/Accounts/Accounts'; import CurrenciesList from 'containers/Preferences/Currencies/CurrenciesList' -const BASE_URL = '/dashboard/preferences'; +const BASE_URL = '/preferences'; export default [ { diff --git a/client/src/store/resources/resources.reducer.js b/client/src/store/resources/resources.reducer.js index 019669e3c..9ba1e37a4 100644 --- a/client/src/store/resources/resources.reducer.js +++ b/client/src/store/resources/resources.reducer.js @@ -11,15 +11,15 @@ const initialState = { metadata: { 'accounts': { label: 'Accounts', - baseRoute: '/dashboard/accounts', + baseRoute: '/accounts', }, 'items': { label: 'Items', - baseRoute: '/dashboard/items', + baseRoute: '/items', }, 'manual_journals': { label: 'Journals', - baseRoute: '/dashboard/accounting/manual-journals', + baseRoute: '/manual-journals', } } };