fix(*): fix qurey in customers & vendors transaction and balance summary.

This commit is contained in:
elforjani3
2021-05-08 03:48:02 +02:00
parent 790cc51bcc
commit 777657a7f4
6 changed files with 25 additions and 17 deletions

View File

@@ -28,20 +28,19 @@ function CustomersBalanceSummary({
// #withCustomersBalanceSummaryActions
toggleCustomerBalanceFilterDrawer,
}) {
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.
const handleFilterSubmit = (filter) => {
const _filter = {
...filter,
as_date: moment(filter.as_date).format('YYYY-MM-DD'),
asDate: moment(filter.asDate).format('YYYY-MM-DD'),
};
setFilter({ ..._filter });
};
// Handle number format.
const handleNumberFormat = (values) => {
setFilter({
@@ -56,7 +55,7 @@ function CustomersBalanceSummary({
},
[toggleCustomerBalanceFilterDrawer],
);
console.log(filter, 'EE');
return (
<CustomersBalanceSummaryProvider filter={filter}>
<CustomersBalanceSummaryActionsBar

View File

@@ -29,13 +29,13 @@ function CustomersBalanceSummaryHeader({
// validation schema.
const validationSchema = Yup.object().shape({
as_date: Yup.date().required().label('asDate'),
asDate: Yup.date().required().label('asDate'),
});
// filter form initial values.
const initialValues = {
...pageFilter,
as_date: moment(pageFilter.as_date).toDate(),
asDate: moment(pageFilter.asDate).toDate(),
};
// handle form submit.

View File

@@ -10,16 +10,16 @@ const CustomersBalanceSummaryContext = createContext();
*/
function CustomersBalanceSummaryProvider({ filter, ...props }) {
// const query = React.useMemo(() => transformFilterFormToQuery(filter), [
// filter,
// ]);
const query = React.useMemo(() => transformFilterFormToQuery(filter), [
filter,
]);
const {
data: CustomerBalanceSummary,
isLoading: isCustomersBalanceLoading,
isFetching: isCustomersBalanceFetching,
refetch
} = useCustomerBalanceSummaryReport(filter, {
} = useCustomerBalanceSummaryReport(query, {
keepPreviousData: true,
});

View File

@@ -1,6 +1,7 @@
import React, { createContext, useContext, useMemo } from 'react';
import FinancialReportPage from '../FinancialReportPage';
import { useCustomersTranscationsReport } from 'hooks/query';
import { transformFilterFormToQuery } from '../common';
const CustomersTranscationsContext = createContext();
@@ -8,13 +9,17 @@ const CustomersTranscationsContext = createContext();
* Customers transcations provider.
*/
function CustomersTranscationsProvider({ filter, ...props }) {
const query = useMemo(() => transformFilterFormToQuery(filter), [
filter,
]);
// fetches the customers transcations.
const {
data: customersTransactions,
isFetching: isCustomersTransactionsFetching,
isLoading: isCustomersTransactionsLoading,
refetch: CustomersTransactionsRefetch,
} = useCustomersTranscationsReport(filter, { keepPreviousData: true });
} = useCustomersTranscationsReport(query, { keepPreviousData: true });
const provider = {
customersTransactions,
@@ -22,6 +27,7 @@ function CustomersTranscationsProvider({ filter, ...props }) {
isCustomersTransactionsLoading,
CustomersTransactionsRefetch,
filter,
query
};
return (

View File

@@ -9,16 +9,16 @@ const VendorsBalanceSummaryContext = React.createContext();
* Vendors balance summary provider.
*/
function VendorsBalanceSummaryProvider({ filter, ...props }) {
// const query = React.useMemo(() => transformFilterFormToQuery(filter), [
// filter,
// ]);
const query = React.useMemo(() => transformFilterFormToQuery(filter), [
filter,
]);
const {
data: VendorBalanceSummary,
isLoading: isVendorsBalanceLoading,
isFetching: isVendorsBalanceFetching,
refetch,
} = useVendorsBalanceSummaryReport(filter, {
} = useVendorsBalanceSummaryReport(query, {
keepPreviousData: true,
});

View File

@@ -1,7 +1,7 @@
import React, { createContext, useContext, useMemo } from 'react';
import FinancialReportPage from '../FinancialReportPage';
import { useVendorsTranscationsReport } from 'hooks/query';
import { transformFilterFormToQuery } from '../common';
const VendorsTransactionsContext = createContext();
@@ -9,6 +9,8 @@ const VendorsTransactionsContext = createContext();
* Vendors transcations provider.
*/
function VendorsTransactionsProvider({ filter, ...props }) {
const query = useMemo(() => transformFilterFormToQuery(filter), [filter]);
const {
data: vendorsTransactions,
isFetching: isVendorsTransactionFetching,
@@ -22,6 +24,7 @@ function VendorsTransactionsProvider({ filter, ...props }) {
isVendorsTransactionFetching,
refetch,
filter,
query,
};
return (