fix (*): correct names

This commit is contained in:
elforjani3
2021-05-08 17:28:01 +02:00
parent 0795aeb914
commit b3f9767a2c
11 changed files with 94 additions and 46 deletions

View File

@@ -71,7 +71,7 @@ export const SalesAndPurchasesReportMenus = [
link: '/financial-reports/inventory-valuation', link: '/financial-reports/inventory-valuation',
}, },
{ {
title: 'Customer Balance summary', title: 'Customers Balance summary',
desc: 'Summerize the total amount of each customer owes your business.', desc: 'Summerize the total amount of each customer owes your business.',
link: '/financial-reports/customers-balance-summary', link: '/financial-reports/customers-balance-summary',
}, },

View File

@@ -7,12 +7,12 @@ import DashboardPageContent from 'components/Dashboard/DashboardPageContent';
import CustomersTransactionsHeader from './CustomersTransactionsHeader'; import CustomersTransactionsHeader from './CustomersTransactionsHeader';
import CustomersTransactionsTable from './CustomersTransactionsTable'; import CustomersTransactionsTable from './CustomersTransactionsTable';
import CustomersTranscationsActionsBar from './CustomersTranscationsActionsBar'; import CustomersTransactionsActionsBar from './CustomersTransactionsActionsBar';
import withCustomersTransactionsActions from './withCustomersTransactionsActions'; import withCustomersTransactionsActions from './withCustomersTransactionsActions';
import withSettings from 'containers/Settings/withSettings'; import withSettings from 'containers/Settings/withSettings';
import { CustomersTranscationsLoadingBar } from './components'; import { CustomersTransactionsLoadingBar } from './components';
import { CustomersTranscationsProvider } from './CustomersTranscationsProvider'; import { CustomersTransactionsProvider } from './CustomersTransactionsProvider';
import { compose } from 'utils'; import { compose } from 'utils';
@@ -57,12 +57,12 @@ function CustomersTransactions({
); );
return ( return (
<CustomersTranscationsProvider filter={filter}> <CustomersTransactionsProvider filter={filter}>
<CustomersTranscationsActionsBar <CustomersTransactionsActionsBar
numberFormat={filter.numberFormat} numberFormat={filter.numberFormat}
onNumberFormatSubmit={handleNumberFormatSubmit} onNumberFormatSubmit={handleNumberFormatSubmit}
/> />
<CustomersTranscationsLoadingBar /> <CustomersTransactionsLoadingBar />
<DashboardPageContent> <DashboardPageContent>
<FinancialStatement> <FinancialStatement>
<div className={'financial-statement--transactions'}> <div className={'financial-statement--transactions'}>
@@ -77,7 +77,7 @@ function CustomersTransactions({
</div> </div>
</FinancialStatement> </FinancialStatement>
</DashboardPageContent> </DashboardPageContent>
</CustomersTranscationsProvider> </CustomersTransactionsProvider>
); );
} }
export default compose( export default compose(

View File

@@ -0,0 +1,42 @@
import React, { createContext, useContext, useMemo } from 'react';
import FinancialReportPage from '../FinancialReportPage';
import { useCustomersTransactionsReport } from 'hooks/query';
import { transformFilterFormToQuery } from '../common';
const CustomersTransactionsContext = createContext();
/**
* Customers transactions provider.
*/
function CustomersTransactionsProvider({ filter, ...props }) {
const query = useMemo(() => transformFilterFormToQuery(filter), [
filter,
]);
// fetches the customers transactions.
const {
data: customersTransactions,
isFetching: isCustomersTransactionsFetching,
isLoading: isCustomersTransactionsLoading,
refetch: CustomersTransactionsRefetch,
} = useCustomersTransactionsReport(query, { keepPreviousData: true });
const provider = {
customersTransactions,
isCustomersTransactionsFetching,
isCustomersTransactionsLoading,
CustomersTransactionsRefetch,
filter,
query
};
return (
<FinancialReportPage name={'customer-transactions'}>
<CustomersTransactionsContext.Provider value={provider} {...props} />
</FinancialReportPage>
);
}
const useCustomersTransactionsContext = () =>
useContext(CustomersTransactionsContext);
export { CustomersTransactionsProvider, useCustomersTransactionsContext };

View File

@@ -4,13 +4,13 @@ import classNames from 'classnames';
import FinancialSheet from 'components/FinancialSheet'; import FinancialSheet from 'components/FinancialSheet';
import DataTable from 'components/DataTable'; import DataTable from 'components/DataTable';
import { useCustomersTranscationsColumns } from './components'; import { useCustomersTransactionsColumns } from './components';
import { useCustomersTranscationsContext } from './CustomersTranscationsProvider'; import { useCustomersTransactionsContext } from './CustomersTransactionsProvider';
import { defaultExpanderReducer, getColumnWidth } from 'utils'; import { defaultExpanderReducer, getColumnWidth } from 'utils';
/** /**
* Customers transcations table. * Customers transactions table.
*/ */
export default function CustomersTransactionsTable({ export default function CustomersTransactionsTable({
// #ownProps // #ownProps
@@ -21,10 +21,10 @@ export default function CustomersTransactionsTable({
const { const {
customersTransactions: { tableRows }, customersTransactions: { tableRows },
isCustomersTransactionsLoading, isCustomersTransactionsLoading,
filter, query,
} = useCustomersTranscationsContext(); } = useCustomersTransactionsContext();
const columns = useCustomersTranscationsColumns(); const columns = useCustomersTransactionsColumns();
const expandedRows = useMemo(() => defaultExpanderReducer(tableRows, 4), [ const expandedRows = useMemo(() => defaultExpanderReducer(tableRows, 4), [
tableRows, tableRows,
@@ -40,8 +40,8 @@ export default function CustomersTransactionsTable({
companyName={companyName} companyName={companyName}
sheetType={formatMessage({ id: 'customers_transactions' })} sheetType={formatMessage({ id: 'customers_transactions' })}
loading={isCustomersTransactionsLoading} loading={isCustomersTransactionsLoading}
fromDate={filter.fromDate} fromDate={query.fromDate}
toDate={filter.toDate} toDate={query.toDate}
> >
<DataTable <DataTable
className="bigcapital-datatable--financial-report" className="bigcapital-datatable--financial-report"

View File

@@ -1,19 +1,18 @@
import React from 'react'; import React from 'react';
import { formatMessage } from 'services/intl'; import { formatMessage } from 'services/intl';
import { If } from 'components'; import { If } from 'components';
import { useCustomersTranscationsContext } from './CustomersTranscationsProvider'; import { useCustomersTransactionsContext } from './CustomersTransactionsProvider';
import FinancialLoadingBar from '../FinancialLoadingBar'; import FinancialLoadingBar from '../FinancialLoadingBar';
import { getForceWidth, defaultExpanderReducer, getColumnWidth } from 'utils'; import { getForceWidth, defaultExpanderReducer, getColumnWidth } from 'utils';
import { CellTextSpan } from 'components/Datatable/Cells'; import { CellTextSpan } from 'components/Datatable/Cells';
/** /**
* Retrieve customers transcations columns. * Retrieve customers transactions columns.
*/ */
export const useCustomersTranscationsColumns = () => { export const useCustomersTransactionsColumns = () => {
const { const {
customersTransactions: { tableRows }, customersTransactions: { tableRows },
isCustomersTransactionsLoading, } = useCustomersTransactionsContext();
} = useCustomersTranscationsContext();
return React.useMemo( return React.useMemo(
() => [ () => [
@@ -88,10 +87,10 @@ export const useCustomersTranscationsColumns = () => {
}; };
/** /**
* customers transcations loading bar. * customers transactions loading bar.
*/ */
export function CustomersTranscationsLoadingBar() { export function CustomersTransactionsLoadingBar() {
const { isCustomersTransactionsLoading } = useCustomersTranscationsContext(); const { isCustomersTransactionsLoading } = useCustomersTransactionsContext();
return ( return (
<If condition={isCustomersTransactionsLoading}> <If condition={isCustomersTransactionsLoading}>

View File

@@ -1,12 +1,12 @@
import React, { createContext, useContext, useMemo } from 'react'; import React, { createContext, useContext, useMemo } from 'react';
import FinancialReportPage from '../FinancialReportPage'; import FinancialReportPage from '../FinancialReportPage';
import { useVendorsTranscationsReport } from 'hooks/query'; import { useVendorsTransactionsReport } from 'hooks/query';
import { transformFilterFormToQuery } from '../common'; import { transformFilterFormToQuery } from '../common';
const VendorsTransactionsContext = createContext(); const VendorsTransactionsContext = createContext();
/** /**
* Vendors transcations provider. * Vendors transactions provider.
*/ */
function VendorsTransactionsProvider({ filter, ...props }) { function VendorsTransactionsProvider({ filter, ...props }) {
const query = useMemo(() => transformFilterFormToQuery(filter), [filter]); const query = useMemo(() => transformFilterFormToQuery(filter), [filter]);
@@ -16,7 +16,7 @@ function VendorsTransactionsProvider({ filter, ...props }) {
isFetching: isVendorsTransactionFetching, isFetching: isVendorsTransactionFetching,
isLoading: isVendorsTransactionsLoading, isLoading: isVendorsTransactionsLoading,
refetch, refetch,
} = useVendorsTranscationsReport(); } = useVendorsTransactionsReport(query, { keepPreviousData: true });
const provider = { const provider = {
vendorsTransactions, vendorsTransactions,
@@ -34,7 +34,7 @@ function VendorsTransactionsProvider({ filter, ...props }) {
); );
} }
const useVendorsTranscationsContext = () => const useVendorsTransactionsContext = () =>
useContext(VendorsTransactionsContext); useContext(VendorsTransactionsContext);
export { VendorsTransactionsProvider, useVendorsTranscationsContext }; export { VendorsTransactionsProvider, useVendorsTransactionsContext };

View File

@@ -5,12 +5,12 @@ import classNames from 'classnames';
import FinancialSheet from 'components/FinancialSheet'; import FinancialSheet from 'components/FinancialSheet';
import DataTable from 'components/DataTable'; import DataTable from 'components/DataTable';
import { useVendorsTransactionsColumns } from './components'; import { useVendorsTransactionsColumns } from './components';
import { useVendorsTranscationsContext } from './VendorsTransactionsProvider'; import { useVendorsTransactionsContext } from './VendorsTransactionsProvider';
import { defaultExpanderReducer, getColumnWidth } from 'utils'; import { defaultExpanderReducer, getColumnWidth } from 'utils';
/** /**
* Vendors transcations table. * Vendors transactions table.
*/ */
export default function VendorsTransactionsTable({ export default function VendorsTransactionsTable({
@@ -22,8 +22,8 @@ export default function VendorsTransactionsTable({
const { const {
vendorsTransactions: { tableRows }, vendorsTransactions: { tableRows },
isVendorsTransactionsLoading, isVendorsTransactionsLoading,
filter, query,
} = useVendorsTranscationsContext(); } = useVendorsTransactionsContext();
const columns = useVendorsTransactionsColumns(); const columns = useVendorsTransactionsColumns();
@@ -41,8 +41,8 @@ export default function VendorsTransactionsTable({
companyName={companyName} companyName={companyName}
sheetType={formatMessage({ id: 'vendors_transactions' })} sheetType={formatMessage({ id: 'vendors_transactions' })}
loading={isVendorsTransactionsLoading} loading={isVendorsTransactionsLoading}
fromDate={filter.fromDate} fromDate={query.fromDate}
toDate={filter.toDate} toDate={query.toDate}
> >
<DataTable <DataTable
className="bigcapital-datatable--financial-report" className="bigcapital-datatable--financial-report"

View File

@@ -1,18 +1,18 @@
import React from 'react'; import React from 'react';
import { formatMessage } from 'services/intl'; import { formatMessage } from 'services/intl';
import { If } from 'components'; import { If } from 'components';
import { useVendorsTranscationsContext } from './VendorsTransactionsProvider'; import { useVendorsTransactionsContext } from './VendorsTransactionsProvider';
import FinancialLoadingBar from '../FinancialLoadingBar'; import FinancialLoadingBar from '../FinancialLoadingBar';
import { defaultExpanderReducer, getColumnWidth, getForceWidth } from 'utils'; import { defaultExpanderReducer, getColumnWidth, getForceWidth } from 'utils';
import { CellTextSpan } from 'components/Datatable/Cells'; import { CellTextSpan } from 'components/Datatable/Cells';
/** /**
* Retrieve vendors transcations columns. * Retrieve vendors transactions columns.
*/ */
export const useVendorsTransactionsColumns = () => { export const useVendorsTransactionsColumns = () => {
const { const {
vendorsTransactions: { tableRows }, vendorsTransactions: { tableRows },
} = useVendorsTranscationsContext(); } = useVendorsTransactionsContext();
return React.useMemo( return React.useMemo(
() => [ () => [
@@ -87,10 +87,10 @@ export const useVendorsTransactionsColumns = () => {
}; };
/** /**
* vendors transcations loading bar. * vendors transactions loading bar.
*/ */
export function VendorsTransactionsLoadingBar() { export function VendorsTransactionsLoadingBar() {
const { isVendorsTransactionsLoading } = useVendorsTranscationsContext(); const { isVendorsTransactionsLoading } = useVendorsTransactionsContext();
return ( return (
<If condition={isVendorsTransactionsLoading}> <If condition={isVendorsTransactionsLoading}>
<FinancialLoadingBar /> <FinancialLoadingBar />

View File

@@ -348,9 +348,9 @@ export function useVendorsBalanceSummaryReport(query, props) {
} }
/** /**
* Retrieve customers transcations report. * Retrieve customers transactions report.
*/ */
export function useCustomersTranscationsReport(query, props) { export function useCustomersTransactionsReport(query, props) {
return useRequestQuery( return useRequestQuery(
[t.FINANCIAL_REPORT, t.CUSTOMERS_TRANSACTIONS, query], [t.FINANCIAL_REPORT, t.CUSTOMERS_TRANSACTIONS, query],
{ {
@@ -376,9 +376,9 @@ export function useCustomersTranscationsReport(query, props) {
} }
/** /**
* Retrieve vendors transcations report. * Retrieve vendors transactions report.
*/ */
export function useVendorsTranscationsReport(query, props) { export function useVendorsTransactionsReport(query, props) {
return useRequestQuery( return useRequestQuery(
[t.FINANCIAL_REPORT, t.VENDORS_TRANSACTIONS, query], [t.FINANCIAL_REPORT, t.VENDORS_TRANSACTIONS, query],
{ {

View File

@@ -1060,7 +1060,7 @@ export default {
customers_balance_summary: 'Customers Balance Summary', customers_balance_summary: 'Customers Balance Summary',
vendors_balance_summary: 'Vendors Balance Summary', vendors_balance_summary: 'Vendors Balance Summary',
percentage_of_column: 'Percentage', percentage_of_column: 'Percentage',
customers_transactions: 'Customers Transcations', customers_transactions: 'Customers Transactions',
vendors_transactions: 'Vendors Transcations', vendors_transactions: 'Vendors Transactions',
reference_type: 'Reference type', reference_type: 'Reference type',
}; };

View File

@@ -29,3 +29,10 @@
} }
} }
} }
.financial-statement--balance-summary {
.financial-header-drawer {
.bp3-drawer {
max-height: 350px;
}
}
}