merge conflix fixing

This commit is contained in:
a.bouhuolia
2021-05-06 22:08:18 +02:00
26 changed files with 1418 additions and 17 deletions

View File

@@ -10,7 +10,8 @@ export const financialReportMenus = [
},
{
title: 'Trial Balance Sheet',
desc: 'Summarizes the credit and debit balance of each account in your chart of accounts at a specific point in time.',
desc:
'Summarizes the credit and debit balance of each account in your chart of accounts at a specific point in time.',
link: '/financial-reports/trial-balance-sheet',
},
{
@@ -21,22 +22,26 @@ export const financialReportMenus = [
},
{
title: 'Profit/Loss Report',
desc: "Reports the revenues, costs and expenses incurred during a specific point in time with comparison period(s).",
desc:
'Reports the revenues, costs and expenses incurred during a specific point in time with comparison period(s).',
link: '/financial-reports/profit-loss-sheet',
},
{
title: 'General Ledger Report',
desc: "Reports every transaction going in and out of your accounts and organized by accounts and date to monitoring activity of accounts.",
desc:
'Reports every transaction going in and out of your accounts and organized by accounts and date to monitoring activity of accounts.',
link: '/financial-reports/general-ledger',
},
{
title: 'Receivable Aging Summary',
desc: "Summarize total unpaid balances of customers invoices with number of days the unpaid invoice is overdue.",
desc:
'Summarize total unpaid balances of customers invoices with number of days the unpaid invoice is overdue.',
link: '/financial-reports/receivable-aging-summary',
},
{
title: 'Payable Aging Summary',
desc: "Summarize total unpaid balances of vendors purchase invoices with the number of days the unpaid invoice is overdue.",
desc:
'Summarize total unpaid balances of vendors purchase invoices with the number of days the unpaid invoice is overdue.',
link: '/financial-reports/payable-aging-summary',
},
],
@@ -54,16 +59,37 @@ export const SalesAndPurchasesReportMenus = [
link: '/financial-reports/purchases-by-items',
},
{
title: 'Sales by Items',
title: 'Sales By Items',
desc:
"Summarize the businesss sold items quantity, income and average income rate of each item during a specific point in time.",
'Summarize the businesss sold items quantity, income and average income rate of each item during a specific point in time.',
link: '/financial-reports/sales-by-items',
},
{
title: 'Inventory valuation',
desc: 'Summarize the businesss purchase items quantity, cost and average cost rate of each item during a specific point in time.',
desc:
'Summarize the businesss purchase items quantity, cost and average cost rate of each item during a specific point in time.',
link: '/financial-reports/inventory-valuation',
},
{
title: 'Customer Balance summary',
desc: '',
link: '/financial-reports/customers-balance-summary',
},
{
title: 'Vendors Balance summary',
desc: '',
link: '/financial-reports/vendors-balance-summary',
},
{
title: 'Customers Transactions',
desc: '',
link: '/financial-reports/transactions-by-customers',
},
{
title: 'Vendors Transactions',
desc: '',
link: '/financial-reports/transactions-by-vendors',
},
],
},
];

View File

@@ -0,0 +1,87 @@
import React, { useEffect, useState } from 'react';
import moment from 'moment';
import 'style/pages/FinancialStatements/ContactsBalanceSummary.scss';
import { FinancialStatement } from 'components';
import DashboardPageContent from 'components/Dashboard/DashboardPageContent';
import CustomersBalanceSummaryActionsBar from './CustomersBalanceSummaryActionsBar';
import CustomersBalanceSummaryHeader from './CustomersBalanceSummaryHeader';
import CustomersBalanceSummaryTable from './CustomersBalanceSummaryTable';
import { CustomersBalanceLoadingBar } from './components';
import { CustomersBalanceSummaryProvider } from './CustomersBalanceSummaryProvider';
import withCustomersBalanceSummaryActions from './withCustomersBalanceSummaryActions';
import withSettings from 'containers/Settings/withSettings';
import { compose } from 'redux';
/**
* Customers Balance summary.
*/
function CustomersBalanceSummary({
// #withPreferences
organizationName,
// #withCustomersBalanceSummaryActions
toggleCustomerBalanceFilterDrawer,
}) {
const [filter, setFilter] = useState({
asDate: moment().endOf('day').format('YYYY-MM-DD'),
});
// Handle re-fetch customers balance summary after filter change.
const handleFilterSubmit = (filter) => {
const _filter = {
...filter,
asDate: moment(filter.asDate).format('YYYY-MM-DD'),
};
setFilter({ ..._filter });
};
// Handle number format.
const handleNumberFormat = (values) => {
setFilter({
...filter,
numberFormat: values,
});
};
useEffect(
() => () => {
toggleCustomerBalanceFilterDrawer(false);
},
[toggleCustomerBalanceFilterDrawer],
);
return (
<CustomersBalanceSummaryProvider filter={filter}>
<CustomersBalanceSummaryActionsBar
numberFormat={filter?.numberFormat}
onNumberFormatSubmit={handleNumberFormat}
/>
<CustomersBalanceLoadingBar />
<DashboardPageContent>
<FinancialStatement>
<CustomersBalanceSummaryHeader
pageFilter={filter}
onSubmitFilter={handleFilterSubmit}
/>
<div className="financial-statement__body">
<CustomersBalanceSummaryTable companyName={organizationName} />
</div>
</FinancialStatement>
</DashboardPageContent>
</CustomersBalanceSummaryProvider>
);
}
export default compose(
withSettings(({ organizationSettings }) => ({
organizationName: organizationSettings.name,
})),
withCustomersBalanceSummaryActions,
)(CustomersBalanceSummary);

View File

@@ -0,0 +1,133 @@
import React from 'react';
import {
NavbarGroup,
Button,
Classes,
NavbarDivider,
Popover,
PopoverInteractionKind,
Position,
} from '@blueprintjs/core';
import { FormattedMessage as T } from 'react-intl';
import classNames from 'classnames';
import Icon from 'components/Icon';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import NumberFormatDropdown from 'components/NumberFormatDropdown';
import withCustomersBalanceSummary from './withCustomersBalanceSummary';
import withCustomersBalanceSummaryActions from './withCustomersBalanceSummaryActions';
import { useCustomersBalanceSummaryContext } from './CustomersBalanceSummaryProvider';
import { compose, saveInvoke } from 'utils';
/**
* customer balance summary action bar.
*/
function CustomersBalanceSummaryActionsBar({
// #ownProps
numberFormat,
onNumberFormatSubmit,
//#withCustomersBalanceSummary
isFilterDrawerOpen,
//#withCustomersBalanceSummaryActions
toggleCustomerBalanceFilterDrawer,
}) {
const {
refetch,
isCustomersBalanceLoading,
} = useCustomersBalanceSummaryContext();
// handle filter toggle click.
const handleFilterToggleClick = () => {
toggleCustomerBalanceFilterDrawer();
};
// Handle recalculate the report button.
const handleRecalcReport = () => {
refetch();
};
// Handle number format form submit.
const handleNumberFormatSubmit = (values) => {
saveInvoke(onNumberFormatSubmit, values);
};
return (
<DashboardActionsBar>
<NavbarGroup>
<Button
className={classNames(Classes.MINIMAL, 'button--gray-highlight')}
text={<T id={'recalc_report'} />}
onClick={handleRecalcReport}
icon={<Icon icon="refresh-16" iconSize={16} />}
/>
<NavbarDivider />
<Button
className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon="cog-16" iconSize={16} />}
text={
isFilterDrawerOpen ? (
<T id={'customize_report'} />
) : (
<T id={'hide_customizer'} />
)
}
onClick={handleFilterToggleClick}
active={isFilterDrawerOpen}
/>
<NavbarDivider />
<Popover
content={
<NumberFormatDropdown
numberFormat={numberFormat}
onSubmit={handleNumberFormatSubmit}
submitDisabled={isCustomersBalanceLoading}
/>
}
minimal={true}
interactionKind={PopoverInteractionKind.CLICK}
position={Position.BOTTOM_LEFT}
>
<Button
className={classNames(Classes.MINIMAL, 'button--filter')}
text={<T id={'format'} />}
icon={<Icon icon="numbers" width={23} height={16} />}
/>
</Popover>
<Popover
// content={}
interactionKind={PopoverInteractionKind.CLICK}
position={Position.BOTTOM_LEFT}
>
<Button
className={classNames(Classes.MINIMAL, 'button--filter')}
text={<T id={'filter'} />}
icon={<Icon icon="filter-16" iconSize={16} />}
/>
</Popover>
<NavbarDivider />
<Button
className={Classes.MINIMAL}
icon={<Icon icon="print-16" iconSize={16} />}
text={<T id={'print'} />}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="file-export-16" iconSize={16} />}
text={<T id={'export'} />}
/>
</NavbarGroup>
</DashboardActionsBar>
);
}
export default compose(
withCustomersBalanceSummary(({ customersBalanceDrawerFilter }) => ({
isFilterDrawerOpen: customersBalanceDrawerFilter,
})),
withCustomersBalanceSummaryActions,
)(CustomersBalanceSummaryActionsBar);

View File

@@ -0,0 +1,70 @@
import React from 'react';
import { FastField } from 'formik';
import { DateInput } from '@blueprintjs/datetime';
import {
FormGroup,
Position,
Classes,
Checkbox,
} from '@blueprintjs/core';
import { FormattedMessage as T } from 'react-intl';
import { Row, Col, FieldHint } from 'components';
import {
momentFormatter,
tansformDateValue,
inputIntent,
handleDateChange,
} from 'utils';
/**
* Customers balance header - general panel.
*/
export default function CustomersBalanceSummaryGeneralPanel() {
return (
<div>
<Row>
<Col xs={5}>
<FastField name={'asDate'}>
{({ form, field: { value }, meta: { error } }) => (
<FormGroup
label={<T id={'as_date'} />}
labelInfo={<FieldHint />}
fill={true}
intent={inputIntent({ error })}
>
<DateInput
{...momentFormatter('YYYY/MM/DD')}
value={tansformDateValue(value)}
onChange={handleDateChange((selectedDate) => {
form.setFieldValue('asDate', selectedDate);
})}
popoverProps={{ position: Position.BOTTOM, minimal: true }}
minimal={true}
fill={true}
/>
</FormGroup>
)}
</FastField>
</Col>
</Row>
<Row>
<Col xs={5}>
<FastField name={'percentage'} type={'checkbox'}>
{({ field }) => (
<FormGroup labelInfo={<FieldHint />}>
<Checkbox
inline={true}
name={'percentage'}
small={true}
label={'Percentage Of Column'}
{...field}
/>
</FormGroup>
)}
</FastField>
</Col>
</Row>
</div>
);
}

View File

@@ -0,0 +1,91 @@
import React from 'react';
import * as Yup from 'yup';
import { Formik, Form } from 'formik';
import moment from 'moment';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import { FormattedMessage as T, useIntl } from 'react-intl';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import withCustomersBalanceSummary from './withCustomersBalanceSummary';
import withCustomersBalanceSummaryActions from './withCustomersBalanceSummaryActions';
import CustomersBalanceSummaryGeneralPanel from './CustomersBalanceSummaryGeneralPanel';
import { compose } from 'utils';
/**
* Customers balance summary.
*/
function CustomersBalanceSummaryHeader({
// #ownProps
onSubmitFilter,
pageFilter,
//#withCustomersBalanceSummary
customersBalanceDrawerFilter,
//#withCustomersBalanceSummaryActions
toggleCustomerBalanceFilterDrawer,
}) {
// validation schema.
const validationSchema = Yup.object().shape({
asDate: Yup.date().required().label('asDate'),
});
// filter form initial values.
const initialValues = {
...pageFilter,
asDate: moment(pageFilter.asDate).toDate(),
};
// handle form submit.
const handleSubmit = (values, { setSubmitting }) => {
onSubmitFilter(values);
toggleCustomerBalanceFilterDrawer(false);
setSubmitting(false);
};
// handle close drawer.
const handleDrawerClose = () => {
toggleCustomerBalanceFilterDrawer(false);
};
return (
<FinancialStatementHeader
isOpen={customersBalanceDrawerFilter}
drawerProps={{ onClose: handleDrawerClose }}
>
<Formik
initialValues={initialValues}
validationSchema={validationSchema}
onSubmit={handleSubmit}
>
<Form>
<Tabs animate={true} vertical={true} renderActiveTabPanelOnly={true}>
<Tab
id="general"
title={<T id={'general'} />}
panel={<CustomersBalanceSummaryGeneralPanel />}
/>
</Tabs>
<div class="financial-header-drawer__footer">
<Button className={'mr1'} intent={Intent.PRIMARY} type={'submit'}>
<T id={'calculate_report'} />
</Button>
<Button onClick={handleDrawerClose} minimal={true}>
<T id={'cancel'} />
</Button>
</div>
</Form>
</Formik>
</FinancialStatementHeader>
);
}
export default compose(
withCustomersBalanceSummary(({ customersBalanceDrawerFilter }) => ({
customersBalanceDrawerFilter,
})),
withCustomersBalanceSummaryActions,
)(CustomersBalanceSummaryHeader);

View File

@@ -0,0 +1,42 @@
import React, { createContext, useContext } from 'react';
import FinancialReportPage from '../FinancialReportPage';
import { useCustomerBalanceSummaryReport } from 'hooks/query';
import { transformFilterFormToQuery } from '../common';
const CustomersBalanceSummaryContext = createContext();
/**
* Customers balance summary provider.
*/
function CustomersBalanceSummaryProvider({ filter, ...props }) {
// const query = React.useMemo(() => transformFilterFormToQuery(filter), [
// filter,
// ]);
const {
data: CustomerBalanceSummary,
isLoading: isCustomersBalanceLoading,
isFetching: isCustomersBalanceFetching,
refetch
} = useCustomerBalanceSummaryReport(filter, {
keepPreviousData: true,
});
const provider = {
CustomerBalanceSummary,
isCustomersBalanceFetching,
isCustomersBalanceLoading,
refetch,
};
return (
<FinancialReportPage name={'customers-balance-summary'}>
<CustomersBalanceSummaryContext.Provider value={provider} {...props} />
</FinancialReportPage>
);
}
const useCustomersBalanceSummaryContext = () =>
useContext(CustomersBalanceSummaryContext);
export { CustomersBalanceSummaryProvider, useCustomersBalanceSummaryContext };

View File

@@ -0,0 +1,48 @@
import React, { useMemo, useCallback } from 'react';
import { useIntl } from 'react-intl';
import classNames from 'classnames';
import FinancialSheet from 'components/FinancialSheet';
import DataTable from 'components/DataTable';
import { useCustomersBalanceSummaryContext } from './CustomersBalanceSummaryProvider';
import { useCustomersSummaryColumns } from './components';
/**
* customers balance summary table.
*/
export default function CustomersBalanceSummaryTable({
// #ownProps
companyName,
}) {
const { formatMessage } = useIntl();
const {
isCustomersBalanceLoading,
CustomerBalanceSummary: { tableRows },
} = useCustomersBalanceSummaryContext();
const columns = useCustomersSummaryColumns();
const rowClassNames = (row) => {
return [`row-type--${row.original.rowTypes}`];
};
return (
<FinancialSheet
name={'customers-balance-summary'}
companyName={companyName}
sheetType={formatMessage({ id: 'customers_balance_summary' })}
asDate={new Date()}
loading={isCustomersBalanceLoading}
>
<DataTable
className="bigcapital-datatable--financial-report"
columns={columns}
data={tableRows}
rowClassNames={rowClassNames}
noInitialFetch={true}
/>
</FinancialSheet>
);
}

View File

@@ -0,0 +1,48 @@
import React from 'react';
import { formatMessage } from 'services/intl';
import { If } from 'components';
import FinancialLoadingBar from '../FinancialLoadingBar';
import { useCustomersBalanceSummaryContext } from './CustomersBalanceSummaryProvider';
/**
* Retrieve customers balance summary columns.
*/
export const useCustomersSummaryColumns = () => {
return React.useMemo(
() => [
{
Header: formatMessage({ id: 'customer_name' }),
accessor: 'cells[0].value',
className: 'customer_name',
width: 240,
},
{
Header: formatMessage({ id: 'total' }),
accessor: 'cells[1].value',
className: 'total',
width: 140,
},
{
Header: formatMessage({ id: 'percentage_of_column' }),
accessor: 'cells[2].value',
className: 'total',
width: 140,
},
],
[formatMessage],
);
};
/**
* customers balance summary loading bar.
*/
export function CustomersBalanceLoadingBar() {
const { isCustomersBalanceFetching } = useCustomersBalanceSummaryContext();
return (
<If condition={isCustomersBalanceFetching}>
<FinancialLoadingBar />
</If>
);
}

View File

@@ -0,0 +1,15 @@
import { connect } from 'react-redux';
import { getCustomersBalanceSummaryFilterDrawer } from 'store/financialStatement/financialStatements.selectors';
export default (mapState) => {
const mapStateToProps = (state, props) => {
const mapped = {
customersBalanceDrawerFilter: getCustomersBalanceSummaryFilterDrawer(
state,
props,
),
};
return mapState ? mapState(mapped, state, props) : mapped;
};
return connect(mapStateToProps);
};

View File

@@ -0,0 +1,9 @@
import { connect } from 'react-redux';
import { toggleCustomersBalanceSummaryFilterDrawer } from 'store/financialStatement/financialStatements.actions';
const mapActionsToProps = (dispatch) => ({
toggleCustomerBalanceFilterDrawer: (toggle) =>
dispatch(toggleCustomersBalanceSummaryFilterDrawer(toggle)),
});
export default connect(null, mapActionsToProps);

View File

@@ -0,0 +1,87 @@
import React, { useEffect, useState } from 'react';
import moment from 'moment';
import 'style/pages/FinancialStatements/ContactsBalanceSummary.scss';
import { FinancialStatement } from 'components';
import DashboardPageContent from 'components/Dashboard/DashboardPageContent';
import VendorsBalanceSummaryActionsBar from './VendorsBalanceSummaryActionsBar';
import VendorsBalanceSummaryHeader from './VendorsBalanceSummaryHeader';
import VendorsBalanceSummaryTable from './VendorsBalanceSummaryTable';
import { VendorsBalanceSummaryProvider } from './VendorsBalanceSummaryProvider';
import { VendorsSummarySheetLoadingBar } from './components';
import withVendorsBalanceSummaryActions from './withVendorsBalanceSummaryActions';
import withSettings from 'containers/Settings/withSettings';
import { compose } from 'utils';
/**
* Vendors Balance summary.
*/
function VendorsBalanceSummary({
// #withPreferences
organizationName,
// #withVendorsBalanceSummaryActions
toggleVendorSummaryFilterDrawer,
}) {
const [filter, setFilter] = useState({
asDate: moment().endOf('day').format('YYYY-MM-DD'),
});
// Handle refetch vendors balance summary.
const handleFilterSubmit = (filter) => {
const _filter = {
...filter,
asDate: moment(filter.asDate).format('YYYY-MM-DD'),
};
setFilter(_filter);
};
// Handle number format submit.
const handleNumberFormatSubmit = (format) => {
setFilter({
...filter,
numberFormat: format,
});
};
useEffect(
() => () => {
toggleVendorSummaryFilterDrawer(false);
},
[toggleVendorSummaryFilterDrawer],
);
return (
<VendorsBalanceSummaryProvider filter={filter}>
<VendorsBalanceSummaryActionsBar
numberFormat={filter?.numberFormat}
onNumberFormatSubmit={handleNumberFormatSubmit}
/>
<VendorsSummarySheetLoadingBar />
<DashboardPageContent>
<FinancialStatement>
<VendorsBalanceSummaryHeader
pageFilter={filter}
onSubmitFilter={handleFilterSubmit}
/>
<div className={'financial-statement__body'}>
<VendorsBalanceSummaryTable organizationName={organizationName} />
</div>
</FinancialStatement>
</DashboardPageContent>
</VendorsBalanceSummaryProvider>
);
}
export default compose(
withSettings(({ organizationSettings }) => ({
organizationName: organizationSettings?.name,
})),
withVendorsBalanceSummaryActions,
)(VendorsBalanceSummary);

View File

@@ -0,0 +1,126 @@
import React from 'react';
import {
NavbarDivider,
NavbarGroup,
Classes,
Button,
Popover,
PopoverInteractionKind,
Position,
} from '@blueprintjs/core';
import { FormattedMessage as T } from 'react-intl';
import classNames from 'classnames';
import { Icon } from 'components';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import NumberFormatDropdown from 'components/NumberFormatDropdown';
import withVendorsBalanceSummary from './withVendorsBalanceSummary';
import withVendorsBalanceSummaryActions from './withVendorsBalanceSummaryActions';
import { useVendorsBalanceSummaryContext } from './VendorsBalanceSummaryProvider';
import { saveInvoke, compose } from 'utils';
/**
* Vendors balance summary action bar.
*/
function VendorsBalanceSummaryActionsBar({
//#ownProps
numberFormat,
onNumberFormatSubmit,
// #withVendorsBalanceSummary
isFilterDrawerOpen,
// #withVendorsBalanceSummaryActions
toggleVendorSummaryFilterDrawer,
}) {
const {
isVendorsBalanceLoading,
refetch,
} = useVendorsBalanceSummaryContext();
const handleFilterToggleClick = () => {
toggleVendorSummaryFilterDrawer();
};
// handle recalculate report button.
const handleRecalculateReport = () => {
refetch();
};
// handle number format submit.
const handleNumberFormatSubmit = (numberFormat) => {
saveInvoke(onNumberFormatSubmit, numberFormat);
};
return (
<DashboardActionsBar>
<NavbarGroup>
<Button
className={classNames(Classes.MINIMAL, 'button--gray-highlight')}
text={<T id={'recalc_report'} />}
onClick={handleRecalculateReport}
icon={<Icon icon="refresh-16" iconSize={16} />}
/>
<NavbarDivider />
<Button
className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon="cog-16" iconSize={16} />}
text={
isFilterDrawerOpen ? (
<T id={'hide_customizer'} />
) : (
<T id={'customize_report'} />
)
}
onClick={handleFilterToggleClick}
active={isFilterDrawerOpen}
/>
<NavbarDivider />
<Popover
content={
<NumberFormatDropdown
numberFormat={numberFormat}
onSubmit={handleNumberFormatSubmit}
submitDisabled={isVendorsBalanceLoading}
/>
}
minimal={true}
interactionKind={PopoverInteractionKind.CLICK}
position={Position.BOTTOM_LEFT}
>
<Button
className={classNames(Classes.MINIMAL, 'button--filter')}
text={<T id={'format'} />}
icon={<Icon icon="numbers" width={23} height={16} />}
/>
</Popover>
<Button
className={Classes.MINIMAL}
text={<T id={'filter'} />}
icon={<Icon icon="filter-16" iconSize={16} />}
/>
<NavbarDivider />
<Button
className={Classes.MINIMAL}
icon={<Icon icon="print-16" iconSize={16} />}
text={<T id={'print'} />}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="file-export-16" iconSize={16} />}
text={<T id={'export'} />}
/>
</NavbarGroup>
</DashboardActionsBar>
);
}
export default compose(
withVendorsBalanceSummaryActions,
withVendorsBalanceSummary(({ VendorsSummaryFilterDrawer }) => ({
isFilterDrawerOpen: VendorsSummaryFilterDrawer,
})),
)(VendorsBalanceSummaryActionsBar);

View File

@@ -0,0 +1,89 @@
import React from 'react';
import * as Yup from 'yup';
import { Formik, Form } from 'formik';
import moment from 'moment';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import { FormattedMessage as T } from 'react-intl';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import withVendorsBalanceSummary from './withVendorsBalanceSummary';
import withVendorsBalanceSummaryActions from './withVendorsBalanceSummaryActions';
import VendorsBalanceSummaryHeaderGeneral from './VendorsBalanceSummaryHeaderGeneral';
import { compose } from 'utils';
/**
* Vendors balance summary drawer header.
*/
function VendorsBalanceSummaryHeader({
// #ownProps
pageFilter,
onSubmitFilter,
//#withVendorsBalanceSummary
VendorsSummaryFilterDrawer,
//#withVendorsBalanceSummaryActions
toggleVendorSummaryFilterDrawer,
}) {
// validation schema.
const validationSchema = Yup.object().shape({
asDate: Yup.date().required().label('asDate'),
});
// filter form initial values.
const initialValues = {
...pageFilter,
asDate: moment(pageFilter.asDate).toDate(),
};
// handle form submit.
const handleSubmit = (values, { setSubmitting }) => {
onSubmitFilter(values);
toggleVendorSummaryFilterDrawer(false);
setSubmitting(false);
};
// handle cancel button click.
const handleCancelClick = () => {
toggleVendorSummaryFilterDrawer(false);
};
return (
<FinancialStatementHeader
isOpen={VendorsSummaryFilterDrawer}
drawerProps={{ onClose: handleCancelClick }}
>
<Formik
initialValues={initialValues}
validationSchema={validationSchema}
onSubmit={handleSubmit}
>
<Form>
<Tabs animate={true} vertical={true} renderActiveTabPanelOnly={true}>
<Tab
id={'general'}
title={<T id={'general'} />}
panel={<VendorsBalanceSummaryHeaderGeneral />}
/>
</Tabs>
<div className={'financial-header-drawer__footer'}>
<Button className={'mr1'} intent={Intent.PRIMARY} type={'submit'}>
<T id={'calculate_report'} />
</Button>
<Button onClick={handleCancelClick} minimal={true}>
<T id={'cancel'} />
</Button>
</div>
</Form>
</Formik>
</FinancialStatementHeader>
);
}
export default compose(
withVendorsBalanceSummary(({ VendorsSummaryFilterDrawer }) => ({
VendorsSummaryFilterDrawer,
})),
withVendorsBalanceSummaryActions,
)(VendorsBalanceSummaryHeader);

View File

@@ -0,0 +1,64 @@
import React from 'react';
import { FastField } from 'formik';
import { DateInput } from '@blueprintjs/datetime';
import { FormGroup, Position, Classes, Checkbox } from '@blueprintjs/core';
import { FormattedMessage as T } from 'react-intl';
import { Row, Col, FieldHint } from 'components';
import {
momentFormatter,
tansformDateValue,
inputIntent,
handleDateChange,
} from 'utils';
/**
* Vendors balance header -general panel.
*/
export default function VendorsBalanceSummaryHeaderGeneral() {
return (
<div>
<Row>
<Col xs={5}>
<FastField name={'asDate'}>
{({ form, field: { value }, meta: { error } }) => (
<FormGroup
label={<T id={'as_date'} />}
labelInfo={<FieldHint />}
fill={true}
intent={inputIntent({ error })}
>
<DateInput
{...momentFormatter('YYYY/MM/DD')}
value={tansformDateValue(value)}
onChange={handleDateChange((selectedDate) => {
form.setFieldValue('asDate', selectedDate);
})}
popoverProps={{ position: Position.BOTTOM, minimal: true }}
minimal={true}
fill={true}
/>
</FormGroup>
)}
</FastField>
</Col>
</Row>
<Row>
<Col xs={5}>
<FastField name={'percentage'} type={'checkbox'}>
{({ field }) => (
<FormGroup labelInfo={<FieldHint />}>
<Checkbox
inline={true}
small={true}
label={'Percentage Of Column'}
name={'percentage'}
{...field}
/>
</FormGroup>
)}
</FastField>
</Col>
</Row>
</div>
);
}

View File

@@ -0,0 +1,41 @@
import React from 'react';
import FinancialReportPage from '../FinancialReportPage';
import { useVendorsBalanceSummaryReport } from 'hooks/query';
import { transformFilterFormToQuery } from '../common';
const VendorsBalanceSummaryContext = React.createContext();
/**
* Vendors balance summary provider.
*/
function VendorsBalanceSummaryProvider({ filter, ...props }) {
// const query = React.useMemo(() => transformFilterFormToQuery(filter), [
// filter,
// ]);
const {
data: VendorBalanceSummary,
isLoading: isVendorsBalanceLoading,
isFetching: isVendorsBalanceFetching,
refetch,
} = useVendorsBalanceSummaryReport(filter, {
keepPreviousData: true,
});
const provider = {
VendorBalanceSummary,
isVendorsBalanceLoading,
isVendorsBalanceFetching,
refetch,
};
return (
<FinancialReportPage name={'vendors-balance-summary'}>
<VendorsBalanceSummaryContext.Provider value={provider} {...props} />
</FinancialReportPage>
);
}
const useVendorsBalanceSummaryContext = () =>
React.useContext(VendorsBalanceSummaryContext);
export { VendorsBalanceSummaryProvider, useVendorsBalanceSummaryContext };

View File

@@ -0,0 +1,47 @@
import React from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { DataTable } from 'components';
import FinancialSheet from 'components/FinancialSheet';
import { useVendorsBalanceColumns } from './components';
import { useVendorsBalanceSummaryContext } from './VendorsBalanceSummaryProvider';
/**
* Vendors balance summary table.
*/
export default function VendorsBalanceSummaryTable({
//#ownProps
organizationName,
}) {
const { formatMessage } = useIntl();
const {
VendorBalanceSummary,
isVendorsBalanceLoading,
} = useVendorsBalanceSummaryContext();
// vendors balance summary columns.
const columns = useVendorsBalanceColumns();
const rowClassNames = (row) => {
return [`row-type--${row.original.rowTypes}`];
};
return (
<FinancialSheet
companyName={organizationName}
name={'vendors-balance-summary'}
sheetType={formatMessage({ id: 'vendors_balance_summary' })}
asDate={new Date()}
loading={isVendorsBalanceLoading}
>
<DataTable
className={'bigcapital-datatable--financial-report'}
columns={columns}
data={VendorBalanceSummary?.tableRows}
rowClassNames={rowClassNames}
noInitialFetch={true}
/>
</FinancialSheet>
);
}

View File

@@ -0,0 +1,47 @@
import React, { useMemo } from 'react';
import { formatMessage } from 'services/intl';
import { If } from 'components';
import { getColumnWidth } from 'utils';
import FinancialLoadingBar from '../FinancialLoadingBar';
import { useVendorsBalanceSummaryContext } from './VendorsBalanceSummaryProvider';
/**
* Retrieve vendors balance summary columns.
*/
export const useVendorsBalanceColumns = () => {
return useMemo(() => [
{
Header: formatMessage({ id: 'vendor_name' }),
accessor: 'cells[0].value',
className: 'customer_name',
width: 240,
sticky: 'left',
textOverview: true,
},
{
Header: formatMessage({ id: 'total' }),
accessor: 'cells[1].value',
className: 'total',
width: 140,
},
{
Header: formatMessage({ id: 'percentage_of_column' }),
accessor: 'cells[2].value',
// className: 'total',
width: 140,
},
]);
};
/**
* vendors balance summary loading bar.
*/
export function VendorsSummarySheetLoadingBar() {
const { isVendorsBalanceFetching } = useVendorsBalanceSummaryContext();
return (
<If condition={isVendorsBalanceFetching}>
<FinancialLoadingBar />
</If>
);
}

View File

@@ -0,0 +1,15 @@
import { connect } from 'react-redux';
import { getVendorsBalanceSummaryFilterDrawer } from 'store/financialStatement/financialStatements.selectors';
export default (mapState) => {
const mapStateToProps = (state, props) => {
const mapped = {
VendorsSummaryFilterDrawer: getVendorsBalanceSummaryFilterDrawer(
state,
props,
),
};
return mapState ? mapState(mapped, state, props) : mapped;
};
return connect(mapStateToProps);
};

View File

@@ -0,0 +1,9 @@
import { connect } from 'react-redux';
import { toggleVendorsBalanceSummaryFilterDrawer } from 'store/financialStatement/financialStatements.actions';
const mapActionsToProps = (dispatch) => ({
toggleVendorSummaryFilterDrawer: (toggle) =>
dispatch(toggleVendorsBalanceSummaryFilterDrawer(toggle)),
});
export default connect(null, mapActionsToProps);

View File

@@ -287,3 +287,80 @@ export function useSalesByItems(query, props) {
},
);
}
/**
* Retrieve customers balance summary report.
*/
export function useCustomerBalanceSummaryReport(query, props) {
return useRequestQuery(
[t.FINANCIAL_REPORT, t.CUSTOMERS_BALANCE_SUMMARY, query],
{
method: 'get',
url: '/financial_statements/customer-balance-summary',
params: query,
},
{
select: (res) => ({
columns: res.data.columns,
query: res.data.query,
tableRows: res.data.table.rows,
}),
defaultData: {
tableRows: [],
query: {},
},
...props,
},
);
}
/**
* Retrieve vendors balance summary report.
*/
export function useVendorsBalanceSummaryReport(query, props) {
return useRequestQuery(
[t.FINANCIAL_REPORT, t.VENDORS_BALANCE_SUMMARY, query],
{
method: 'get',
url: '/financial_statements/vendor-balance-summary',
params: query,
},
{
select: (res) => ({
columns: res.data.columns,
query: res.data.query,
tableRows: res.data.table.rows,
}),
defaultData: {
tableRows: [],
query: {},
},
...props,
},
);
}
/**
* Retrieve customers transcations report.
*/
export function useCustomersTranscationsReport(query, props) {
return useRequestQuery(
[t.FINANCIAL_REPORT, t.CUSTOMERS_TRANSACTIONS, query],
{
method: 'get',
url: '/financial_statements/transactions-by-customers',
params: query,
},
{
select: (res) => ({
data: res.data.table,
tableRows: res.data.table.rows,
}),
defaultData: {
tableRows: [],
data: [],
},
...props,
},
);
}

View File

@@ -112,7 +112,8 @@ export default [
import('containers/FinancialStatements/GeneralLedger/GeneralLedger'),
),
breadcrumb: 'General Ledger',
hint: "Reports every transaction going in and out of your accounts and organized by accounts and date to monitoring activity of accounts.",
hint:
'Reports every transaction going in and out of your accounts and organized by accounts and date to monitoring activity of accounts.',
hotkey: 'shift+4',
pageTitle: formatMessage({ id: 'general_ledger' }),
backLink: true,
@@ -124,7 +125,8 @@ export default [
import('containers/FinancialStatements/BalanceSheet/BalanceSheet'),
),
breadcrumb: 'Balance Sheet',
hint: "Reports a company's assets, liabilities and shareholders' equity at a specific point in time with comparison period(s).",
hint:
"Reports a company's assets, liabilities and shareholders' equity at a specific point in time with comparison period(s).",
hotkey: 'shift+1',
pageTitle: formatMessage({ id: 'balance_sheet' }),
backLink: true,
@@ -138,7 +140,8 @@ export default [
),
),
breadcrumb: 'Trial Balance Sheet',
hint: "Summarizes the credit and debit balance of each account in your chart of accounts at a specific point in time. ",
hint:
'Summarizes the credit and debit balance of each account in your chart of accounts at a specific point in time. ',
hotkey: 'shift+5',
pageTitle: formatMessage({ id: 'trial_balance_sheet' }),
backLink: true,
@@ -150,7 +153,8 @@ export default [
import('containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet'),
),
breadcrumb: 'Profit Loss Sheet',
hint: "Reports the revenues, costs and expenses incurred during a specific point in time with comparison period(s).",
hint:
'Reports the revenues, costs and expenses incurred during a specific point in time with comparison period(s).',
hotkey: 'shift+2',
pageTitle: formatMessage({ id: 'profit_loss_sheet' }),
backLink: true,
@@ -162,7 +166,8 @@ export default [
import('containers/FinancialStatements/ARAgingSummary/ARAgingSummary'),
),
breadcrumb: 'Receivable Aging Summary',
hint: "Summarize total unpaid balances of customers invoices with number of days the unpaid invoice is overdue.",
hint:
'Summarize total unpaid balances of customers invoices with number of days the unpaid invoice is overdue.',
pageTitle: formatMessage({ id: 'receivable_aging_summary' }),
backLink: true,
sidebarExpand: false,
@@ -173,7 +178,8 @@ export default [
import('containers/FinancialStatements/APAgingSummary/APAgingSummary'),
),
breadcrumb: 'Payable Aging Summary',
hint: "Summarize total unpaid balances of vendors purchase invoices with the number of days the unpaid invoice is overdue.",
hint:
'Summarize total unpaid balances of vendors purchase invoices with the number of days the unpaid invoice is overdue.',
pageTitle: formatMessage({ id: 'payable_aging_summary' }),
backLink: true,
sidebarExpand: false,
@@ -184,7 +190,8 @@ export default [
import('containers/FinancialStatements/Journal/Journal'),
),
breadcrumb: 'Journal Sheet',
hint: "The debit and credit entries of system transactions, sorted by date.",
hint:
'The debit and credit entries of system transactions, sorted by date.',
hotkey: 'shift+3',
pageTitle: formatMessage({ id: 'journal_sheet' }),
sidebarExpand: false,
@@ -210,7 +217,8 @@ export default [
),
breadcrumb: 'Sales by Items',
pageTitle: formatMessage({ id: 'sales_by_items' }),
hint: 'Summarize the businesss sold items quantity, income and average income rate of each item during a specific point in time.',
hint:
'Summarize the businesss sold items quantity, income and average income rate of each item during a specific point in time.',
backLink: true,
sidebarExpand: false,
},
@@ -222,11 +230,64 @@ export default [
),
),
breadcrumb: 'Inventory Valuation ',
hint: 'Summerize your transactions for each inventory item and how they affect quantity, valuation and weighted average.',
hint:
'Summerize your transactions for each inventory item and how they affect quantity, valuation and weighted average.',
pageTitle: formatMessage({ id: 'inventory_valuation' }),
backLink: true,
sidebarExpand: false,
},
{
path: `/financial-reports/customers-balance-summary`,
component: lazy(() =>
import(
'containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummary'
),
),
breadcrumb: 'Customers Balance Summary ',
hint: '..',
pageTitle: formatMessage({ id: 'customers_balance_summary' }),
backLink: true,
sidebarExpand: false,
},
{
path: `/financial-reports/vendors-balance-summary`,
component: lazy(() =>
import(
'containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummary'
),
),
breadcrumb: 'Vendors Balance Summary ',
hint: '..',
pageTitle: formatMessage({ id: 'vendors_balance_summary' }),
backLink: true,
sidebarExpand: false,
},
{
path: `/financial-reports/transactions-by-customers`,
// component: lazy(() =>
// import(
// 'containers/FinancialStatements/CustomersTransactions/CustomersTransactions'
// ),
// ),
breadcrumb: 'Customers Transactions ',
hint: '..',
pageTitle: formatMessage({ id: 'customers_transactions' }),
backLink: true,
sidebarExpand: false,
},
{
path: `/financial-reports/vendors-transactions`,
// component: lazy(() =>
// import(
// 'containers/FinancialStatements/'
// ),
// ),
breadcrumb: 'Vendors Transactions ',
hint: '..',
pageTitle: formatMessage({ id: 'vendors_transactions' }),
backLink: true,
sidebarExpand: false,
},
{
path: '/financial-reports',
component: lazy(() =>

View File

@@ -128,3 +128,54 @@ export function toggleInventoryValuationFilterDrawer(toggle) {
},
};
}
/**
* Toggles display of the customers balance summary filter drawer.
* @param {boolean} toggle
*/
export function toggleCustomersBalanceSummaryFilterDrawer(toggle) {
return {
type: `${t.CUSTOMERS_BALANCE_SUMMARY}/${t.DISPLAY_FILTER_DRAWER_TOGGLE}`,
payload: {
toggle,
},
};
}
/**
* Toggles display of the vendors balance summary filter drawer.
* @param {boolean} toggle
*/
export function toggleVendorsBalanceSummaryFilterDrawer(toggle) {
return {
type: `${t.VENDORS_BALANCE_SUMMARY}/${t.DISPLAY_FILTER_DRAWER_TOGGLE}`,
payload: {
toggle,
},
};
}
/**
* Toggles display of the customers transactions filter drawer.
* @param {boolean} toggle
*/
export function toggleCustomersTransactionsFilterDrawer(toggle) {
return {
type: `${t.CUSTOMERS_TRANSACTIONS}/${t.DISPLAY_FILTER_DRAWER_TOGGLE}`,
payload: {
toggle,
},
};
}
// /**
// * Toggles display of the vendors transactions filter drawer.
// * @param {boolean} toggle
// */
// export function toggleVendorsTransactionsFilterDrawer(toggle) {
// return {
// type: `${t.VENDORS_TRANSACTIONS}/${t.DISPLAY_FILTER_DRAWER_TOGGLE}`,
// payload: {
// toggle,
// },
// };
// }

View File

@@ -33,6 +33,18 @@ const initialState = {
inventoryValuation: {
displayFilterDrawer: false,
},
customersBalanceSummary: {
displayFilterDrawer: false,
},
vendorsBalanceSummary: {
displayFilterDrawer: false,
},
customersTransactions: {
displayFilterDrawer: false,
},
vendorsTransactions: {
displayFilterDrawer: false,
},
};
/**
@@ -63,4 +75,20 @@ export default createReducer(initialState, {
t.INVENTORY_VALUATION,
'inventoryValuation',
),
...financialStatementFilterToggle(
t.CUSTOMERS_BALANCE_SUMMARY,
'customersBalanceSummary',
),
...financialStatementFilterToggle(
t.VENDORS_BALANCE_SUMMARY,
'vendorsBalanceSummary',
),
...financialStatementFilterToggle(
t.CUSTOMERS_TRANSACTIONS,
'customersTransactions',
),
...financialStatementFilterToggle(
t.VENDORS_TRANSACTIONS,
'vendorsTransactions',
),
});

View File

@@ -49,6 +49,22 @@ export const inventoryValuationFilterDrawerSelector = (state) => {
return filterDrawerByTypeSelector('inventoryValuation')(state);
};
export const customerBalanceSummaryFilterDrawerSelector = (state) => {
return filterDrawerByTypeSelector('customersBalanceSummary')(state);
};
export const vendorsBalanceSummaryFilterDrawerSelector = (state) => {
return filterDrawerByTypeSelector('vendorsBalanceSummary')(state);
};
export const customersTransactionsFilterDrawerSelector = (state) => {
return filterDrawerByTypeSelector('customersTransactions')(state);
};
export const vendorsTransactionsFilterDrawerSelector = (state) => {
return filterDrawerByTypeSelector('vendorsTransactions')(state);
};
/**
* Retrieve balance sheet filter drawer.
*/
@@ -156,3 +172,42 @@ export const getInventoryValuationFilterDrawer = createSelector(
return isOpen;
},
);
/**
* Retrieve customers balance summary filter drawer.
*/
export const getCustomersBalanceSummaryFilterDrawer = createSelector(
customerBalanceSummaryFilterDrawerSelector,
(isOpen) => {
return isOpen;
},
);
/**
* Retrieve vendors balance summary filter drawer.
*/
export const getVendorsBalanceSummaryFilterDrawer = createSelector(
vendorsBalanceSummaryFilterDrawerSelector,
(isOpen) => {
return isOpen;
},
);
/**
* Retrieve customers transactions filter drawer.
*/
export const getCustomersTransactionsFilterDrawer = createSelector(
customersTransactionsFilterDrawerSelector,
(isOpen) => {
return isOpen;
},
);
/**
* Retrieve vendors transactions filter drawer.
*/
export const getVendorsTransactionsFilterDrawer = createSelector(
vendorsTransactionsFilterDrawerSelector,
(isOpen) => {
return isOpen;
},
);

View File

@@ -10,4 +10,8 @@ export default {
PURCHASES_BY_ITEMS: 'PURCHASES_BY_ITEMS',
SALES_BY_ITEMS: 'SALES_BY_ITEMS',
INVENTORY_VALUATION: 'INVENTORY_VALUATION',
CUSTOMERS_BALANCE_SUMMARY: 'CUSTOMERS BALANCE SUMMARY',
VENDORS_BALANCE_SUMMARY: 'VENDORS BALANCE SUMMARY',
CUSTOMERS_TRANSACTIONS: 'CUSTOMERS TRANSACTIONS',
// VENDORS_TRANSACTIONS: 'CUSTOMERS TRANSACTIONS',
};

View File

@@ -0,0 +1,31 @@
.financial-sheet {
&--customers-balance-summary,
&--vendors-balance-summary {
.financial-sheet__table {
.thead,
.tbody {
.tr .td.customer_name ~ .td,
.tr .th.customer_name ~ .th {
text-align: right;
}
}
.tbody {
.tr:not(.no-results) {
.td {
border-bottom: 0;
padding-top: 0.4rem;
padding-bottom: 0.4rem;
}
&.row-type--TOTAL {
font-weight: 500;
.td {
border-top: 1px solid #bbb;
border-bottom: 3px double #333;
}
}
}
}
}
}
}