QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-19 06:10:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/i18n-arabic'

Browse Source
This commit is contained in:
a.bouhuolia
2021-07-11 21:55:01 +02:00
parent 5cc0f972bf 87c903d0f3
commit 49550b3393
576 changed files with 11309 additions and 3054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/config/webpack.config.js
View File

@@ -27,6 +27,8 @@ const typescriptFormatter = require('react-dev-utils/typescriptFormatter');
const CompressionPlugin = require("compression-webpack-plugin");
const postcssNormalize = require('postcss-normalize');
const { postcssRTLCSS} = require('postcss-rtlcss');
const appPackageJson = require(paths.appPackageJson);
@@ -92,6 +94,14 @@ module.exports = function(webpackEnv) {
// https://github.com/facebook/create-react-app/issues/2677
ident: 'postcss',
plugins: () => [
// Postcss rtlcss plugin.
// require( 'postcss-rtl' )({
// // options here.
// removeComments: false,
// }),
postcssRTLCSS({
}),
require('postcss-flexbugs-fixes'),
require('postcss-preset-env')({
autoprefixer: {
@@ -120,6 +130,10 @@ module.exports = function(webpackEnv) {
loader: require.resolve(preProcessor),
options: {
sourceMap: true,
sassOptions: {
sourceComments: true,
outputStyle: 'expanded'
}
},
}
);

6
client/package.json
View File

@@ -61,7 +61,9 @@
"postcss-loader": "3.0.0",
"postcss-normalize": "8.0.1",
"postcss-preset-env": "6.7.0",
"postcss-rtl": "^1.7.3",
"postcss-safe-parser": "4.0.1",
"ramda": "^0.27.1",
"react": "^16.12.0",
"react-app-polyfill": "^1.0.6",
"react-body-classname": "^1.3.1",
@@ -71,7 +73,7 @@
"react-dropzone": "^11.0.1",
"react-error-boundary": "^3.0.2",
"react-hotkeys-hook": "^3.0.3",
"react-intl": "^3.12.0",
"react-intl-universal": "^2.4.7",
"react-loadable": "^5.5.0",
"react-query": "^3.6.0",
"react-redux": "^7.1.3",
@@ -92,6 +94,7 @@
"redux-thunk": "^2.3.0",
"resolve": "1.15.0",
"resolve-url-loader": "3.1.1",
"rtl-detect": "^1.0.3",
"sass-loader": "8.0.2",
"semver": "6.3.0",
"style-loader": "0.23.1",
@@ -135,6 +138,7 @@
"@welldone-software/why-did-you-render": "^6.0.0-rc.1",
"compression-webpack-plugin": "^6.1.0",
"http-proxy-middleware": "^1.0.0",
"postcss-rtlcss": "^1.7.2",
"react-query-devtools": "^2.1.1",
"redux-devtools": "^3.5.0",
"typescript": "^4.1.2"

2
client/public/index.html
View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html dir="ltr" lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicons/favicon-32.ico" sizes="32x32">

6
client/src/common/adjustmentType.js
View File

@@ -1,4 +1,6 @@
import intl from 'react-intl-universal';
export default [
{ name: 'Decrement', value: 'decrement' },
{ name: 'Increment', value: 'increment' },
{ name: intl.get('decrement'), value: 'decrement' },
{ name: intl.get('increment'), value: 'increment' },
]

7
client/src/common/contactsOptions.js
View File

@@ -1,4 +1,7 @@
import React from 'react';
import intl from 'react-intl-universal';
export default [
{ name: 'Customer', path: 'customers' },
{ name: 'Vendor', path: 'vendors' },
{ name: intl.get('customer'), path: 'customers' },
{ name: intl.get('vendor'), path: 'vendors' },
];

6
client/src/common/countries.js
View File

@@ -1,5 +1,3 @@
import intl from 'react-intl-universal';
export default [
{ name: 'Libya', value: 'libya' },
]
export default [{ name: intl.get('libya'), value: 'libya' }];

10
client/src/common/currencies.js
View File

@@ -1,5 +1,7 @@
import intl from 'react-intl-universal';
export default [
{ name: 'US Dollar', code: 'USD' },
{ name: 'Euro', code: 'EUR' },
{ name: 'Libyan Dinar ', code: 'LYD' },
]
{ name: intl.get('us_dollar'), code: 'USD' },
{ name: intl.get('euro'), code: 'EUR' },
{ name: intl.get('libyan_diner'), code: 'LYD' },
];

15
client/src/common/dateFormatsOptions.js
View File

@@ -1,40 +1,41 @@
import moment from 'moment';
import intl from 'react-intl-universal';
export default [
{
id: 1,
name: 'MM/DD/YY',
name: intl.get('mm_dd_yy'),
label: `${moment().format('MM/DD/YYYY')}`,
value: 'mm/dd/yy',
},
{
id: 2,
name: 'DD/MM/YY',
name: intl.get('dd_mm_yy'),
label: `${moment().format('DD/MM/YYYY')}`,
value: 'dd/mm/yy',
},
{
id: 3,
name: 'YY/MM/DD',
name: intl.get('yy_mm_dd'),
label: `${moment().format('YYYY/MM/DD')}`,
value: 'yy/mm/dd',
},
{
id: 4,
name: 'MM-DD-YY',
name: intl.get('mm_dd_yy'),
label: `${moment().format('MM-DD-YYYY')}`,
value: 'mm-dd-yy',
},
{
id: 5,
name: 'DD-MM-YY',
name: intl.get('dd_mm_yy_'),
label: `${moment().format('DD-MM-YYYY')}`,
value: 'dd-mm-yy',
},
{
id: 6,
name: 'YY-MM-DD',
name: intl.get('yy_mm_dd_'),
label: `${moment().format('YYYY-MM-DD')}`,
value: 'yy-mm-dd',
},
]
];

52
client/src/common/fiscalYearOptions.js
View File

@@ -1,88 +1,64 @@
import { formatMessage } from 'services/intl';
import intl from 'react-intl-universal';
export default [
export const getFiscalYearOptions = () => [
{
id: 0,
name: `${formatMessage({ id: 'january' })} - ${formatMessage({
id: 'december',
})}`,
name: `${intl.get('january')} - ${intl.get('december')}`,
value: 'january',
},
{
id: 1,
name: `${formatMessage({ id: 'february' })} - ${formatMessage({
id: 'january',
})}`,
name: `${intl.get('february')} - ${intl.get('january')}`,
value: 'february',
},
{
id: 2,
name: `${formatMessage({ id: 'march' })} - ${formatMessage({
id: 'february',
})}`,
name: `${intl.get('march')} - ${intl.get('february')}`,
value: 'March',
},
{
id: 3,
name: `${formatMessage({ id: 'april' })} - ${formatMessage({
id: 'march',
})}`,
name: `${intl.get('april')} - ${intl.get('march')}`,
value: 'april',
},
{
id: 4,
name: `${formatMessage({ id: 'may' })} - ${formatMessage({
id: 'april',
})}`,
name: `${intl.get('may')} - ${intl.get('april')}`,
value: 'may',
},
{
id: 5,
name: `${formatMessage({ id: 'june' })} - ${formatMessage({
id: 'may',
})}`,
name: `${intl.get('june')} - ${intl.get('may')}`,
value: 'june',
},
{
id: 6,
name: `${formatMessage({ id: 'july' })} - ${formatMessage({
id: 'june',
})}`,
name: `${intl.get('july')} - ${intl.get('june')}`,
value: 'july',
},
{
id: 7,
name: `${formatMessage({ id: 'august' })} - ${formatMessage({
id: 'july',
})}`,
name: `${intl.get('august')} - ${intl.get('july')}`,
value: 'August',
},
{
id: 8,
name: `${formatMessage({ id: 'september' })} - ${formatMessage({
id: 'august',
})}`,
name: `${intl.get('september')} - ${intl.get('august')}`,
value: 'september',
},
{
id: 9,
name: `${formatMessage({ id: 'october' })} - ${formatMessage({
id: 'november',
})}`,
name: `${intl.get('october')} - ${intl.get('november')}`,
value: 'october',
},
{
id: 10,
name: `${formatMessage({ id: 'november' })} - ${formatMessage({
id: 'october',
})}`,
name: `${intl.get('november')} - ${intl.get('october')}`,
value: 'november',
},
{
id: 11,
name: `${formatMessage({ id: 'december' })} - ${formatMessage({
id: 'november',
})}`,
name: `${intl.get('december')} - ${intl.get('november')}`,
value: 'december',
},
]

86
client/src/common/homepageOptions.js
View File

@@ -1,38 +1,35 @@
import React from 'react';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
export const accountsReceivable = [
{
sectionTitle: <T id={'accounts_receivable_a_r'} />,
shortcuts: [
{
title: 'Sales invoices',
description: 'Tracking sales invoices with your customers with payment due date.',
title: <T id={'sales_invoices'} />,
description: <T id={'tracking_sales_invoices_with_your_customers'} />,
link: '/invoices',
},
{
title: 'Sales estimates',
description:
'Manage your sales estimates to create quotes that can later be turned to a sale invoice.',
title: <T id={'sales_estimates'} />,
description: <T id={'manage_your_sales_estimates_to_create_quotes'} />,
link: '/estimates',
},
{
title: 'Sales receipts',
description:
'Manage sales receipts for sales that get paid immediately from the customer.',
title: <T id={'sales_receipts'} />,
description: <T id={'manage_sales_receipts_for_sales_that_get_paid'} />,
link: '/receipts',
},
{
title: 'Customers',
description: 'Manage the customers relations with customer receivable and credit balances.',
title: <T id={'customers'} />,
description: <T id={'manage_the_customers_relations_with_customer'} />,
link: '/customers',
},
{
title: 'Customers payment',
description:
'Manage payment transactions from your customers with sale invoices.',
title: <T id={'customers_payments'} />,
description: (
<T id={'manage_payment_transactions_from_your_customers'} />
),
link: '/payment-receives',
},
],
@@ -44,20 +41,22 @@ export const accountsPayable = [
sectionTitle: <T id={'accounts_payable_a_p'} />,
shortcuts: [
{
title: 'Purchase invoices',
description: 'Manage the purchase invoices with your vendors with payment due date.',
title: <T id={'purchase_invoices'} />,
description: (
<T id={'manage_the_purchase_invoices_with_your_vendors'} />
),
link: '/bills',
},
{
title: 'Vendors',
description: 'Manage the vendors relations with vendor payable and debit balances.',
title: <T id={'vendors'} />,
description: (
<T id={'manage_the_vendors_relations_with_vendor_relations'} />
),
link: '/vendors',
},
{
title: 'Vendors payments',
description:
'Manage payments transactions to your vendors with purchase invoices.',
title: <T id={'vendors_payments'} />,
description: <T id={'manage_payments_transactions_to_your_vendors'} />,
link: '/payment-mades',
},
],
@@ -69,26 +68,29 @@ export const financialAccounting = [
sectionTitle: <T id={'financial_accounting'} />,
shortcuts: [
{
title: 'Chart of accounts',
description:
'Manage your accounts chart to record your transactions and categorise your transactions in parent accounts.',
title: <T id={'chart_of_accounts'} />,
description: (
<T
id={
'manage_your_accounts_chart_to_record_your_transactions_and_categories'
}
/>
),
link: '/accounts',
},
{
title: 'Manual journal',
description: 'Manage manual journal transactions on accounts, cost centra and projects.',
title: <T id={'manual_journal'}/>,
description:<T id={'manage_manual_journal_transactions_on_accounts'}/>,
link: '/manual-journals',
},
{
title: 'Expenses',
description:
'Track your indirect expenses under specific categories such as payroll, rent.',
title: <T id={'expenses'}/>,
description:<T id={'track_your_indirect_expenses_under_specific_categories'}/>,
link: '/expenses',
},
{
title: 'Financial statements',
description:
'Show financial reports about your organization to summarize your business’s financial performance.',
title: <T id={'financial_statements'}/>,
description:<T id={'show_financial_reports_about_your_organization'}/>,
link: '/financial-reports',
},
],
@@ -100,20 +102,18 @@ export const productsServices = [
sectionTitle: <T id={'products_services_inventory'} />,
shortcuts: [
{
title: 'Products & Services',
description:
'Manage your products (inventory or non-inventory) and services and place them into categories.',
title: <T id={'products_services'}/>,
description:<T id={'manage_your_products_inventory_or_non_inventory'}/>,
link: '/items',
},
{
title: 'Products & Services Categories',
description:
'Group your products and service into different categories.',
title: <T id={'products_services_categories'}/>,
description:<T id={'group_your_products_and_service'}/>,
link: 'items/categories',
},
{
title: 'Inventory Adjustments',
description: 'Manage your inventory adjustment of inventory items.',
title: <T id={'inventory_adjustments'}/>,
description: <T id={'manage_your_inventory_adjustment_of_inventory_items'}/>,
link: '/inventory-adjustments',
},
],

53
client/src/common/keyboardShortcutsOptions.js
View File

@@ -1,102 +1,105 @@
import React from 'react';
import intl from 'react-intl-universal';
export default [
{
shortcut_key: 'Shift + I',
description: 'Jump to the invoices.',
description: intl.get('jump_to_the_invoices'),
},
{
shortcut_key: 'Shift + E',
description: 'Jump to the estimates.',
description: intl.get('jump_to_the_estimates'),
},
{
shortcut_key: 'Shift + R',
description: 'Jump to the receipts.',
description: intl.get('jump_to_the_receipts'),
},
{
shortcut_key: 'Shift + X',
description: 'Jump to the expenses.',
description: intl.get('jump_to_the_expenses'),
},
{
shortcut_key: 'Shift + C',
description: 'Jump to the customers.',
description: intl.get('jump_to_the_customers'),
},
{
shortcut_key: 'Shift + V',
description: 'Jump to the vendors.',
description: intl.get('jump_to_the_vendors'),
},
{
shortcut_key: 'Shift + A',
description: 'Jump to the Chart of Accounts.',
description: intl.get('jump_to_the_chart_of_accounts'),
},
{
shortcut_key: 'Shift + B',
description: 'Jump to the bills.',
description: intl.get('jump_to_the_bills'),
},
{
shortcut_key: 'Shift + M',
description: 'Jump to the Manual Journals.',
description: intl.get('jump_to_the_manual_journals'),
},
{
shortcut_key: 'Shift + W',
description: 'Jump to the items.',
description: intl.get('jump_to_the_items'),
},
{
shortcut_key: 'Shift + 1',
description: 'Jump to the Balance Sheet.',
description: intl.get('jump_to_the_balance_sheet'),
},
{
shortcut_key: 'Shift + 2',
description: 'Jump to the Profit Loss Sheet.',
description: intl.get('jump_to_the_profit_loss_sheet'),
},
{
shortcut_key: 'Shift + 3',
description: 'Jump to the Journal Sheet.',
description: intl.get('jump_to_the_journal_sheet'),
},
{
shortcut_key: 'Shift + 4',
description: 'Jump to the General Ledger Sheet.',
description: intl.get('jump_to_the_general_ledger_sheet'),
},
{
shortcut_key: 'Shift + 5',
description: 'Jump to the Trial Balance Sheet.',
description: intl.get('jump_to_the_trial_balance_sheet'),
},
{
shortcut_key: 'Ctrl + Shift + I ',
description: 'Create a new invoice .',
description: intl.get('create_a_new_invoice'),
},
{
shortcut_key: 'Ctrl + Shift + E ',
description: 'Create a new estimate .',
description: intl.get('create_a_new_estimate'),
},
{
shortcut_key: 'Ctrl + Shift + R ',
description: 'Create a new receipt .',
description: intl.get('create_a_new_receipt'),
},
{
shortcut_key: 'Ctrl + Shift + X ',
description: 'Create a new expense.',
description: intl.get('create_a_new_expense'),
},
{
shortcut_key: 'Ctrl + Shift + C ',
description: 'Create a new customer.',
description: intl.get('create_a_new_customer'),
},
{
shortcut_key: 'Ctrl + Shift + V ',
description: 'Create a new vendor.',
description: intl.get('create_a_new_vendor'),
},
{
shortcut_key: 'Ctrl + Shift + B ',
description: 'Create a new bill.',
description: intl.get('create_a_new_bill'),
},
{
shortcut_key: 'Ctrl + Shift + M ',
description: 'Create a new Make Journal.',
description: intl.get('create_a_new_journal'),
},
{
shortcut_key: 'Ctrl + Shift + W ',
description: 'Create a new item.',
description: intl.get('create_a_new_item'),
},
{
shortcut_key: 'Ctrl + / ',
description: 'Close and open sidebar .',
description: intl.get('close_and_open_sidebar'),
},
];

8
client/src/common/languagesOptions.js
View File

@@ -1,6 +1,6 @@
import intl from 'react-intl-universal';
export default [
{ name: 'English', value: 'en' },
{ name: 'Arabic', value: 'ar' },
];
{ name: intl.get('english'), value: 'en' },
{ name: intl.get('arabic'), value: 'ar' },
];

8
client/src/common/numberFormatsOptions.js
View File

@@ -1,7 +1,9 @@
import intl from 'react-intl-universal';
export const moneyFormat = [
{ key: 'total', text: 'Total rows' },
{ key: 'always', text: 'Always' },
{ key: 'none', text: 'None' },
{ key: 'total', text: intl.get('total_rows') },
{ key: 'always', text: intl.get('always') },
{ key: 'none', text: intl.get('none') },
];
export const negativeFormat = [

16
client/src/common/quickNewOptions.js
View File

@@ -1,8 +1,10 @@
export default [
{ path: 'invoices/new', name: 'Sale invoice' },
{ path: 'bills//new', name: 'Purchase invoice' },
{ path: 'make-journal-entry', name: 'Manual journal' },
{ path: 'expenses/new', name: 'Expense' },
{ path: 'customers/new', name: 'Customer' },
{ path: 'vendors/new', name: 'Vendor' },
import intl from 'react-intl-universal';
export const getQuickNewActions = () => [
{ path: 'invoices/new', name: intl.get('sale_invoice') },
{ path: 'bills//new', name: intl.get('purchase_invoice') },
{ path: 'make-journal-entry', name: intl.get('manual_journal') },
{ path: 'expenses/new', name: intl.get('expense') },
{ path: 'customers/new', name: intl.get('customer') },
{ path: 'vendors/new', name: intl.get('vendor') },
];

12
client/src/common/registerWizard.js
View File

@@ -1,16 +1,16 @@
import intl from 'react-intl-universal';
export const registerWizardSteps = [
export const getSetupWizardSteps = () => [
{
label: 'payment_or_trial',
label: intl.get('Plans & Payment'),
},
{
label: 'initializing',
label: intl.get('Initializing'),
},
{
label: 'getting_started',
label: intl.get('Getting started'),
},
{
label: 'Congratulations',
label: intl.get('Congratulations'),
},
];

4
client/src/components/AccountsMultiSelect.js
View File

@@ -2,7 +2,7 @@ import React, { useMemo, useCallback, useState } from 'react';
import { omit } from 'lodash';
import { MenuItem, Button } from '@blueprintjs/core';
import MultiSelect from 'components/MultiSelect';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
export default function AccountsMultiSelect({ accounts, onAccountSelected }) {
const [selectedAccounts, setSelectedAccounts] = useState({});
@@ -56,7 +56,7 @@ export default function AccountsMultiSelect({ accounts, onAccountSelected }) {
return (
<MultiSelect
items={accounts}
noResults={<MenuItem disabled={true} text="No results." />}
noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
itemRenderer={accountItem}
popoverProps={{ minimal: true }}
filterable={true}

2
client/src/components/AccountsSelectList.js
View File

@@ -1,7 +1,7 @@
import React, { useCallback, useState, useEffect, useMemo } from 'react';
import { MenuItem, Button } from '@blueprintjs/core';
import { Select } from '@blueprintjs/select';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import classNames from 'classnames';
import { filterAccountsByQuery } from './utils';
import { CLASSES } from 'common/classes';

7
client/src/components/AccountsSuggestField.js
View File

@@ -1,11 +1,12 @@
import React, { useState, useCallback, useEffect, useMemo } from 'react';
import { MenuItem } from '@blueprintjs/core';
import { Suggest } from '@blueprintjs/select';
import intl from 'react-intl-universal';
import classNames from 'classnames';
import { CLASSES } from 'common/classes';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import { filterAccountsByQuery } from './utils';
/**
@@ -15,7 +16,7 @@ export default function AccountsSuggestField({
accounts,
initialAccountId,
selectedAccountId,
defaultSelectText = 'Select account',
defaultSelectText = intl.formatMessage({ id: 'select_account' }),
popoverFill = false,
onAccountSelected,
@@ -32,7 +33,7 @@ export default function AccountsSuggestField({
filterByRootTypes,
filterByParentTypes,
filterByTypes,
filterByNormal,
filterByNormal,
});
return filteredAccounts;
}, [

76
client/src/components/App.js
View File

@@ -1,53 +1,67 @@
import React from 'react';
import { RawIntlProvider } from 'react-intl';
import { Router, Switch, Route } from 'react-router';
import { createBrowserHistory } from 'history';
import { QueryClientProvider, QueryClient } from 'react-query';
import { ReactQueryDevtools } from 'react-query/devtools';
import 'style/App.scss';
import 'moment/locale/ar-ly';
import 'moment/locale/es-us'
import AppIntlLoader from './AppIntlLoader';
import PrivateRoute from 'components/Guards/PrivateRoute';
import Authentication from 'components/Authentication';
import DashboardPrivatePages from 'components/Dashboard/PrivatePages';
import GlobalErrors from 'containers/GlobalErrors/GlobalErrors';
import intl from 'services/intl';
import DashboardPrivatePages from 'components/Dashboard/PrivatePages';
import Authentication from 'components/Authentication';
// Query client config.
const queryConfig = {
defaultOptions: {
queries: {
refetchOnWindowFocus: true,
staleTime: 30000,
},
},
};
// Global fetch query.
function GlobalFetchQuery({
children
}) {
window.localStorage.setItem('lang', 'en');
return children
}
/**
* Core application.
*/
function App({ locale }) {
const history = createBrowserHistory();
const queryConfig = {
defaultOptions: {
queries: {
refetchOnWindowFocus: true,
staleTime: 30000,
},
},
};
// Query client.
const queryClient = new QueryClient(queryConfig);
return (
<RawIntlProvider value={intl}>
<QueryClientProvider client={queryClient}>
<div className="App">
<Router history={history}>
<Switch>
<Route path={'/auth'}>
<Authentication />
</Route>
<QueryClientProvider client={queryClient}>
<GlobalFetchQuery>
<AppIntlLoader>
<div className="App">
<Router history={history}>
<Switch>
<Route path={'/auth'} component={Authentication} />
<Route path={'/'}>
<PrivateRoute component={DashboardPrivatePages} />
</Route>
</Switch>
</Router>
<Route path={'/'}>
<PrivateRoute component={DashboardPrivatePages} />
</Route>
</Switch>
</Router>
<GlobalErrors />
</div>
</AppIntlLoader>
</GlobalFetchQuery>
<GlobalErrors />
</div>
<ReactQueryDevtools initialIsOpen />
</QueryClientProvider>
</RawIntlProvider>
<ReactQueryDevtools initialIsOpen />
</QueryClientProvider>
);
}

95
client/src/components/AppIntlLoader.js Normal file
View File

@@ -0,0 +1,95 @@
import React from 'react';
import moment from 'moment';
import { setLocale } from 'yup';
import intl from 'react-intl-universal';
import { find } from 'lodash';
import rtlDetect from 'rtl-detect';
import DashboardLoadingIndicator from 'components/Dashboard/DashboardLoadingIndicator';
const SUPPORTED_LOCALES = [
{ name: 'English', value: 'en' },
{ name: 'العربية', value: 'ar-ly' },
];
/**
* Retrieve the current local.
*/
function getCurrentLocal() {
let currentLocale = intl.determineLocale({
urlLocaleKey: 'lang',
cookieLocaleKey: 'lang',
localStorageLocaleKey: 'lang',
});
if (!find(SUPPORTED_LOCALES, { value: currentLocale })) {
currentLocale = 'en';
}
return currentLocale;
}
/**
* Loads the localization data of the given locale.
*/
function loadLocales(currentLocale) {
return import(`../lang/${currentLocale}/index.json`);
}
function loadYupLocales(currentLocale) {
return import(`../lang/${currentLocale}/locale`);
}
/**
* Modifies the html document direction to RTl if it was rtl-language.
*/
function useDocumentDirectionModifier(locale) {
React.useEffect(() => {
const isRTL = rtlDetect.isRtlLang(locale);
if (isRTL) {
const htmlDocument = document.querySelector('html');
htmlDocument.setAttribute('dir', 'rtl');
htmlDocument.setAttribute('lang', locale);
}
}, []);
}
/**
* Application Intl loader.
*/
export default function AppIntlLoader({ children }) {
const [isLoading, setIsLoading] = React.useState(true);
const currentLocale = getCurrentLocal();
// Modifies the html document direction
useDocumentDirectionModifier(currentLocale);
React.useEffect(() => {
// Lodas the locales data file.
loadLocales(currentLocale)
.then((results) => {
return intl.init({
currentLocale,
locales: {
[currentLocale]: results,
},
});
})
.then(() => {
moment.locale(currentLocale);
setIsLoading(false);
});
}, [currentLocale, setIsLoading]);
React.useEffect(() => {
loadYupLocales(currentLocale)
.then(({ locale }) => {
setLocale(locale);
})
.then(() => {});
}, [currentLocale]);
return (
<DashboardLoadingIndicator isLoading={isLoading}>
{children}
</DashboardLoadingIndicator>
);
}

3
client/src/components/Authentication.js
View File

@@ -3,7 +3,7 @@ import { Redirect, Route, Switch, Link, useLocation } from 'react-router-dom';
import BodyClassName from 'react-body-classname';
import { TransitionGroup, CSSTransition } from 'react-transition-group';
import authenticationRoutes from 'routes/authentication';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import Icon from 'components/Icon';
import { useIsAuthenticated } from 'hooks/state';
@@ -32,6 +32,7 @@ export default function AuthenticationWrapper({ ...rest }) {
>
<T id={'go_to_bigcapital_com'} />
</a>
<div class="authentication-page__form-wrapper">
<div class="authentication-insider">
<div className={'authentication-insider__logo-section'}>

2
client/src/components/CategoriesSelectList.js
View File

@@ -1,5 +1,5 @@
import React, { useCallback } from 'react';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import { ListSelect } from 'components';
import { MenuItem } from '@blueprintjs/core';
import { saveInvoke } from 'utils';

11
client/src/components/ContactSelecetList.js
View File

@@ -1,5 +1,7 @@
import React, { useCallback, useState, useEffect, useMemo } from 'react';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { MenuItem, Button } from '@blueprintjs/core';
import { Select } from '@blueprintjs/select';
import classNames from 'classnames';
@@ -14,7 +16,7 @@ export default function ContactSelecetList({
onContactSelected,
popoverFill = false,
disabled = false,
buttonProps
buttonProps,
}) {
const contacts = useMemo(
() =>
@@ -79,7 +81,7 @@ export default function ContactSelecetList({
return (
<Select
items={contacts}
noResults={<MenuItem disabled={true} text="No results." />}
noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
itemRenderer={handleContactRenderer}
itemPredicate={filterContacts}
filterable={true}
@@ -89,6 +91,9 @@ export default function ContactSelecetList({
className={classNames(CLASSES.FORM_GROUP_LIST_SELECT, {
[CLASSES.SELECT_LIST_FILL_POPOVER]: popoverFill,
})}
inputProps={{
placeholder: intl.get('filter_')
}}
>
<Button
disabled={disabled}

27
client/src/components/ContactsMultiSelect.js
View File

@@ -2,7 +2,8 @@ import React, { useMemo, useCallback, useState } from 'react';
import { MenuItem, Button } from '@blueprintjs/core';
import { omit } from 'lodash';
import MultiSelect from 'components/MultiSelect';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
export default function ContactsMultiSelect({
contacts,
@@ -31,9 +32,10 @@ export default function ContactsMultiSelect({
[isContactSelect],
);
const countSelected = useMemo(() => Object.values(selectedContacts).length, [
selectedContacts,
]);
const countSelected = useMemo(
() => Object.values(selectedContacts).length,
[selectedContacts],
);
const onContactSelect = useCallback(
({ id }) => {
@@ -50,18 +52,13 @@ export default function ContactsMultiSelect({
setSelectedContacts({ ...selected });
onContactSelected && onContactSelected(selected);
},
[
setSelectedContacts,
selectedContacts,
isContactSelect,
onContactSelected,
],
[setSelectedContacts, selectedContacts, isContactSelect, onContactSelected],
);
return (
<MultiSelect
items={contacts}
noResults={<MenuItem disabled={true} text="No results." />}
noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
itemRenderer={contactRenderer}
popoverProps={{ minimal: true }}
filterable={true}
@@ -69,11 +66,9 @@ export default function ContactsMultiSelect({
>
<Button
text={
countSelected === 0 ? (
defaultText
) : (
<T id={'selected_customers'} values={{ count: countSelected }} />
)
countSelected === 0
? defaultText
: intl.get('selected_customers', { count: countSelected })
}
{...buttonProps}
/>

5
client/src/components/ContactsSuggestField.js
View File

@@ -2,15 +2,16 @@ import React, { useCallback, useState, useEffect, useMemo } from 'react';
import { MenuItem } from '@blueprintjs/core';
import { Suggest } from '@blueprintjs/select';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import classNames from 'classnames';
import { CLASSES } from 'common/classes';
import intl from 'react-intl-universal';
export default function ContactsSuggestField({
contactsList,
initialContactId,
selectedContactId,
defaultTextSelect = 'Select contact',
defaultTextSelect = intl.get('select_contact'),
onContactSelected,
selectedContactType = [],

2
client/src/components/CurrencySelectList.js
View File

@@ -1,5 +1,5 @@
import React, { useCallback, useEffect, useState } from 'react';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import { CLASSES } from 'common/classes';
import classNames from 'classnames';
import { MenuItem, Button } from '@blueprintjs/core';

2
client/src/components/Dashboard/Dashboard.js
View File

@@ -41,4 +41,4 @@ export default function Dashboard() {
<DrawersContainer />
</DashboardProvider>
);
}
}

2
client/src/components/Dashboard/DashboardActionViewsList.js
View File

@@ -9,7 +9,7 @@ import {
PopoverInteractionKind,
Position,
} from '@blueprintjs/core';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import { Icon } from 'components';
/**

7
client/src/components/Dashboard/DashboardBackLink.js
View File

@@ -1,8 +1,9 @@
import React from 'react';
import withBreadcrumbs from 'react-router-breadcrumbs-hoc';
import { useHistory } from 'react-router-dom';
import routes from 'routes/dashboard';
import { getDashboardRoutes } from 'routes/dashboard';
import { If, Icon } from 'components';
import { FormattedMessage as T } from 'components';
import withDashboard from 'containers/Dashboard/withDashboard';
import { compose } from 'utils';
@@ -23,7 +24,7 @@ function DashboardBackLink({ dashboardBackLink, breadcrumbs }) {
<If condition={dashboardBackLink && crumb}>
<div class="dashboard__back-link">
<a href="#no-link" onClick={handleClick}>
<Icon icon={'arrow-left'} iconSize={18} /> Back to list.
<Icon icon={'arrow-left'} iconSize={18} /> <T id={'back_to_list'} />
</a>
</div>
</If>
@@ -31,7 +32,7 @@ function DashboardBackLink({ dashboardBackLink, breadcrumbs }) {
}
export default compose(
withBreadcrumbs(routes),
withBreadcrumbs([]),
withDashboard(({ dashboardBackLink }) => ({
dashboardBackLink,
})),

4
client/src/components/Dashboard/DashboardBreadcrumbs.js
View File

@@ -6,7 +6,7 @@ import {
Boundary,
} from '@blueprintjs/core';
import withBreadcrumbs from 'react-router-breadcrumbs-hoc';
import routes from 'routes/dashboard';
import { getDashboardRoutes } from 'routes/dashboard';
import { useHistory } from 'react-router-dom';
function DashboardBreadcrumbs({ breadcrumbs }){
@@ -31,4 +31,4 @@ function DashboardBreadcrumbs({ breadcrumbs }){
)
}
export default withBreadcrumbs(routes)(DashboardBreadcrumbs)
export default withBreadcrumbs([])(DashboardBreadcrumbs)

5
client/src/components/Dashboard/DashboardContentRoute.js
View File

@@ -1,12 +1,15 @@
import React from 'react';
import { Route, Switch } from 'react-router-dom';
import routes from 'routes/dashboard';
import { getDashboardRoutes } from 'routes/dashboard';
import DashboardPage from './DashboardPage';
/**
* Dashboard content route.
*/
export default function DashboardContentRoute() {
const routes = getDashboardRoutes();
return (
<Route pathname="/">
<Switch>

5
client/src/components/Dashboard/DashboardFooter.js
View File

@@ -1,6 +1,5 @@
import React from 'react';
import footerLinks from 'config/footerLinks';
import { getFooterLinks } from 'config/footerLinks';
import { For } from 'components';
function FooterLinkItem({ title, link }) {
@@ -14,6 +13,8 @@ function FooterLinkItem({ title, link }) {
}
export default function DashboardFooter() {
const footerLinks = getFooterLinks();
return (
<div class="dashboard__footer">
<div class="footer-links">

2
client/src/components/Dashboard/DashboardTopbar.js
View File

@@ -9,7 +9,7 @@ import {
Tooltip,
Position,
} from '@blueprintjs/core';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import DashboardTopbarUser from 'components/Dashboard/TopbarUser';
import DashboardBreadcrumbs from 'components/Dashboard/DashboardBreadcrumbs';

2
client/src/components/Dashboard/DashboardViewsTabs.js
View File

@@ -1,5 +1,5 @@
import React, { useRef, useState, useEffect } from 'react';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import PropTypes from 'prop-types';
import { Button, Tabs, Tab, Tooltip, Position } from '@blueprintjs/core';
import { useHistory } from 'react-router';

3
client/src/components/Dashboard/GlobalHotkeys.js
View File

@@ -1,7 +1,7 @@
import React from 'react';
import { useHotkeys } from 'react-hotkeys-hook';
import { useHistory } from 'react-router-dom';
import routes from 'routes/dashboard';
import { getDashboardRoutes } from 'routes/dashboard';
import withDashboardActions from 'containers/Dashboard/withDashboardActions';
import { compose } from 'utils';
@@ -10,6 +10,7 @@ function GlobalHotkeys({
toggleSidebarExpend,
}) {
const history = useHistory();
const routes = getDashboardRoutes();
const globalHotkeys = routes
.filter(({ hotkey }) => hotkey)

2
client/src/components/Dashboard/TopbarUser.js
View File

@@ -8,7 +8,7 @@ import {
Popover,
Position,
} from '@blueprintjs/core';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import { firstLettersArgs } from 'utils';
import { useAuthActions, useAuthUser } from 'hooks/state';

10
client/src/components/DataTable.js
View File

@@ -10,6 +10,7 @@ import {
useAsyncDebounce,
} from 'react-table';
import { useSticky } from 'react-table-sticky';
import intl from 'react-intl-universal';
import { useUpdateEffect } from 'hooks';
import { saveInvoke } from 'utils';
@@ -52,7 +53,7 @@ export default function DataTable(props) {
payload,
expandable = false,
noInitialFetch = false,
pagesCount: controlledPageCount,
// Pagination props.
@@ -122,7 +123,7 @@ export default function DataTable(props) {
autoResetFilters,
autoResetRowState,
...restProps
...restProps,
},
useSortBy,
useExpanded,
@@ -181,7 +182,6 @@ export default function DataTable(props) {
);
}
DataTable.defaultProps = {
pagination: false,
spinnerProps: { size: 30 },
@@ -209,6 +209,6 @@ DataTable.defaultProps = {
TablePaginationRenderer: TablePagination,
TableNoResultsRowRenderer: TableNoResultsRow,
noResults: 'There is no results in the table.',
noResults: '',
payload: {},
};
};

2
client/src/components/DataTableCells/AccountsListFieldCell.js
View File

@@ -1,6 +1,7 @@
import React, { useRef, useCallback, useMemo } from 'react';
import classNames from 'classnames';
import { useCellAutoFocus } from 'hooks';
import intl from 'react-intl-universal';
import AccountsSuggestField from 'components/AccountsSuggestField';
@@ -61,6 +62,7 @@ export default function AccountCellRenderer({
filterByTypes={filterAccountsByTypes}
inputProps={{
inputRef: (ref) => (accountRef.current = ref),
placeholder: intl.get('search'),
}}
openOnKeyDown={true}
blurOnSelectClose={false}

3
client/src/components/DataTableCells/ItemsListCell.js
View File

@@ -4,6 +4,7 @@ import ItemsSuggestField from 'components/ItemsSuggestField';
import classNames from 'classnames';
import { FormGroup, Classes, Intent } from '@blueprintjs/core';
import intl from 'react-intl-universal';
import { useCellAutoFocus } from 'hooks';
@@ -40,7 +41,7 @@ export default function ItemsListCell({
purchasable={filterPurchasable}
inputProps={{
inputRef: (ref) => (fieldRef.current = ref),
placeholder: 'Enter an item...'
placeholder: intl.get('enter_an_item'),
}}
openOnKeyDown={true}
blurOnSelectClose={false}

4
client/src/components/Datatable/TableCell.js
View File

@@ -46,6 +46,8 @@ export default function TableCell({
);
}
const isRTL = true;
return (
<div
{...cell.getCellProps({
@@ -62,7 +64,7 @@ export default function TableCell({
'cell-inner',
)}
style={{
paddingLeft:
[isRTL ? 'paddingRight' : 'paddingLeft']:
isExpandColumn && expandable
? `${depth * expandColumnSpace}rem`
: '',

10
client/src/components/Datatable/TableNoResultsRow.js
View File

@@ -1,4 +1,5 @@
import React, { useContext } from 'react';
import intl from 'react-intl-universal';
import TableContext from './TableContext';
/**
@@ -6,12 +7,15 @@ import TableContext from './TableContext';
*/
export default function TableNoResultsRow() {
const {
props: { noResults }
props: { noResults },
} = useContext(TableContext);
const noResultText =
noResults || intl.get('there_is_no_results_in_the_table');
return (
<div className={'tr no-results'}>
<div class="td">{ noResults }</div>
<div class="td">{noResultText}</div>
</div>
);
}
}

49
client/src/components/Dragzone.js
View File

@@ -1,7 +1,8 @@
import React, { useState, useCallback, useEffect } from 'react'
import { useDropzone } from 'react-dropzone'
import React, { useState, useCallback, useEffect } from 'react';
import { useDropzone } from 'react-dropzone';
import classNames from 'classnames';
import Icon from 'components/Icon';
import intl from 'react-intl-universal';
// const initialFile: {
// file: ?File,
@@ -11,7 +12,7 @@ import Icon from 'components/Icon';
// };
export default function Dropzone({
text = 'Drag/Drop files here or click here',
text = intl.get('drag_drop_files_here_or_click_here'),
onDrop,
initialFiles = [],
onDeleteFile,
@@ -21,10 +22,10 @@ export default function Dropzone({
const [files, setFiles] = useState([]);
useEffect(() => {
setFiles([ ...initialFiles ]);
setFiles([...initialFiles]);
}, [initialFiles]);
const {getRootProps, getInputProps} = useDropzone({
const { getRootProps, getInputProps } = useDropzone({
accept: 'image/*',
onDrop: (acceptedFiles) => {
const _files = acceptedFiles.map((file) => ({
@@ -33,27 +34,35 @@ export default function Dropzone({
uploaded: false,
}));
setFiles(_files);
}
},
});
const handleRemove = useCallback((index) => {
const deletedFile = files.splice(index, 1);
setFiles([...files]);
onDeleteFile && onDeleteFile(deletedFile);
}, [files, onDeleteFile]);
const handleRemove = useCallback(
(index) => {
const deletedFile = files.splice(index, 1);
setFiles([...files]);
onDeleteFile && onDeleteFile(deletedFile);
},
[files, onDeleteFile],
);
const thumbs = files.map((file, index) => (
<div className={'dropzone-thumb'} key={file.name}>
<div><img src={file.preview} /></div>
<div>
<img src={file.preview} />
</div>
<button onClick={() => handleRemove(index)}>
<Icon icon={'times'} iconSize={12} />
</button>
</div>
));
useEffect(() => () => {
files.forEach(file => URL.revokeObjectURL(file.preview));
}, [files, onDrop]);
useEffect(
() => () => {
files.forEach((file) => URL.revokeObjectURL(file.preview));
},
[files, onDrop],
);
useEffect(() => {
onDrop && onDrop(files);
@@ -61,16 +70,14 @@ export default function Dropzone({
return (
<section className={classNames('dropzone-container', className)}>
{(hint) && <div class="dropzone-hint">{ hint }</div>}
{hint && <div class="dropzone-hint">{hint}</div>}
<div {...getRootProps({ className: 'dropzone' })}>
<input {...getInputProps()} />
<p>{ text }</p>
<p>{text}</p>
</div>
<div className={'dropzone-thumbs'}>
{ thumbs }
</div>
<div className={'dropzone-thumbs'}>{thumbs}</div>
</section>
);
}
}

2
client/src/components/Drawer/DrawerHeaderContent.js
View File

@@ -1,5 +1,5 @@
import React from 'react';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import { Classes, Icon, H4, Button } from '@blueprintjs/core';
import withDrawerActions from 'containers/Drawer/withDrawerActions';

6
client/src/components/DynamicFilter/DynamicFilterCompatatorField.js
View File

@@ -1,17 +1,15 @@
import React, { useMemo } from 'react';
import { HTMLSelect, Classes } from '@blueprintjs/core';
import { useIntl } from 'react-intl';
import intl from 'react-intl-universal';
import { getConditionTypeCompatators } from './DynamicFilterCompatators';
export default function DynamicFilterCompatatorField({
dataType,
...restProps
}) {
const { formatMessage } = useIntl();
const options = useMemo(
() => getConditionTypeCompatators(dataType).map(comp => ({
value: comp.value, label: formatMessage({ id: comp.label_id }),
value: comp.value, label: intl.get(comp.label_id),
})),
[dataType]
);

7
client/src/components/DynamicFilter/DynamicFilterValueField.js
View File

@@ -10,7 +10,8 @@ import { connect } from 'react-redux';
import { useQuery } from 'react-query';
import { DateInput } from '@blueprintjs/datetime';
import classNames from 'classnames';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { debounce } from 'lodash';
import moment from 'moment';
@@ -45,7 +46,7 @@ function DynamicFilterValueField({
onChange,
inputDebounceWait = 250,
}) {
const { formatMessage } = useIntl();
const [localValue, setLocalValue] = useState();
// Makes `localValue` controlled mode from `value`.
@@ -185,7 +186,7 @@ function DynamicFilterValueField({
<Choose.Otherwise>
<InputGroup
placeholder={formatMessage({ id: 'value' })}
placeholder={intl.get('value')}
onChange={handleInputChange}
value={localValue}
/>

15
client/src/components/FilterDropdown.js
View File

@@ -12,7 +12,8 @@ import { isEqual, last } from 'lodash';
import { usePrevious } from 'react-use';
import Icon from 'components/Icon';
import { checkRequiredProperties, uniqueMultiProps } from 'utils';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import {
DynamicFilterValueField,
DynamicFilterCompatatorField,
@@ -41,7 +42,7 @@ export default function FilterDropdown({
initialCondition,
initialConditions,
}) {
const { formatMessage } = useIntl();
// Fields key -> metadata table.
const fieldsKeyMapped = useMemo(() =>
@@ -51,10 +52,10 @@ export default function FilterDropdown({
// Conditions options.
const conditionalsOptions = useMemo(
() => [
{ value: '&&', label: formatMessage({ id: 'and' }) },
{ value: '||', label: formatMessage({ id: 'or' }) },
{ value: '&&', label: intl.get('and') },
{ value: '||', label: intl.get('or') },
],
[formatMessage],
[],
);
// Resources fileds options for fields options.
const resourceFieldsOptions = useMemo(
@@ -91,7 +92,7 @@ export default function FilterDropdown({
if (values.conditions.length >= 12) {
limitToast = Toaster.show(
{
message: formatMessage({ id: 'you_reached_conditions_limit' }),
message: intl.get('you_reached_conditions_limit'),
intent: Intent.WARNING,
},
limitToast,
@@ -102,7 +103,7 @@ export default function FilterDropdown({
defaultFilterCondition
]);
}
}, [values, setFieldValue, formatMessage, defaultFilterCondition]);
}, [values, setFieldValue, defaultFilterCondition]);
// Filtered conditions that filters conditions that don't contain atleast
// on required fields or fileds keys that not exists.

11
client/src/components/FinancialSheet.js
View File

@@ -1,7 +1,8 @@
import React, { useMemo, useCallback } from 'react';
import moment from 'moment';
import classnames from 'classnames';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import 'style/pages/FinancialStatements/FinancialSheet.scss';
@@ -23,7 +24,7 @@ export default function FinancialSheet({
fullWidth = false,
currentDate = true,
}) {
const { formatMessage } = useIntl();
const format = 'DD MMMM YYYY';
const formattedFromDate = useMemo(() => moment(fromDate).format(format), [
fromDate,
@@ -38,10 +39,10 @@ export default function FinancialSheet({
const nameModifer = name ? `financial-sheet--${name}` : '';
const methodsLabels = useMemo(
() => ({
cash: formatMessage({ id: 'cash' }),
accrual: formatMessage({ id: 'accrual' }),
cash: intl.get('cash'),
accrual: intl.get('accrual'),
}),
[formatMessage],
[],
);
const getBasisLabel = useCallback((b) => methodsLabels[b], [methodsLabels]);
const basisLabel = useMemo(() => getBasisLabel(basis), [

9
client/src/components/FormattedMessage.js Normal file
View File

@@ -0,0 +1,9 @@
import intl from 'react-intl-universal';
export function FormattedMessage({ id }) {
return intl.get(id);
}
export function FormattedHTMLMessage({ ...args }) {
return intl.formatHTMLMessage({ ...args })
}

2
client/src/components/ItemsListField.js
View File

@@ -68,7 +68,7 @@ function ItemsListField({
return (
<ListSelect
items={filteredItems}
noResults={<MenuItem disabled={true} text="No results." />}
noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
itemRenderer={itemRenderer}
itemPredicate={filterItem}
popoverProps={{ minimal: true }}

2
client/src/components/ItemsSuggestField.js
View File

@@ -5,7 +5,7 @@ import { CLASSES } from 'common/classes';
import { Suggest } from '@blueprintjs/select';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
export default function ItemsSuggestField({
items,

2
client/src/components/ListSelect.js
View File

@@ -1,7 +1,7 @@
import React, { useState, useMemo, useEffect } from 'react';
import { Button, MenuItem } from '@blueprintjs/core';
import { Select } from '@blueprintjs/select';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from './FormattedMessage';
import classNames from 'classnames';
import { CLASSES } from 'common/classes';

4
client/src/components/NumberFormatDropdown/NumberFormatFields.js
View File

@@ -3,7 +3,7 @@ import { FastField, ErrorMessage } from 'formik';
import { FormGroup, Checkbox, Switch } from '@blueprintjs/core';
import { CLASSES } from 'common/classes';
import { ListSelect } from 'components';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import { inputIntent } from 'utils';
import {
moneyFormat,
@@ -73,7 +73,7 @@ export default function NumberFormatFields({}) {
label={<T id={'money_format'} />}
helperText={<ErrorMessage name="formatMoney" />}
intent={inputIntent({ error, touched })}
className={classNames(CLASSES.FILL)}
className={classNames('form-group--money-format', CLASSES.FILL)}
>
<ListSelect
items={moneyFormat}

2
client/src/components/NumberFormatDropdown/NumberFormatFooter.js
View File

@@ -2,7 +2,7 @@ import React from 'react';
import { useFormikContext } from 'formik';
import { Button, Classes, Intent } from '@blueprintjs/core';
import classNames from 'classnames';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
/**
* Number format footer.

20
client/src/components/Pagination.js
View File

@@ -1,7 +1,8 @@
import React, { useReducer, useEffect } from 'react';
import classNames from 'classnames';
import { Button, ButtonGroup, Intent, HTMLSelect } from '@blueprintjs/core';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import PropTypes from 'prop-types';
import { range } from 'lodash';
import { Icon } from 'components';
@@ -115,7 +116,7 @@ function Pagination({
const page = state.currentPage - 1;
const { size: pageSize } = state;
onPageChange({ page, pageSize });
}}
minimal={true}
@@ -187,7 +188,7 @@ function Pagination({
</div>
<div class="pagination__pagesize-control">
Page size
<T id={'page_size'} />
<HTMLSelect
minimal={true}
options={pageSizesOptions}
@@ -204,14 +205,11 @@ function Pagination({
</div>
<div class="pagination__info">
<T
id={'showing_current_page_to_total'}
values={{
currentPage: state.currentPage,
totalPages: state.totalPages,
total: total,
}}
/>
{intl.get('showing_current_page_to_total', {
currentPage: state.currentPage,
totalPages: state.totalPages,
total: total,
})}
</div>
</div>
);

4
client/src/components/PaymentReceiveListField.js
View File

@@ -1,7 +1,7 @@
import React, { useCallback } from 'react';
import { MenuItem } from '@blueprintjs/core';
import ListSelect from 'components/ListSelect';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
function PaymentReceiveListField({
invoices,
@@ -23,7 +23,7 @@ function PaymentReceiveListField({
return (
<ListSelect
item={invoices}
noResults={<MenuItem disabled={true} text="No results." />}
noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
itemRenderer={handleInvoiceRenderer}
popoverProps={{ minimal: true }}
onItemSelect={onInvoiceSelect}

3
client/src/components/Preferences/PreferencesSidebar.js
View File

@@ -1,6 +1,7 @@
import React from 'react';
import { Menu, MenuItem, MenuDivider } from '@blueprintjs/core';
import { useHistory, useLocation } from 'react-router-dom';
import { FormattedMessage as T } from 'components';
import preferencesMenu from 'config/preferencesMenu';
import PreferencesSidebarContainer from './PreferencesSidebarContainer';
@@ -32,7 +33,7 @@ export default function PreferencesSidebar() {
return (
<PreferencesSidebarContainer>
<div class="preferences-sidebar__head">
<h2>Preferences</h2>
<h2>{<T id={'preferences'} />}</h2>
</div>
<Menu className="preferences-sidebar__menu">{items}</Menu>

25
client/src/components/SalutationList.js
View File

@@ -1,20 +1,27 @@
import React from 'react';
import {
ListSelect,
} from 'components';
import intl from 'react-intl-universal';
export default function SalutationList({
...restProps
}) {
const saluations = ['Mr.', 'Mrs.', 'Ms.', 'Miss', 'Dr.'];
const items = saluations.map((saluation) => ({ key: saluation, label: saluation }));
import { ListSelect } from 'components';
export default function SalutationList({ ...restProps }) {
const saluations = [
intl.get('mr'),
intl.get('mrs'),
intl.get('ms'),
intl.get('miss'),
intl.get('dr'),
];
const items = saluations.map((saluation) => ({
key: saluation,
label: saluation,
}));
return (
<ListSelect
items={items}
selectedItemProp={'key'}
textProp={'label'}
defaultText={'Salutation'}
defaultText={intl.get('salutation')}
filterable={false}
{...restProps}
/>

10
client/src/components/index.js
View File

@@ -3,6 +3,7 @@ import Money from './Money';
import Icon from './Icon';
import Choose from './Utils/Choose';
import For from './Utils/For';
import { FormattedMessage, FormattedHTMLMessage } from './FormattedMessage';
import ListSelect from './ListSelect';
import FinancialStatement from './FinancialStatement';
import DynamicFilterValueField from './DynamicFilter/DynamicFilterValueField';
@@ -58,14 +59,19 @@ import MaterialProgressBar from './MaterialProgressBar';
const Hint = FieldHint;
const T = FormattedMessage;
export {
If,
For,
Money,
Choose,
Icon,
FormattedMessage,
FormattedHTMLMessage,
T,
Money,
ListSelect,
FinancialStatement,
Choose,
DynamicFilterValueField,
DynamicFilterCompatatorField,
MODIFIER,

135
client/src/config/financialReportsMenu.js
View File

@@ -1,47 +1,56 @@
import React from 'react';
import { FormattedMessage as T } from 'components';
export const financialReportMenus = [
{
sectionTitle: 'Financial Accounting',
sectionTitle: <T id={'financial_accounting'} />,
reports: [
{
title: 'Balance Sheet Report',
desc:
"Reports a company's assets, liabilities and shareholders' equity at a specific point in time with comparison period(s).",
title: <T id={'balance_sheet_report'} />,
desc: (
<T id={'reports_a_company_s_assets_liabilities_and_shareholders'} />
),
link: '/financial-reports/balance-sheet',
},
{
title: 'Trial Balance Sheet',
desc:
'Summarizes the credit and debit balance of each account in your chart of accounts at a specific point in time.',
title: <T id={'trial_balance_sheet'} />,
desc: (
<T id={'summarizes_the_credit_and_debit_balance_of_each_account'} />
),
link: '/financial-reports/trial-balance-sheet',
},
{
title: 'Journal Report',
desc:
'The debit and credit entries of system transactions, sorted by date.',
link: '/financial-reports/journal-sheet',
},
{
title: 'Profit/Loss Report',
desc:
'Reports the revenues, costs and expenses incurred during a specific point in time with comparison period(s).',
title: <T id={'profit_loss_report'} />,
desc: <T id={'reports_the_revenues_costs_and_expenses'} />,
link: '/financial-reports/profit-loss-sheet',
},
{
title: 'General Ledger Report',
desc:
'Reports every transaction going in and out of your accounts and organized by accounts and date to monitoring activity of accounts.',
title: <T id={'cash_flow_statement'} />,
desc: (
<T id={'reports_inflow_and_outflow_of_cash_and_cash_equivalents'} />
),
link: '/financial-reports/cash-flow',
},
{
title: <T id={'journal_report'} />,
desc: <T id={'the_debit_and_credit_entries_of_system_transactions'} />,
link: '/financial-reports/journal-sheet',
},
{
title: <T id={'general_ledger_report'} />,
desc: <T id={'reports_every_transaction_going_in_and_out_of_your'} />,
link: '/financial-reports/general-ledger',
},
{
title: 'Receivable Aging Summary',
desc:
'Summarize total unpaid balances of customers invoices with number of days the unpaid invoice is overdue.',
title: <T id={'receivable_aging_summary'} />,
desc: (
<T id={'summarize_total_unpaid_balances_of_customers_invoices'} />
),
link: '/financial-reports/receivable-aging-summary',
},
{
title: 'Payable Aging Summary',
desc:
'Summarize total unpaid balances of vendors purchase invoices with the number of days the unpaid invoice is overdue.',
title: <T id={'payable_aging_summary'} />,
desc: <T id={'summarize_total_unpaid_balances_of_vendors_purchase'} />,
link: '/financial-reports/payable-aging-summary',
},
],
@@ -50,46 +59,86 @@ export const financialReportMenus = [
export const SalesAndPurchasesReportMenus = [
{
sectionTitle: 'Sales/Purchases Reports',
sectionTitle: <T id={'sales_purchases_reports'} />,
reports: [
{
title: 'Purchases By Items',
desc:
'Shows the average age of unresolved issues for a project or filter. This helps you see whether your backlog is being kept up to date.',
title: <T id={'purchases_by_items'} />,
desc: (
<T
id={
'summarize_the_business_s_purchase_items_quantity_cost_and_average'
}
/>
),
link: '/financial-reports/purchases-by-items',
},
{
title: 'Sales By Items',
desc:
'Summarize the business’s sold items quantity, income and average income rate of each item during a specific point in time.',
title: <T id={'sales_by_items'} />,
desc: (
<T
id={
'summarize_the_business_s_sold_items_quantity_income_and_average_income_rate'
}
/>
),
link: '/financial-reports/sales-by-items',
},
{
title: 'Inventory valuation',
desc:
'Summarize the business’s purchase items quantity, cost and average cost rate of each item during a specific point in time.',
title: <T id={'inventory_valuation'} />,
desc: (
<T
id={
'summarize_the_business_s_purchase_items_quantity_cost_and_average'
}
/>
),
link: '/financial-reports/inventory-valuation',
},
{
title: 'Customers Balance summary',
desc: 'Summerize the total amount of each customer owes your business.',
title: <T id={'customers_balance_summary'} />,
desc: (
<T
id={
'summerize_the_total_amount_of_each_customer_owes_your_business'
}
/>
),
link: '/financial-reports/customers-balance-summary',
},
{
title: 'Vendors Balance summary',
desc: 'Summerize the total amount your business owes each vendor.',
title: <T id={'vendors_balance_summary'} />,
desc: (
<T id={'summerize_the_total_amount_your_business_owes_each_vendor'} />
),
link: '/financial-reports/vendors-balance-summary',
},
{
title: 'Customers Transactions',
desc: 'Reports every transaction going in and out of each customer.',
title: <T id={'customers_transactions'} />,
desc: (
<T
id={'reports_every_transaction_going_in_and_out_of_each_customer'}
/>
),
link: '/financial-reports/transactions-by-customers',
},
{
title: 'Vendors Transactions',
desc: 'Reports every transaction going in and out of each vendor/supplier.',
title: <T id={'vendors_transactions'} />,
desc: (
<T
id={
'reports_every_transaction_going_in_and_out_of_each_vendor_supplier'
}
/>
),
link: '/financial-reports/transactions-by-vendors',
},
{
title: <T id={'inventory_item_details'} />,
desc: (
<T id={'reports_every_transaction_going_in_and_out_of_your_items'} />
),
link: '/financial-reports/inventory-item-details',
},
],
},
];

17
client/src/config/footerLinks.js
View File

@@ -1,29 +1,28 @@
import intl from 'react-intl-universal';
export default [
export const getFooterLinks = () => [
{
title: 'Blog',
title: intl.get('blog'),
link: '#',
},
{
title: 'Support',
title: intl.get('support'),
link: '#',
},
{
title: 'Status',
title: intl.get('service_status'),
link: '#',
},
{
title: 'Pricing',
title: intl.get('pricing'),
link: '#',
},
{
title: 'Solution Partner Program',
title: intl.get('reseller_partner'),
link: '#',
},
{
title: 'Docs',
title: intl.get('docs'),
link: '#',
},
{

2
client/src/config/preferencesMenu.js
View File

@@ -1,5 +1,5 @@
import React from 'react'
import { FormattedMessage as T} from 'react-intl';
import { FormattedMessage as T } from 'components';
export default [
{

10
client/src/config/sidebarMenu.js
View File

@@ -1,5 +1,5 @@
import React from 'react';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
export default [
{
@@ -9,14 +9,14 @@ export default [
matchExact: true,
},
{
text: 'Sales & inventory',
text: <T id={'sales_inventory'} />,
label: true,
},
{
text: <T id={'items'} />,
children: [
{
text: <T id={'items_list'} />,
text: <T id={'items'} />,
href: '/items',
},
{
@@ -67,7 +67,7 @@ export default [
newTabHref: '/bills/new',
},
{
text: <T id={'payment_made'} />,
text: <T id={'payment_mades'} />,
href: '/payment-mades',
newTabHref: '/payment-mades/new',
},
@@ -100,7 +100,7 @@ export default [
href: '/accounts',
},
{
text: <T id={'manual_journal'} />,
text: <T id={'manual_journals'} />,
href: '/manual-journals',
},
{

8
client/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.js
View File

@@ -12,7 +12,7 @@ import {
} from '@blueprintjs/core';
import classNames from 'classnames';
import { useHistory } from 'react-router-dom';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import { useManualJournalsContext } from './ManualJournalsListProvider';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
@@ -42,9 +42,7 @@ function ManualJournalActionsBar({
};
// Handle delete button click.
const handleBulkDelete = () => {
};
const handleBulkDelete = () => {};
// Handle tab change.
const handleTabChange = (customView) => {
@@ -77,7 +75,7 @@ function ManualJournalActionsBar({
className={classNames(Classes.MINIMAL, 'button--filter', {
'has-active-filters': false,
})}
text="Filter"
text={<T id={'filter'} />}
icon={<Icon icon="filter-16" iconSize={16} />}
/>
</Popover>

10
client/src/containers/Accounting/JournalsLanding/ManualJournalsEmptyStatus.js
View File

@@ -2,17 +2,17 @@ import React from 'react';
import { Button, Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom';
import { EmptyStatus } from 'components';
import { FormattedMessage as T } from 'components';
export default function ManualJournalsEmptyStatus() {
const history = useHistory();
return (
<EmptyStatus
title={'Create your first journal entries on accounts chart.'}
title={<T id={'create_your_first_journal_entries_on_accounts_chart'} />}
description={
<p>
It is a long established fact that a reader will be distracted by the
readable content of a page when looking at its layout.
<T id={'it_is_a_long_established_fact_that_a_reader'} />
</p>
}
action={
@@ -24,11 +24,11 @@ export default function ManualJournalsEmptyStatus() {
history.push('/make-journal-entry');
}}
>
Make journal
<T id={'make_journal'} />
</Button>
<Button intent={Intent.NONE} large={true}>
Learn more
<T id={'learn_more'} />
</Button>
</>
}

12
client/src/containers/Accounting/JournalsLanding/components.js
View File

@@ -11,11 +11,11 @@ import {
MenuDivider,
Popover,
} from '@blueprintjs/core';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import moment from 'moment';
import { Choose, Money, If, Icon } from 'components';
import { safeCallback } from 'utils';
import { formatMessage } from 'services/intl';
import intl from 'react-intl-universal';
/**
* Amount accessor.
@@ -155,24 +155,24 @@ export const ActionsMenu = ({
<Menu>
<MenuItem
icon={<Icon icon="reader-18" />}
text={formatMessage({ id: 'view_details' })}
text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)}
/>
<MenuDivider />
<If condition={!original.is_published}>
<MenuItem
icon={<Icon icon="arrow-to-top" />}
text={formatMessage({ id: 'publish_journal' })}
text={intl.get('publish_journal')}
onClick={safeCallback(onPublish, original)}
/>
</If>
<MenuItem
icon={<Icon icon="pen-18" />}
text={formatMessage({ id: 'edit_journal' })}
text={intl.get('edit_journal')}
onClick={safeCallback(onEdit, original)}
/>
<MenuItem
text={formatMessage({ id: 'delete_journal' })}
text={intl.get('delete_journal')}
icon={<Icon icon="trash-16" iconSize={16} />}
intent={Intent.DANGER}
onClick={safeCallback(onDelete, original)}

16
client/src/containers/Accounting/JournalsLanding/utils.js
View File

@@ -1,5 +1,5 @@
import React from 'react';
import { formatMessage } from 'services/intl';
import intl from 'react-intl-universal';
import moment from 'moment';
import {
NoteAccessor,
@@ -16,42 +16,42 @@ export const useManualJournalsColumns = () => {
() => [
{
id: 'date',
Header: formatMessage({ id: 'date' }),
Header: intl.get('date'),
accessor: DateAccessor,
width: 115,
className: 'date',
},
{
id: 'amount',
Header: formatMessage({ id: 'amount' }),
Header: intl.get('amount'),
accessor: AmountAccessor,
className: 'amount',
width: 115,
},
{
id: 'journal_number',
Header: formatMessage({ id: 'journal_no' }),
Header: intl.get('journal_no'),
accessor: (row) => `#${row.journal_number}`,
className: 'journal_number',
width: 100,
},
{
id: 'journal_type',
Header: formatMessage({ id: 'journal_type' }),
Header: intl.get('journal_type'),
accessor: 'journal_type',
width: 110,
className: 'journal_type',
},
{
id: 'status',
Header: formatMessage({ id: 'publish' }),
Header: intl.get('publish'),
accessor: (row) => StatusAccessor(row),
width: 95,
className: 'status',
},
{
id: 'note',
Header: formatMessage({ id: 'note' }),
Header: intl.get('note'),
accessor: NoteAccessor,
disableSortBy: true,
width: 85,
@@ -59,7 +59,7 @@ export const useManualJournalsColumns = () => {
},
{
id: 'created_at',
Header: formatMessage({ id: 'created_at' }),
Header: intl.get('created_at'),
accessor: (r) => moment(r.created_at).format('YYYY MMM DD'),
width: 125,
className: 'created_at',

8
client/src/containers/Accounting/MakeJournal/MakeJournalEntries.schema.js
View File

@@ -1,5 +1,5 @@
import * as Yup from 'yup';
import { formatMessage } from 'services/intl';
import intl from 'react-intl-universal';
import { DATATYPES_LENGTH } from 'common/dataTypes';
const Schema = Yup.object().shape({
@@ -7,15 +7,15 @@ const Schema = Yup.object().shape({
.required()
.min(1)
.max(DATATYPES_LENGTH.STRING)
.label(formatMessage({ id: 'journal_number_' })),
.label(intl.get('journal_number_')),
journal_type: Yup.string()
.required()
.min(1)
.max(DATATYPES_LENGTH.STRING)
.label(formatMessage({ id: 'journal_type' })),
.label(intl.get('journal_type')),
date: Yup.date()
.required()
.label(formatMessage({ id: 'date' })),
.label(intl.get('date')),
currency_code: Yup.string().max(3),
publish: Yup.boolean(),
reference: Yup.string().nullable().min(1).max(DATATYPES_LENGTH.STRING),

2
client/src/containers/Accounting/MakeJournal/MakeJournalEntriesFooter.js
View File

@@ -9,7 +9,7 @@ import {
Menu,
MenuItem,
} from '@blueprintjs/core';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import { useFormikContext } from 'formik';
import { CLASSES } from 'common/classes';
import classNames from 'classnames';

21
client/src/containers/Accounting/MakeJournal/MakeJournalEntriesForm.js
View File

@@ -1,7 +1,7 @@
import React, { useMemo } from 'react';
import { Formik, Form } from 'formik';
import { Intent } from '@blueprintjs/core';
import { useIntl } from 'react-intl';
import intl from 'react-intl-universal';
import { defaultTo, isEmpty, omit } from 'lodash';
import classNames from 'classnames';
import { useHistory } from 'react-router-dom';
@@ -48,7 +48,6 @@ function MakeJournalEntriesForm({
submitPayload,
} = useMakeJournalFormContext();
const { formatMessage } = useIntl();
const history = useHistory();
// New journal number.
@@ -92,18 +91,14 @@ function MakeJournalEntriesForm({
// Validate the total credit should be eqials total debit.
if (totalCredit !== totalDebit) {
AppToaster.show({
message: formatMessage({
id: 'should_total_of_credit_and_debit_be_equal',
}),
message: intl.get('should_total_of_credit_and_debit_be_equal'),
intent: Intent.DANGER,
});
setSubmitting(false);
return;
} else if (totalCredit === 0 || totalDebit === 0) {
AppToaster.show({
message: formatMessage({
id: 'amount_cannot_be_zero_or_empty',
}),
message: intl.get('amount_cannot_be_zero_or_empty'),
intent: Intent.DANGER,
});
setSubmitting(false);
@@ -131,12 +126,10 @@ function MakeJournalEntriesForm({
// Handle the request success.
const handleSuccess = (errors) => {
AppToaster.show({
message: formatMessage(
{
id: isNewMode
? 'the_journal_has_been_created_successfully'
: 'the_journal_has_been_edited_successfully',
},
message: intl.get(
isNewMode
? 'the_journal_has_been_created_successfully'
: 'the_journal_has_been_edited_successfully',
{ number: values.journal_number },
),
intent: Intent.SUCCESS,

3
client/src/containers/Accounting/MakeJournal/MakeJournalEntriesHeader.js
View File

@@ -2,6 +2,7 @@ import React from 'react';
import classNames from 'classnames';
import { useFormikContext } from 'formik';
import { CLASSES } from 'common/classes';
import { FormattedMessage as T } from 'components';
import MakeJournalEntriesHeaderFields from './MakeJournalEntriesHeaderFields';
import { PageFormBigNumber } from 'components';
import { safeSumBy } from 'utils';
@@ -20,7 +21,7 @@ export default function MakeJournalEntriesHeader() {
<MakeJournalEntriesHeaderFields />
<PageFormBigNumber
label={'Due Amount'}
label={<T id={'amount'} />}
amount={total}
currencyCode={currency_code}
/>

6
client/src/containers/Accounting/MakeJournal/MakeJournalEntriesHeaderFields.js
View File

@@ -7,7 +7,7 @@ import {
} from '@blueprintjs/core';
import { FastField, ErrorMessage } from 'formik';
import { DateInput } from '@blueprintjs/datetime';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import classNames from 'classnames';
import { CLASSES } from 'common/classes';
@@ -131,7 +131,9 @@ function MakeJournalEntriesHeader({
}}
tooltip={true}
tooltipProps={{
content: 'Setting your auto-generated journal number',
content: (
<T id={'setting_your_auto_generated_journal_number'} />
),
position: Position.BOTTOM_LEFT,
}}
/>

2
client/src/containers/Accounting/MakeJournal/MakeJournalFormFloatingActions.js
View File

@@ -11,7 +11,7 @@ import {
} from '@blueprintjs/core';
import { useFormikContext } from 'formik';
import classNames from 'classnames';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import { CLASSES } from 'common/classes';
import { Icon, If } from 'components';
import { useHistory } from 'react-router-dom';

6
client/src/containers/Accounting/MakeJournal/MakeJournalFormFooter.js
View File

@@ -3,7 +3,7 @@ import { FastField } from 'formik';
import classNames from 'classnames';
import { CLASSES } from 'common/classes';
import { FormGroup, TextArea } from '@blueprintjs/core';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import { Postbox, ErrorMessage, Row, Col } from 'components';
import Dragzone from 'components/Dragzone';
import { inputIntent } from 'utils';
@@ -11,7 +11,7 @@ import { inputIntent } from 'utils';
export default function MakeJournalFormFooter() {
return (
<div className={classNames(CLASSES.PAGE_FORM_FOOTER)}>
<Postbox title={'Journal details'} defaultOpen={false}>
<Postbox title={<T id={'journal_details'} />} defaultOpen={false}>
<Row>
<Col md={8}>
<FastField name={'description'}>
@@ -34,7 +34,7 @@ export default function MakeJournalFormFooter() {
initialFiles={[]}
// onDrop={handleDropFiles}
// onDeleteFile={handleDeleteFile}
hint={'Attachments: Maxiumum size: 20MB'}
hint={<T id={'attachments_maximum'} />}
/>
</Col>
</Row>

20
client/src/containers/Accounting/MakeJournal/components.js
View File

@@ -1,8 +1,8 @@
import React from 'react';
import { Intent, Position, Button, Tooltip } from '@blueprintjs/core';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import { Icon, Money, Hint } from 'components';
import { formatMessage } from 'services/intl';
import intl from 'react-intl-universal';
import {
AccountsListFieldCell,
MoneyFieldCell,
@@ -30,21 +30,25 @@ export function ContactHeaderCell() {
* Credit header cell.
*/
export function CreditHeaderCell({ payload: { currencyCode } }) {
return formatMessage({ id: 'credit_currency' }, { currency: currencyCode });
return intl.get('credit_currency', { currency: currencyCode });
}
/**
* debit header cell.
*/
export function DebitHeaderCell({ payload: { currencyCode } }) {
return formatMessage({ id: 'debit_currency' }, { currency: currencyCode });
return intl.get('debit_currency', { currency: currencyCode });
}
/**
* Account footer cell.
*/
function AccountFooterCell({ payload: { currencyCode } }) {
return <span>{`Total ${currencyCode} `}</span>;
return (
<span>
{intl.get('total_currency', { currency: currencyCode })}
</span>
);
}
/**
@@ -116,7 +120,7 @@ export const useJournalTableEntriesColumns = () => {
sticky: 'left',
},
{
Header: formatMessage({ id: 'account' }),
Header: intl.get('account'),
id: 'account_id',
accessor: 'account_id',
Cell: AccountsListFieldCell,
@@ -153,7 +157,7 @@ export const useJournalTableEntriesColumns = () => {
width: 120,
},
{
Header: formatMessage({ id: 'note' }),
Header: intl.get('note'),
accessor: 'note',
Cell: InputGroupCell,
disableSortBy: true,
@@ -170,6 +174,6 @@ export const useJournalTableEntriesColumns = () => {
width: 45,
},
],
[formatMessage],
[],
);
};

16
client/src/containers/Accounting/MakeJournal/utils.js
View File

@@ -10,7 +10,7 @@ import {
transformToForm,
} from 'utils';
import { AppToaster } from 'components';
import { formatMessage } from 'services/intl';
import intl from 'react-intl-universal';
import { useFormikContext } from 'formik';
const ERROR = {
@@ -118,23 +118,19 @@ export const transformErrors = (resErrors, { setErrors, errors }) => {
if ((error = getError(ERROR.RECEIVABLE_ENTRIES_HAS_NO_CUSTOMERS))) {
toastMessages.push(
formatMessage({
id: 'should_select_customers_with_entries_have_receivable_account',
}),
intl.get('should_select_customers_with_entries_have_receivable_account'),
);
setEntriesErrors(error.indexes, 'contact_id', 'error');
}
if ((error = getError(ERROR.ENTRIES_SHOULD_ASSIGN_WITH_CONTACT))) {
if (error.meta.find(meta => meta.contact_type === 'customer')) {
toastMessages.push(
formatMessage({
id: 'receivable_accounts_should_assign_with_customers',
}),
intl.get('receivable_accounts_should_assign_with_customers'),
);
}
if (error.meta.find(meta => meta.contact_type === 'vendor')) {
toastMessages.push(
formatMessage({ id: 'payable_accounts_should_assign_with_vendors' }),
intl.get('payable_accounts_should_assign_with_vendors'),
);
}
const indexes = error.meta.map((meta => meta.indexes)).flat();
@@ -144,9 +140,7 @@ export const transformErrors = (resErrors, { setErrors, errors }) => {
newErrors = setWith(
newErrors,
'journal_number',
formatMessage({
id: 'journal_number_is_already_used',
}),
intl.get('journal_number_is_already_used'),
);
}
setErrors({ ...newErrors });

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

@@ -12,7 +12,8 @@ import {
Intent,
} from '@blueprintjs/core';
import classNames from 'classnames';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { If, DashboardActionViewsList } from 'components';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
@@ -104,7 +105,7 @@ function AccountsActionsBar({
true ? (
<T id={'filter'} />
) : (
<T id={'count_filters_applied'} values={{ count: 0 }} />
intl.get('count_filters_applied', { count: 0 })
)
}
icon={<Icon icon="filter-16" iconSize={16} />}
@@ -159,5 +160,5 @@ export default compose(
withAccounts(({ accountsSelectedRows }) => ({
accountsSelectedRows,
})),
withAccountsTableActions
withAccountsTableActions,
)(AccountsActionsBar);

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

@@ -1,6 +1,8 @@
import React, { useMemo, useCallback } from 'react';
import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core';
import { pick } from 'lodash';
import intl from 'react-intl-universal';
import { DashboardViewsTabs } from 'components';
import { useAccountsChartContext } from 'containers/Accounts/AccountsChartProvider';
@@ -45,7 +47,7 @@ function AccountsViewsTabs({
<Navbar className="navbar--dashboard-views">
<NavbarGroup align={Alignment.LEFT}>
<DashboardViewsTabs
defaultTabText={'All Accounts'}
defaultTabText={intl.get('all_accounts_')}
currentViewId={accountsCustomViewId}
resourceName={'accounts'}
onChange={handleTabChange}

18
client/src/containers/Accounts/components.js
View File

@@ -10,9 +10,8 @@ import {
Popover,
Button,
} from '@blueprintjs/core';
import { useIntl } from 'react-intl';
import { Icon, Money, If } from 'components';
import { formatMessage } from 'services/intl';
import intl from 'react-intl-universal';
import { safeCallback } from 'utils';
/**
@@ -34,37 +33,37 @@ export function ActionsMenu({
<Menu>
<MenuItem
icon={<Icon icon="reader-18" />}
text={formatMessage({ id: 'view_details' })}
text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)}
/>
<MenuDivider />
<MenuItem
icon={<Icon icon="pen-18" />}
text={formatMessage({ id: 'edit_account' })}
text={intl.get('edit_account')}
onClick={safeCallback(onEdit, original)}
/>
<MenuItem
icon={<Icon icon="plus" />}
text={formatMessage({ id: 'new_child_account' })}
text={intl.get('new_child_account')}
onClick={safeCallback(onNewChild, original)}
/>
<MenuDivider />
<If condition={original.active}>
<MenuItem
text={formatMessage({ id: 'inactivate_account' })}
text={intl.get('inactivate_account')}
icon={<Icon icon="pause-16" iconSize={16} />}
onClick={safeCallback(onInactivate, original)}
/>
</If>
<If condition={!original.active}>
<MenuItem
text={formatMessage({ id: 'activate_account' })}
text={intl.get('activate_account')}
icon={<Icon icon="play-16" iconSize={16} />}
onClick={safeCallback(onActivate, original)}
/>
</If>
<MenuItem
text={formatMessage({ id: 'delete_account' })}
text={intl.get('delete_account')}
icon={<Icon icon="trash-16" iconSize={16} />}
intent={Intent.DANGER}
onClick={safeCallback(onDelete, original)}
@@ -77,7 +76,6 @@ export function ActionsMenu({
* Normal cell.
*/
export function NormalCell({ cell: { value } }) {
const { formatMessage } = useIntl();
const arrowDirection = value === 'credit' ? 'down' : 'up';
// Can't continue if the value is not `credit` or `debit`.
@@ -87,7 +85,7 @@ export function NormalCell({ cell: { value } }) {
return (
<Tooltip
className={Classes.TOOLTIP_INDICATOR}
content={formatMessage({ id: value })}
content={intl.get(value)}
position={Position.RIGHT}
hoverOpenDelay={100}
>

22
client/src/containers/Accounts/utils.js
View File

@@ -1,7 +1,7 @@
import React from 'react';
import { Intent, Tag } from '@blueprintjs/core';
import { If, AppToaster } from 'components';
import { formatMessage } from 'services/intl';
import intl from 'react-intl-universal';
import { NormalCell, BalanceCell } from './components';
import { isBlank, compose } from 'utils';
@@ -25,17 +25,13 @@ export const accountNameAccessor = (account) => {
export const handleDeleteErrors = (errors) => {
if (errors.find((e) => e.type === 'ACCOUNT.PREDEFINED')) {
AppToaster.show({
message: formatMessage({
id: 'you_could_not_delete_predefined_accounts',
}),
message: intl.get('you_could_not_delete_predefined_accounts'),
intent: Intent.DANGER,
});
}
if (errors.find((e) => e.type === 'ACCOUNT.HAS.ASSOCIATED.TRANSACTIONS')) {
AppToaster.show({
message: formatMessage({
id: 'cannot_delete_account_has_associated_transactions',
}),
message: intl.get('cannot_delete_account_has_associated_transactions'),
intent: Intent.DANGER,
});
}
@@ -56,28 +52,28 @@ export const useAccountsTableColumns = () => {
() => [
{
id: 'name',
Header: formatMessage({ id: 'account_name' }),
Header: intl.get('account_name'),
accessor: 'name',
className: 'account_name',
width: 200,
},
{
id: 'code',
Header: formatMessage({ id: 'code' }),
Header: intl.get('code'),
accessor: AccountCodeAccessor,
className: 'code',
width: 80,
},
{
id: 'type',
Header: formatMessage({ id: 'type' }),
Header: intl.get('type'),
accessor: 'account_type_label',
className: 'type',
width: 140,
},
{
id: 'normal',
Header: formatMessage({ id: 'normal' }),
Header: intl.get('account_normal'),
Cell: NormalCell,
accessor: 'account_normal',
className: 'normal',
@@ -85,13 +81,13 @@ export const useAccountsTableColumns = () => {
},
{
id: 'currency',
Header: formatMessage({ id: 'currency' }),
Header: intl.get('currency'),
accessor: 'currency_code',
width: 75,
},
{
id: 'balance',
Header: formatMessage({ id: 'balance' }),
Header: intl.get('balance'),
accessor: 'amount',
Cell: BalanceCell,
width: 150,

10
client/src/containers/Alerts/AccountActivateAlert.js
View File

@@ -1,7 +1,7 @@
import React from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
import { AppToaster, FormattedMessage as T } from 'components';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
@@ -20,7 +20,7 @@ function AccountActivateAlert({
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const {
mutateAsync: activateAccount,
isLoading
@@ -35,9 +35,7 @@ function AccountActivateAlert({
const handleConfirmAccountActivate = () => {
activateAccount(accountId).then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_account_has_been_successfully_activated',
}),
message: intl.get('the_account_has_been_successfully_activated'),
intent: Intent.SUCCESS,
});
closeAlert('account-activate');

13
client/src/containers/Alerts/AccountBulkActivateAlert.js
View File

@@ -1,8 +1,8 @@
import React, { useState } from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { queryCache } from 'react-query';
import { AppToaster } from 'components';
import { FormattedMessage as T, AppToaster } from 'components';
import withAccountsActions from 'containers/Accounts/withAccountsActions';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
@@ -20,7 +20,6 @@ function AccountBulkActivateAlert({
requestBulkActivateAccounts,
}) {
const { formatMessage } = useIntl();
const [isLoading, setLoading] = useState(false);
const selectedRowsCount = 0;
@@ -35,9 +34,7 @@ function AccountBulkActivateAlert({
requestBulkActivateAccounts(accountsIds)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_accounts_has_been_successfully_activated',
}),
message: intl.get('the_accounts_has_been_successfully_activated'),
intent: Intent.SUCCESS,
});
queryCache.invalidateQueries('accounts-table');
@@ -52,9 +49,7 @@ function AccountBulkActivateAlert({
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={`${formatMessage({
id: 'activate',
})} (${selectedRowsCount})`}
confirmButtonText={`${intl.get('activate')} (${selectedRowsCount})`}
intent={Intent.WARNING}
isOpen={isOpen}
onCancel={handleClose}

13
client/src/containers/Alerts/AccountBulkDeleteAlert.js
View File

@@ -1,5 +1,6 @@
import React, { useState } from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { queryCache } from 'react-query';
import { AppToaster } from 'components';
@@ -29,7 +30,7 @@ function AccountBulkDeleteAlert({
// #withAccountsActions
requestDeleteBulkAccounts,
}) {
const { formatMessage } = useIntl();
const [isLoading, setLoading] = useState(false);
const selectedRowsCount = 0;
@@ -43,9 +44,7 @@ function AccountBulkDeleteAlert({
requestDeleteBulkAccounts(accountsIds)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_accounts_has_been_successfully_deleted',
}),
message: intl.get('the_accounts_has_been_successfully_deleted'),
intent: Intent.SUCCESS,
});
queryCache.invalidateQueries('accounts-table');
@@ -62,9 +61,7 @@ function AccountBulkDeleteAlert({
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={`${formatMessage({
id: 'delete',
})} (${selectedRowsCount})`}
confirmButtonText={`${intl.get('delete')} (${selectedRowsCount})`}
icon="trash"
intent={Intent.DANGER}
isOpen={isOpen}

13
client/src/containers/Alerts/AccountBulkInactivateAlert.js
View File

@@ -1,5 +1,6 @@
import React, { useState } from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { queryCache } from 'react-query';
import { AppToaster } from 'components';
@@ -20,7 +21,7 @@ function AccountBulkInactivateAlert({
closeAlert,
}) {
const { formatMessage } = useIntl();
const [isLoading, setLoading] = useState(false);
const selectedRowsCount = 0;
@@ -34,9 +35,7 @@ function AccountBulkInactivateAlert({
requestBulkInactiveAccounts(accountsIds)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_accounts_have_been_successfully_inactivated',
}),
message: intl.get('the_accounts_have_been_successfully_inactivated'),
intent: Intent.SUCCESS,
});
queryCache.invalidateQueries('accounts-table');
@@ -51,9 +50,7 @@ function AccountBulkInactivateAlert({
return (
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={`${formatMessage({
id: 'inactivate',
})} (${selectedRowsCount})`}
confirmButtonText={`${intl.get('inactivate')} (${selectedRowsCount})`}
intent={Intent.WARNING}
isOpen={isOpen}
onCancel={handleCancel}

13
client/src/containers/Alerts/AccountDeleteAlert.js
View File

@@ -1,10 +1,8 @@
import React from 'react';
import {
FormattedMessage as T,
FormattedHTMLMessage,
useIntl,
} from 'react-intl';
import intl from 'react-intl-universal';
import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
import { handleDeleteErrors } from 'containers/Accounts/utils';
@@ -28,7 +26,6 @@ function AccountDeleteAlert({
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const { isLoading, mutateAsync: deleteAccount } = useDeleteAccount();
// handle cancel delete account alert.
@@ -40,9 +37,7 @@ function AccountDeleteAlert({
deleteAccount(accountId)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_account_has_been_successfully_deleted',
}),
message: intl.get('the_account_has_been_successfully_deleted'),
intent: Intent.SUCCESS,
});
closeAlert(name);

9
client/src/containers/Alerts/AccountInactivateAlert.js
View File

@@ -1,5 +1,6 @@
import React from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
@@ -22,7 +23,7 @@ function AccountInactivateAlert({
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const {
mutateAsync: inactivateAccount,
isLoading
@@ -35,9 +36,7 @@ function AccountInactivateAlert({
const handleConfirmAccountActive = () => {
inactivateAccount(accountId).then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_account_has_been_successfully_inactivated',
}),
message: intl.get('the_account_has_been_successfully_inactivated'),
intent: Intent.SUCCESS,
});
}).catch(() => {

9
client/src/containers/Alerts/Bills/BillDeleteAlert.js
View File

@@ -1,5 +1,6 @@
import React from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
@@ -23,7 +24,7 @@ function BillDeleteAlert({
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const { isLoading, mutateAsync: deleteBillMutate } = useDeleteBill();
// Handle cancel Bill
@@ -36,9 +37,7 @@ function BillDeleteAlert({
deleteBillMutate(billId)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_bill_has_been_deleted_successfully',
}),
message: intl.get('the_bill_has_been_deleted_successfully'),
intent: Intent.SUCCESS,
});
})

9
client/src/containers/Alerts/Bills/BillOpenAlert.js
View File

@@ -1,5 +1,6 @@
import React from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
@@ -22,7 +23,7 @@ function BillOpenAlert({
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const { isLoading, mutateAsync: openBillMutate } = useOpenBill();
// Handle cancel open bill alert.
@@ -35,9 +36,7 @@ function BillOpenAlert({
openBillMutate(billId)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_bill_has_been_opened_successfully',
}),
message: intl.get('the_bill_has_been_opened_successfully'),
intent: Intent.SUCCESS,
});
closeAlert(name);

14
client/src/containers/Alerts/Currencies/CurrencyDeleteAlert.js
View File

@@ -1,10 +1,8 @@
import React from 'react';
import {
FormattedMessage as T,
FormattedHTMLMessage,
useIntl,
} from 'react-intl';
import intl from 'react-intl-universal';
import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
import { useDeleteCurrency } from 'hooks/query';
@@ -27,7 +25,7 @@ function CurrencyDeleteAlert({
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const { mutateAsync: deleteCurrency, isLoading } = useDeleteCurrency();
// handle cancel delete currency alert.
@@ -38,9 +36,7 @@ function CurrencyDeleteAlert({
deleteCurrency(currency_code)
.then((response) => {
AppToaster.show({
message: formatMessage({
id: 'the_currency_has_been_deleted_successfully',
}),
message: intl.get('the_currency_has_been_deleted_successfully'),
intent: Intent.SUCCESS,
});
closeAlert(name);

11
client/src/containers/Alerts/Customers/CustomerBulkDeleteAlert.js
View File

@@ -1,5 +1,6 @@
import React, { useCallback, useState } from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
import { transformErrors } from 'containers/Customers/utils';
@@ -22,7 +23,7 @@ function CustomerBulkDeleteAlert({
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const [isLoading, setLoading] = useState(false);
// handle cancel delete alert.
@@ -38,9 +39,7 @@ function CustomerBulkDeleteAlert({
requestDeleteBulkCustomers(customersIds)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_customers_has_been_deleted_successfully',
}),
message: intl.get('the_customers_has_been_deleted_successfully'),
intent: Intent.SUCCESS,
});
})
@@ -51,7 +50,7 @@ function CustomerBulkDeleteAlert({
setLoading(false);
closeAlert(name);
});
}, [requestDeleteBulkCustomers, customersIds, formatMessage]);
}, [requestDeleteBulkCustomers, customersIds]);
return (
<Alert

15
client/src/containers/Alerts/Customers/CustomerDeleteAlert.js
View File

@@ -1,9 +1,6 @@
import React, { useCallback } from 'react';
import {
FormattedMessage as T,
FormattedHTMLMessage,
useIntl,
} from 'react-intl';
import intl from 'react-intl-universal';
import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
import { transformErrors } from 'containers/Customers/utils';
@@ -28,7 +25,7 @@ function CustomerDeleteAlert({
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const {
mutateAsync: deleteCustomerMutate,
isLoading
@@ -44,9 +41,7 @@ function CustomerDeleteAlert({
deleteCustomerMutate(customerId)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_customer_has_been_deleted_successfully',
}),
message: intl.get('the_customer_has_been_deleted_successfully'),
intent: Intent.SUCCESS,
});
})
@@ -56,7 +51,7 @@ function CustomerDeleteAlert({
.finally(() => {
closeAlert(name);
});
}, [deleteCustomerMutate, customerId, closeAlert, name, formatMessage]);
}, [deleteCustomerMutate, customerId, closeAlert, name]);
return (
<Alert

11
client/src/containers/Alerts/Estimates/EstimateApproveAlert.js
View File

@@ -1,5 +1,6 @@
import React, { useCallback } from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { queryCache } from 'react-query';
@@ -24,7 +25,7 @@ function EstimateApproveAlert({
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const {
mutateAsync: deliverEstimateMutate,
isLoading,
@@ -39,9 +40,7 @@ function EstimateApproveAlert({
deliverEstimateMutate(estimateId)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_estimate_has_been_approved_successfully',
}),
message: intl.get('the_estimate_has_been_approved_successfully'),
intent: Intent.SUCCESS,
});
queryCache.invalidateQueries('estimates-table');
@@ -50,7 +49,7 @@ function EstimateApproveAlert({
.finally(() => {
closeAlert(name);
});
}, [estimateId, deliverEstimateMutate, closeAlert, name, formatMessage]);
}, [estimateId, deliverEstimateMutate, closeAlert, name]);
return (
<Alert

14
client/src/containers/Alerts/Estimates/EstimateDeleteAlert.js
View File

@@ -1,10 +1,8 @@
import React, { useCallback } from 'react';
import {
FormattedMessage as T,
FormattedHTMLMessage,
useIntl,
} from 'react-intl';
import intl from 'react-intl-universal';
import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
import { Intent, Alert } from '@blueprintjs/core';
import { useDeleteEstimate } from 'hooks/query';
import { AppToaster } from 'components';
@@ -27,7 +25,7 @@ function EstimateDeleteAlert({
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const { mutateAsync: deleteEstimateMutate, isLoading } = useDeleteEstimate();
// handle cancel delete alert.
@@ -40,9 +38,7 @@ function EstimateDeleteAlert({
deleteEstimateMutate(estimateId)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_estimate_has_been_deleted_successfully',
}),
message: intl.get('the_estimate_has_been_deleted_successfully'),
intent: Intent.SUCCESS,
});
})

9
client/src/containers/Alerts/Estimates/EstimateDeliveredAlert.js
View File

@@ -1,5 +1,6 @@
import React from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { useDeliverEstimate } from 'hooks/query';
@@ -23,7 +24,7 @@ function EstimateDeliveredAlert({
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const { mutateAsync: deliverEstimateMutate, isLoading } = useDeliverEstimate();
// Handle cancel delivered estimate alert.
@@ -36,9 +37,7 @@ function EstimateDeliveredAlert({
deliverEstimateMutate(estimateId)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_estimate_has_been_delivered_successfully',
}),
message: intl.get('the_estimate_has_been_delivered_successfully'),
intent: Intent.SUCCESS,
})
})

9
client/src/containers/Alerts/Estimates/EstimateRejectAlert.js
View File

@@ -1,5 +1,6 @@
import React from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
@@ -23,7 +24,7 @@ function EstimateRejectAlert({
// #withAlertActions
closeAlert,
}) {
const { formatMessage } = useIntl();
const {
mutateAsync: rejectEstimateMutate,
isLoading
@@ -39,9 +40,7 @@ function EstimateRejectAlert({
rejectEstimateMutate(estimateId)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_estimate_has_been_rejected_successfully',
}),
message: intl.get('the_estimate_has_been_rejected_successfully'),
intent: Intent.SUCCESS,
});
})

3
client/src/containers/Alerts/ExchangeRates/ExchangeRateBulkDeleteAlert.js
View File

@@ -1,5 +1,6 @@
import React, { useState } from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { size } from 'lodash';
import { AppToaster } from 'components';

13
client/src/containers/Alerts/ExchangeRates/ExchangeRateDeleteAlert.js
View File

@@ -1,9 +1,6 @@
import React from 'react';
import {
FormattedMessage as T,
FormattedHTMLMessage,
useIntl,
} from 'react-intl';
import intl from 'react-intl-universal';
import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
@@ -30,7 +27,7 @@ function ExchangeRateDeleteAlert({
mutateAsync: deleteExchangeRate,
isLoading,
} = useDeleteExchangeRate();
const { formatMessage } = useIntl();
// Handle cancel delete exchange rate alert.
const handleCancelExchangeRateDelete = () => closeAlert(name);
@@ -39,9 +36,7 @@ function ExchangeRateDeleteAlert({
deleteExchangeRate(exchangeRateId)
.then((response) => {
AppToaster.show({
message: formatMessage({
id: 'the_exchange_rates_has_been_deleted_successfully',
}),
message: intl.get('the_exchange_rates_has_been_deleted_successfully'),
intent: Intent.SUCCESS,
});
closeAlert(name);

3
client/src/containers/Alerts/Expenses/ExpenseBulkDeleteAlert.js
View File

@@ -1,5 +1,6 @@
import React from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';

9
client/src/containers/Alerts/Expenses/ExpenseDeleteAlert.js
View File

@@ -1,5 +1,6 @@
import React from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
@@ -20,7 +21,7 @@ function ExpenseDeleteAlert({
isOpen,
payload: { expenseId },
}) {
const { formatMessage } = useIntl();
const {
mutateAsync: deleteExpenseMutate,
isLoading,
@@ -35,8 +36,8 @@ function ExpenseDeleteAlert({
const handleConfirmExpenseDelete = () => {
deleteExpenseMutate(expenseId).then(() => {
AppToaster.show({
message: formatMessage(
{ id: 'the_expense_has_been_deleted_successfully' },
message: intl.get(
'the_expense_has_been_deleted_successfully',
{ number: expenseId },
),
intent: Intent.SUCCESS,

2
client/src/containers/Alerts/Expenses/ExpenseDeleteEntriesAlert.js
View File

@@ -1,6 +1,6 @@
import React from 'react';
import { Intent, Alert } from '@blueprintjs/core';
import { FormattedMessage as T } from 'react-intl';
import { FormattedMessage as T } from 'components';
import withAlertActions from 'containers/Alert/withAlertActions';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';

9
client/src/containers/Alerts/Expenses/ExpensePublishAlert.js
View File

@@ -1,5 +1,6 @@
import React from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Intent, Alert } from '@blueprintjs/core';
import { AppToaster } from 'components';
@@ -20,7 +21,7 @@ function ExpensePublishAlert({
payload: { expenseId },
isOpen,
}) {
const { formatMessage } = useIntl();
const { mutateAsync: publishExpenseMutate, isLoading } = usePublishExpense();
const handleCancelPublishExpense = () => {
@@ -32,9 +33,7 @@ function ExpensePublishAlert({
publishExpenseMutate(expenseId)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_expense_has_been_published',
}),
message: intl.get('the_expense_has_been_published'),
intent: Intent.SUCCESS,
});
closeAlert(name)

Some files were not shown because too many files have changed in this diff Show More