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

fix : common rtl

Browse Source
This commit is contained in:
elforjani3
2021-06-14 15:45:11 +02:00
parent 0a276ca5e0
commit aa21da88b3
7 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,8 @@
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
export default [{ name: intl.get('libya'), value: 'libya' }]; export const getCountries = () => [
{
name: intl.get('libya'),
value: 'libya',
},
];

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

@@ -1,6 +1,6 @@
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
export default [ export const getCurrencies = () => [
{ name: intl.get('us_dollar'), code: 'USD' }, { name: intl.get('us_dollar'), code: 'USD' },
{ name: intl.get('euro'), code: 'EUR' }, { name: intl.get('euro'), code: 'EUR' },
{ name: intl.get('libyan_diner'), code: 'LYD' }, { name: intl.get('libyan_diner'), code: 'LYD' },

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

@@ -1,7 +1,7 @@
import moment from 'moment'; import moment from 'moment';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
export default [ export const getDateFormats =()=> [
{ {
id: 1, id: 1,
name: intl.get('mm_dd_yy'), name: intl.get('mm_dd_yy'),

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

@@ -1,6 +1,6 @@
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
export const getFiscalYearOptions = () => [ export const getFiscalYear = () => [
{ {
id: 0, id: 0,
name: `${intl.get('january')} - ${intl.get('december')}`, name: `${intl.get('january')} - ${intl.get('december')}`,

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

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

35
client/src/containers/Preferences/General/GeneralForm.js
View File

@@ -22,15 +22,20 @@ import {
handleDateChange, handleDateChange,
} from 'utils'; } from 'utils';
import { CLASSES } from 'common/classes'; import { CLASSES } from 'common/classes';
import countriesOptions from 'common/countries'; import { getCountries } from 'common/countries';
import currencies from 'common/currencies'; import { getCurrencies } from 'common/currencies';
import { getFiscalYearOptions } from 'common/fiscalYearOptions'; import { getFiscalYear } from 'common/fiscalYearOptions';
import languages from 'common/languagesOptions'; import { getLanguages } from 'common/languagesOptions';
import dateFormatsOptions from 'common/dateFormatsOptions'; import { getDateFormats } from 'common/dateFormatsOptions';
export default function PreferencesGeneralForm({}) { export default function PreferencesGeneralForm({}) {
const history = useHistory(); const history = useHistory();
const fiscalYearOptions = getFiscalYearOptions();
const FiscalYear = getFiscalYear();
const Countries = getCountries();
const Languages = getLanguages();
const Currencies = getCurrencies();
const DataFormats = getDateFormats();
const handleCloseClick = () => { const handleCloseClick = () => {
history.go(-1); history.go(-1);
@@ -38,6 +43,7 @@ export default function PreferencesGeneralForm({}) {
return ( return (
<Form> <Form>
{/* ---------- Organization name ---------- */}
<FastField name={'name'}> <FastField name={'name'}>
{({ field, meta: { error, touched } }) => ( {({ field, meta: { error, touched } }) => (
<FormGroup <FormGroup
@@ -53,6 +59,7 @@ export default function PreferencesGeneralForm({}) {
)} )}
</FastField> </FastField>
{/* ---------- Financial starting date ---------- */}
<FastField name={'financial_date_start'}> <FastField name={'financial_date_start'}>
{({ form, field: { value }, meta: { error, touched } }) => ( {({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup <FormGroup
@@ -89,6 +96,7 @@ export default function PreferencesGeneralForm({}) {
)} )}
</FastField> </FastField>
{/* ---------- Location ---------- */}
<FastField name={'location'}> <FastField name={'location'}>
{({ form, field: { value }, meta: { error, touched } }) => ( {({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup <FormGroup
@@ -102,7 +110,7 @@ export default function PreferencesGeneralForm({}) {
intent={inputIntent({ error, touched })} intent={inputIntent({ error, touched })}
> >
<ListSelect <ListSelect
items={countriesOptions} items={Countries}
onItemSelect={({ value }) => { onItemSelect={({ value }) => {
form.setFieldValue('location', value); form.setFieldValue('location', value);
}} }}
@@ -116,6 +124,7 @@ export default function PreferencesGeneralForm({}) {
)} )}
</FastField> </FastField>
{/* ---------- Base currency ---------- */}
<FastField name={'base_currency'}> <FastField name={'base_currency'}>
{({ form, field: { value }, meta: { error, touched } }) => ( {({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup <FormGroup
@@ -133,7 +142,7 @@ export default function PreferencesGeneralForm({}) {
} }
> >
<ListSelect <ListSelect
items={currencies} items={Currencies}
onItemSelect={(currency) => { onItemSelect={(currency) => {
form.setFieldValue('base_currency', currency.code); form.setFieldValue('base_currency', currency.code);
}} }}
@@ -148,6 +157,7 @@ export default function PreferencesGeneralForm({}) {
)} )}
</FastField> </FastField>
{/* --------- Fiscal Year ----------- */}
<FastField name={'fiscal_year'}> <FastField name={'fiscal_year'}>
{({ form, field: { value }, meta: { error, touched } }) => ( {({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup <FormGroup
@@ -159,7 +169,7 @@ export default function PreferencesGeneralForm({}) {
intent={inputIntent({ error, touched })} intent={inputIntent({ error, touched })}
> >
<ListSelect <ListSelect
items={fiscalYearOptions} items={FiscalYear}
onItemSelect={({ value }) => onItemSelect={({ value }) =>
form.setFieldValue('fiscal_year', value) form.setFieldValue('fiscal_year', value)
} }
@@ -173,6 +183,7 @@ export default function PreferencesGeneralForm({}) {
)} )}
</FastField> </FastField>
{/* ---------- Language ---------- */}
<FastField name={'language'}> <FastField name={'language'}>
{({ form, field: { value }, meta: { error, touched } }) => ( {({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup <FormGroup
@@ -184,7 +195,7 @@ export default function PreferencesGeneralForm({}) {
helperText={<ErrorMessage name="language" />} helperText={<ErrorMessage name="language" />}
> >
<ListSelect <ListSelect
items={languages} items={Languages}
selectedItemProp={'value'} selectedItemProp={'value'}
textProp={'name'} textProp={'name'}
defaultText={<T id={'select_language'} />} defaultText={<T id={'select_language'} />}
@@ -198,6 +209,7 @@ export default function PreferencesGeneralForm({}) {
)} )}
</FastField> </FastField>
{/* ---------- Time zone ---------- */}
<FastField name={'time_zone'}> <FastField name={'time_zone'}>
{({ form, field: { value }, meta: { error, touched } }) => ( {({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup <FormGroup
@@ -224,6 +236,7 @@ export default function PreferencesGeneralForm({}) {
)} )}
</FastField> </FastField>
{/* --------- Data format ----------- */}
<FastField name={'date_format'}> <FastField name={'date_format'}>
{({ form, field: { value }, meta: { error, touched } }) => ( {({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup <FormGroup
@@ -235,7 +248,7 @@ export default function PreferencesGeneralForm({}) {
helperText={<ErrorMessage name="date_format" />} helperText={<ErrorMessage name="date_format" />}
> >
<ListSelect <ListSelect
items={dateFormatsOptions} items={DataFormats}
onItemSelect={(dateFormat) => { onItemSelect={(dateFormat) => {
form.setFieldValue('date_format', dateFormat.value); form.setFieldValue('date_format', dateFormat.value);
}} }}

17
client/src/containers/Setup/SetupOrganizationForm.js
View File

@@ -22,16 +22,19 @@ import {
handleDateChange handleDateChange
} from 'utils'; } from 'utils';
import { getFiscalYearOptions } from 'common/fiscalYearOptions'; import { getFiscalYear } from 'common/fiscalYearOptions';
import languages from 'common/languagesOptions'; import { getLanguages } from 'common/languagesOptions';
import currencies from 'common/currencies'; import { getCurrencies } from 'common/currencies';
/** /**
* Setup organization form. * Setup organization form.
*/ */
export default function SetupOrganizationForm({ isSubmitting, values }) { export default function SetupOrganizationForm({ isSubmitting, values }) {
const fiscalYearOptions = getFiscalYearOptions(); const FiscalYear = getFiscalYear();
const Languages = getLanguages();
const Currencies = getCurrencies();
return ( return (
<Form> <Form>
@@ -97,7 +100,7 @@ export default function SetupOrganizationForm({ isSubmitting, values }) {
helperText={<ErrorMessage name={'baseCurrency'} />} helperText={<ErrorMessage name={'baseCurrency'} />}
> >
<ListSelect <ListSelect
items={currencies} items={Currencies}
noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />} noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
popoverProps={{ minimal: true }} popoverProps={{ minimal: true }}
onItemSelect={(item) => { onItemSelect={(item) => {
@@ -132,7 +135,7 @@ export default function SetupOrganizationForm({ isSubmitting, values }) {
helperText={<ErrorMessage name={'language'} />} helperText={<ErrorMessage name={'language'} />}
> >
<ListSelect <ListSelect
items={languages} items={Languages}
noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />} noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
onItemSelect={(item) => { onItemSelect={(item) => {
setFieldValue('language', item.value); setFieldValue('language', item.value);
@@ -164,7 +167,7 @@ export default function SetupOrganizationForm({ isSubmitting, values }) {
helperText={<ErrorMessage name={'fiscalYear'} />} helperText={<ErrorMessage name={'fiscalYear'} />}
> >
<ListSelect <ListSelect
items={fiscalYearOptions} items={FiscalYear}
noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />} noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
selectedItem={value} selectedItem={value}
selectedItemProp={'value'} selectedItemProp={'value'}