mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-21 15:20:34 +00:00
fix(*): fix qurey in customers & vendors transaction and balance summary.
This commit is contained in:
@@ -28,16 +28,15 @@ function CustomersBalanceSummary({
|
|||||||
// #withCustomersBalanceSummaryActions
|
// #withCustomersBalanceSummaryActions
|
||||||
toggleCustomerBalanceFilterDrawer,
|
toggleCustomerBalanceFilterDrawer,
|
||||||
}) {
|
}) {
|
||||||
|
|
||||||
const [filter, setFilter] = useState({
|
const [filter, setFilter] = useState({
|
||||||
as_date: moment().endOf('day').format('YYYY-MM-DD'),
|
asDate: moment().endOf('day').format('YYYY-MM-DD'),
|
||||||
});
|
});
|
||||||
|
|
||||||
// Handle re-fetch customers balance summary after filter change.
|
// Handle re-fetch customers balance summary after filter change.
|
||||||
const handleFilterSubmit = (filter) => {
|
const handleFilterSubmit = (filter) => {
|
||||||
const _filter = {
|
const _filter = {
|
||||||
...filter,
|
...filter,
|
||||||
as_date: moment(filter.as_date).format('YYYY-MM-DD'),
|
asDate: moment(filter.asDate).format('YYYY-MM-DD'),
|
||||||
};
|
};
|
||||||
setFilter({ ..._filter });
|
setFilter({ ..._filter });
|
||||||
};
|
};
|
||||||
@@ -56,7 +55,7 @@ function CustomersBalanceSummary({
|
|||||||
},
|
},
|
||||||
[toggleCustomerBalanceFilterDrawer],
|
[toggleCustomerBalanceFilterDrawer],
|
||||||
);
|
);
|
||||||
|
console.log(filter, 'EE');
|
||||||
return (
|
return (
|
||||||
<CustomersBalanceSummaryProvider filter={filter}>
|
<CustomersBalanceSummaryProvider filter={filter}>
|
||||||
<CustomersBalanceSummaryActionsBar
|
<CustomersBalanceSummaryActionsBar
|
||||||
|
|||||||
@@ -29,13 +29,13 @@ function CustomersBalanceSummaryHeader({
|
|||||||
|
|
||||||
// validation schema.
|
// validation schema.
|
||||||
const validationSchema = Yup.object().shape({
|
const validationSchema = Yup.object().shape({
|
||||||
as_date: Yup.date().required().label('asDate'),
|
asDate: Yup.date().required().label('asDate'),
|
||||||
});
|
});
|
||||||
|
|
||||||
// filter form initial values.
|
// filter form initial values.
|
||||||
const initialValues = {
|
const initialValues = {
|
||||||
...pageFilter,
|
...pageFilter,
|
||||||
as_date: moment(pageFilter.as_date).toDate(),
|
asDate: moment(pageFilter.asDate).toDate(),
|
||||||
};
|
};
|
||||||
|
|
||||||
// handle form submit.
|
// handle form submit.
|
||||||
|
|||||||
@@ -10,16 +10,16 @@ const CustomersBalanceSummaryContext = createContext();
|
|||||||
*/
|
*/
|
||||||
function CustomersBalanceSummaryProvider({ filter, ...props }) {
|
function CustomersBalanceSummaryProvider({ filter, ...props }) {
|
||||||
|
|
||||||
// const query = React.useMemo(() => transformFilterFormToQuery(filter), [
|
const query = React.useMemo(() => transformFilterFormToQuery(filter), [
|
||||||
// filter,
|
filter,
|
||||||
// ]);
|
]);
|
||||||
|
|
||||||
const {
|
const {
|
||||||
data: CustomerBalanceSummary,
|
data: CustomerBalanceSummary,
|
||||||
isLoading: isCustomersBalanceLoading,
|
isLoading: isCustomersBalanceLoading,
|
||||||
isFetching: isCustomersBalanceFetching,
|
isFetching: isCustomersBalanceFetching,
|
||||||
refetch
|
refetch
|
||||||
} = useCustomerBalanceSummaryReport(filter, {
|
} = useCustomerBalanceSummaryReport(query, {
|
||||||
keepPreviousData: true,
|
keepPreviousData: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import React, { createContext, useContext, useMemo } from 'react';
|
import React, { createContext, useContext, useMemo } from 'react';
|
||||||
import FinancialReportPage from '../FinancialReportPage';
|
import FinancialReportPage from '../FinancialReportPage';
|
||||||
import { useCustomersTranscationsReport } from 'hooks/query';
|
import { useCustomersTranscationsReport } from 'hooks/query';
|
||||||
|
import { transformFilterFormToQuery } from '../common';
|
||||||
|
|
||||||
const CustomersTranscationsContext = createContext();
|
const CustomersTranscationsContext = createContext();
|
||||||
|
|
||||||
@@ -8,13 +9,17 @@ const CustomersTranscationsContext = createContext();
|
|||||||
* Customers transcations provider.
|
* Customers transcations provider.
|
||||||
*/
|
*/
|
||||||
function CustomersTranscationsProvider({ filter, ...props }) {
|
function CustomersTranscationsProvider({ filter, ...props }) {
|
||||||
|
const query = useMemo(() => transformFilterFormToQuery(filter), [
|
||||||
|
filter,
|
||||||
|
]);
|
||||||
|
|
||||||
// fetches the customers transcations.
|
// fetches the customers transcations.
|
||||||
const {
|
const {
|
||||||
data: customersTransactions,
|
data: customersTransactions,
|
||||||
isFetching: isCustomersTransactionsFetching,
|
isFetching: isCustomersTransactionsFetching,
|
||||||
isLoading: isCustomersTransactionsLoading,
|
isLoading: isCustomersTransactionsLoading,
|
||||||
refetch: CustomersTransactionsRefetch,
|
refetch: CustomersTransactionsRefetch,
|
||||||
} = useCustomersTranscationsReport(filter, { keepPreviousData: true });
|
} = useCustomersTranscationsReport(query, { keepPreviousData: true });
|
||||||
|
|
||||||
const provider = {
|
const provider = {
|
||||||
customersTransactions,
|
customersTransactions,
|
||||||
@@ -22,6 +27,7 @@ function CustomersTranscationsProvider({ filter, ...props }) {
|
|||||||
isCustomersTransactionsLoading,
|
isCustomersTransactionsLoading,
|
||||||
CustomersTransactionsRefetch,
|
CustomersTransactionsRefetch,
|
||||||
filter,
|
filter,
|
||||||
|
query
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -9,16 +9,16 @@ const VendorsBalanceSummaryContext = React.createContext();
|
|||||||
* Vendors balance summary provider.
|
* Vendors balance summary provider.
|
||||||
*/
|
*/
|
||||||
function VendorsBalanceSummaryProvider({ filter, ...props }) {
|
function VendorsBalanceSummaryProvider({ filter, ...props }) {
|
||||||
// const query = React.useMemo(() => transformFilterFormToQuery(filter), [
|
const query = React.useMemo(() => transformFilterFormToQuery(filter), [
|
||||||
// filter,
|
filter,
|
||||||
// ]);
|
]);
|
||||||
|
|
||||||
const {
|
const {
|
||||||
data: VendorBalanceSummary,
|
data: VendorBalanceSummary,
|
||||||
isLoading: isVendorsBalanceLoading,
|
isLoading: isVendorsBalanceLoading,
|
||||||
isFetching: isVendorsBalanceFetching,
|
isFetching: isVendorsBalanceFetching,
|
||||||
refetch,
|
refetch,
|
||||||
} = useVendorsBalanceSummaryReport(filter, {
|
} = useVendorsBalanceSummaryReport(query, {
|
||||||
keepPreviousData: true,
|
keepPreviousData: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
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 { useVendorsTranscationsReport } from 'hooks/query';
|
||||||
|
import { transformFilterFormToQuery } from '../common';
|
||||||
|
|
||||||
const VendorsTransactionsContext = createContext();
|
const VendorsTransactionsContext = createContext();
|
||||||
|
|
||||||
@@ -9,6 +9,8 @@ const VendorsTransactionsContext = createContext();
|
|||||||
* Vendors transcations provider.
|
* Vendors transcations provider.
|
||||||
*/
|
*/
|
||||||
function VendorsTransactionsProvider({ filter, ...props }) {
|
function VendorsTransactionsProvider({ filter, ...props }) {
|
||||||
|
const query = useMemo(() => transformFilterFormToQuery(filter), [filter]);
|
||||||
|
|
||||||
const {
|
const {
|
||||||
data: vendorsTransactions,
|
data: vendorsTransactions,
|
||||||
isFetching: isVendorsTransactionFetching,
|
isFetching: isVendorsTransactionFetching,
|
||||||
@@ -22,6 +24,7 @@ function VendorsTransactionsProvider({ filter, ...props }) {
|
|||||||
isVendorsTransactionFetching,
|
isVendorsTransactionFetching,
|
||||||
refetch,
|
refetch,
|
||||||
filter,
|
filter,
|
||||||
|
query,
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
Reference in New Issue
Block a user