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

Merge remote-tracking branch 'origin/RegisterWizard' into RegisterWizard

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-10-14 17:49:53 +02:00
parent 5b9b5fc3a7 6bc331b388
commit 59e00701d3
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,7 +147,9 @@ function SetupOrganizationForm({
fiscal_year: Yup.string() fiscal_year: Yup.string()
.required() .required()
.label(formatMessage({ id: 'fiscal_year_' })), .label(formatMessage({ id: 'fiscal_year_' })),
time_zone: Yup.string(), time_zone: Yup.string()
.required()
.label(formatMessage({ id: 'time_zone_' })),
}); });
const initialValues = useMemo( const initialValues = useMemo(
@@ -188,8 +190,8 @@ function SetupOrganizationForm({
return setOrganizationSetupCompleted(true); return setOrganizationSetupCompleted(true);
}) })
.then((response) => { .then((response) => {
wizard.next();
setSubmitting(false); setSubmitting(false);
wizard.next();
}) })
.catch((erros) => { .catch((erros) => {
setSubmitting(false); setSubmitting(false);
@@ -248,7 +250,7 @@ function SetupOrganizationForm({
</p> </p>
</div> </div>
<form class="setup-organization__form" onClick={handleSubmit}> <form class="setup-organization__form" onSubmit={handleSubmit}>
<h3> <h3>
<T id={'organization_details'} /> <T id={'organization_details'} />
</h3> </h3>
@@ -270,9 +272,16 @@ function SetupOrganizationForm({
<FormGroup <FormGroup
label={<T id={'financial_starting_date'} />} label={<T id={'financial_starting_date'} />}
labelInfo={<FieldRequiredHint />} labelInfo={<FieldRequiredHint />}
intent={errors.financial_date_start && touched.financial_date_start && Intent.DANGER} intent={
errors.financial_date_start &&
touched.financial_date_start &&
Intent.DANGER
}
helperText={ helperText={
<ErrorMessage name="financial_date_start" {...{ errors, touched }} /> <ErrorMessage
name="financial_date_start"
{...{ errors, touched }}
/>
} }
className={classNames('form-group--select-list', Classes.FILL)} className={classNames('form-group--select-list', Classes.FILL)}
> >
@@ -378,6 +387,7 @@ function SetupOrganizationForm({
{/* Time zone */} {/* Time zone */}
<FormGroup <FormGroup
label={<T id={'time_zone'} />} label={<T id={'time_zone'} />}
labelInfo={<FieldRequiredHint />}
className={classNames( className={classNames(
'form-group--time-zone', 'form-group--time-zone',
'form-group--select-list', 'form-group--select-list',
@@ -407,9 +417,9 @@ function SetupOrganizationForm({
<div className={'register-org-button'}> <div className={'register-org-button'}>
<Button <Button
intent={Intent.PRIMARY} intent={Intent.PRIMARY}
disabled={isSubmitting}
loading={isSubmitting} loading={isSubmitting}
type="submit" type="submit"
loading={isSubmitting}
> >
<T id={'save_continue'} /> <T id={'save_continue'} />
</Button> </Button>