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(preferences)

Browse Source
This commit is contained in:
a.bouhuolia
2021-03-22 20:02:09 +02:00
parent aa6c3d5fe8
commit bad1c2b8ae
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,8 +43,8 @@ export default function PreferencesGeneralForm({}) {
labelInfo={<FieldRequiredHint />} labelInfo={<FieldRequiredHint />}
inline={true} inline={true}
intent={inputIntent({ error, touched })} intent={inputIntent({ error, touched })}
helperText={<ErrorMessage name="name" />}
className={'form-group--org-name'} className={'form-group--org-name'}
helperText={'Shown on sales forms and purchase orders.'}
> >
<InputGroup medium={'true'} {...field} /> <InputGroup medium={'true'} {...field} />
</FormGroup> </FormGroup>
@@ -58,8 +58,8 @@ export default function PreferencesGeneralForm({}) {
labelInfo={<FieldRequiredHint />} labelInfo={<FieldRequiredHint />}
inline={true} inline={true}
intent={inputIntent({ error, touched })} intent={inputIntent({ error, touched })}
helperText={<ErrorMessage name="financial_date_start" />}
className={classNames('form-group--select-list', CLASSES.FILL)} className={classNames('form-group--select-list', CLASSES.FILL)}
helperText={'For reporting, you can specify any month as the start of your financial year (also called your financial reporting year or accounting year).'}
> >
<DateInput <DateInput
{...momentFormatter('MMMM Do YYYY')} {...momentFormatter('MMMM Do YYYY')}
@@ -121,8 +121,8 @@ export default function PreferencesGeneralForm({}) {
labelInfo={<FieldRequiredHint />} labelInfo={<FieldRequiredHint />}
className={classNames('form-group--base-currency', CLASSES.FILL)} className={classNames('form-group--base-currency', CLASSES.FILL)}
inline={true} inline={true}
helperText={<ErrorMessage name="base_currency" />}
intent={inputIntent({ error, touched })} intent={inputIntent({ error, touched })}
helperText={"You can't change the base currency as there are transactions recorded in your organization."}
> >
<ListSelect <ListSelect
items={currencies} items={currencies}

4
client/src/containers/Preferences/General/GeneralFormPage.js
View File

@@ -48,9 +48,7 @@ function GeneralFormPage({
}); });
const onSuccess = (response) => { const onSuccess = (response) => {
AppToaster.show({ AppToaster.show({
message: formatMessage({ message: 'The general preferences has been saved.',
id: 'the_options_has_been_created_successfully',
}),
intent: Intent.SUCCESS, intent: Intent.SUCCESS,
}); });
setSubmitting(false); setSubmitting(false);

3
client/src/containers/Preferences/Users/UsersDataTable.js
View File

@@ -3,6 +3,8 @@ import React, { useCallback } from 'react';
import { compose } from 'utils'; import { compose } from 'utils';
import { DataTable } from 'components'; import { DataTable } from 'components';
import TableSkeletonRows from 'components/Datatable/TableSkeletonRows';
import withDialogActions from 'containers/Dialog/withDialogActions'; import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertActions from 'containers/Alert/withAlertActions'; import withAlertActions from 'containers/Alert/withAlertActions';
@@ -60,6 +62,7 @@ function UsersDataTable({
loading={isUsersLoading} loading={isUsersLoading}
headerLoading={isUsersLoading} headerLoading={isUsersLoading}
progressBarLoading={isUsersFetching} progressBarLoading={isUsersFetching}
TableLoadingRenderer={TableSkeletonRows}
noInitialFetch={true} noInitialFetch={true}
ContextMenu={ActionsMenu} ContextMenu={ActionsMenu}
payload={{ payload={{

7
client/src/style/pages/Preferences/GeneralForm.scss
View File

@@ -22,10 +22,13 @@
} }
.bp3-form-group { .bp3-form-group {
max-width: 550px; max-width: 650px;
margin-bottom: 24px;
.bp3-label { .bp3-label {
min-width: 180px; min-width: 190px;
font-weight: 600;
color: #38414e;
} }
.bp3-form-content { .bp3-form-content {