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

fix: balance sheet.

Browse Source
This commit is contained in:
a.bouhuolia
2022-01-30 16:05:59 +02:00
parent e296507a96
commit 8d6ed9be41
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js
View File

@@ -9,7 +9,6 @@ import DashboardPageContent from 'components/Dashboard/DashboardPageContent';
import BalanceSheetActionsBar from './BalanceSheetActionsBar'; import BalanceSheetActionsBar from './BalanceSheetActionsBar';
import { BalanceSheetProvider } from './BalanceSheetProvider'; import { BalanceSheetProvider } from './BalanceSheetProvider';
import { BalanceSheetBody } from './BalanceSheetBody'; import { BalanceSheetBody } from './BalanceSheetBody';
import { FinancialReportBody } from '../FinancialReportPage';
import withBalanceSheetActions from './withBalanceSheetActions'; import withBalanceSheetActions from './withBalanceSheetActions';
@@ -70,9 +69,7 @@ function BalanceSheet({
pageFilter={filter} pageFilter={filter}
onSubmitFilter={handleFilterSubmit} onSubmitFilter={handleFilterSubmit}
/> />
<FinancialReportBody> <BalanceSheetBody />
<BalanceSheetBody />
</FinancialReportBody>
</FinancialStatement> </FinancialStatement>
</DashboardPageContent> </DashboardPageContent>
</BalanceSheetProvider> </BalanceSheetProvider>

16
src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.js
View File

@@ -1,7 +1,9 @@
import React from 'react'; import React from 'react';
import BalanceSheetTable from './BalanceSheetTable'; import BalanceSheetTable from './BalanceSheetTable';
import withCurrentOrganization from '../../../containers/Organization/withCurrentOrganization'; import { FinancialReportBody } from '../FinancialReportPage';
import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
import { useBalanceSheetContext } from './BalanceSheetProvider'; import { useBalanceSheetContext } from './BalanceSheetProvider';
import { compose } from 'utils'; import { compose } from 'utils';
@@ -16,10 +18,14 @@ function BalanceSheetBodyJSX({
}) { }) {
const { isLoading } = useBalanceSheetContext(); const { isLoading } = useBalanceSheetContext();
return isLoading ? ( return (
'loading' <FinancialReportBody>
) : ( {isLoading ? (
<BalanceSheetTable companyName={organizationName} /> 'loading'
) : (
<BalanceSheetTable companyName={organizationName} />
)}
</FinancialReportBody>
); );
} }