mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-18 22:00:31 +00:00
Merge branch 'feature/landed-cost'
This commit is contained in:
@@ -8,7 +8,9 @@ import { useAuthActions, useAuthOrganizationId } from 'hooks/state';
|
||||
function FooterLinkItem({ title, link }) {
|
||||
return (
|
||||
<div class="">
|
||||
<a href={link} target="_blank">{ title }</a>
|
||||
<a href={link} target="_blank">
|
||||
{title}
|
||||
</a>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -32,7 +34,12 @@ export default function SetupLeftSection() {
|
||||
<section className={'setup-page__left-section'}>
|
||||
<div className={'content'}>
|
||||
<div className={'content__logo'}>
|
||||
<Icon icon="bigcapital" className={'bigcapital--alt'} height={37} width={190} />
|
||||
<Icon
|
||||
icon="bigcapital"
|
||||
className={'bigcapital--alt'}
|
||||
height={37}
|
||||
width={190}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<h1 className={'content__title'}>
|
||||
@@ -46,17 +53,22 @@ export default function SetupLeftSection() {
|
||||
|
||||
<div className={'content__organization'}>
|
||||
<span class="organization-id">
|
||||
<T id={'organization_id'} />: <span class="id">{ organizationId }</span>,
|
||||
<T id={'organization_id'} />:{' '}
|
||||
<span class="id">{organizationId}</span>,
|
||||
</span>
|
||||
<br />
|
||||
<span class="signout">
|
||||
<a onClick={onClickLogout} href="#"><T id={'sign_out'} /></a>
|
||||
<a onClick={onClickLogout} href="#">
|
||||
<T id={'sign_out'} />
|
||||
</a>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div className={'content__footer'}>
|
||||
<div className={'content__contact-info'}>
|
||||
<p><T id={'we_re_here_to_help'} /> {'+21892-791-8381'}</p>
|
||||
<div className={'content__contact-info'}>
|
||||
<p>
|
||||
<T id={'we_re_here_to_help'} /> <span>{'+21892-738-1987'}</span>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className={'content__links'}>
|
||||
@@ -65,5 +77,5 @@ export default function SetupLeftSection() {
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
)
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -22,16 +22,19 @@ import {
|
||||
handleDateChange
|
||||
} from 'utils';
|
||||
|
||||
import { getFiscalYearOptions } from 'common/fiscalYearOptions';
|
||||
import languages from 'common/languagesOptions';
|
||||
import currencies from 'common/currencies';
|
||||
import { getFiscalYear } from 'common/fiscalYearOptions';
|
||||
import { getLanguages } from 'common/languagesOptions';
|
||||
import { getCurrencies } from 'common/currencies';
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Setup organization form.
|
||||
*/
|
||||
export default function SetupOrganizationForm({ isSubmitting, values }) {
|
||||
const fiscalYearOptions = getFiscalYearOptions();
|
||||
const FiscalYear = getFiscalYear();
|
||||
const Languages = getLanguages();
|
||||
const Currencies = getCurrencies();
|
||||
|
||||
return (
|
||||
<Form>
|
||||
@@ -97,7 +100,7 @@ export default function SetupOrganizationForm({ isSubmitting, values }) {
|
||||
helperText={<ErrorMessage name={'baseCurrency'} />}
|
||||
>
|
||||
<ListSelect
|
||||
items={currencies}
|
||||
items={Currencies}
|
||||
noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
|
||||
popoverProps={{ minimal: true }}
|
||||
onItemSelect={(item) => {
|
||||
@@ -132,7 +135,7 @@ export default function SetupOrganizationForm({ isSubmitting, values }) {
|
||||
helperText={<ErrorMessage name={'language'} />}
|
||||
>
|
||||
<ListSelect
|
||||
items={languages}
|
||||
items={Languages}
|
||||
noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
|
||||
onItemSelect={(item) => {
|
||||
setFieldValue('language', item.value);
|
||||
@@ -164,7 +167,7 @@ export default function SetupOrganizationForm({ isSubmitting, values }) {
|
||||
helperText={<ErrorMessage name={'fiscalYear'} />}
|
||||
>
|
||||
<ListSelect
|
||||
items={fiscalYearOptions}
|
||||
items={FiscalYear}
|
||||
noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
|
||||
selectedItem={value}
|
||||
selectedItemProp={'value'}
|
||||
|
||||
Reference in New Issue
Block a user