From 777657a7f4d7db5054e8ab61567b30f332764e23 Mon Sep 17 00:00:00 2001
From: elforjani3 <elforjani3@gmail.com>
Date: Sat, 8 May 2021 03:48:02 +0200
Subject: [PATCH] fix(*): fix qurey in customers & vendors transaction and
 balance summary.

---
 .../CustomersBalanceSummary/CustomersBalanceSummary.js   | 9 ++++-----
 .../CustomersBalanceSummaryHeader.js                     | 4 ++--
 .../CustomersBalanceSummaryProvider.js                   | 8 ++++----
 .../CustomersTranscationsProvider.js                     | 8 +++++++-
 .../VendorsBalanceSummaryProvider.js                     | 8 ++++----
 .../VendorsTransactions/VendorsTransactionsProvider.js   | 5 ++++-
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummary.js b/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummary.js
index a49be8b69..f679d7697 100644
--- a/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummary.js
+++ b/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummary.js
@@ -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
diff --git a/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryHeader.js b/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryHeader.js
index afe46869d..6e1b3ec58 100644
--- a/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryHeader.js
+++ b/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryHeader.js
@@ -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.
diff --git a/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryProvider.js b/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryProvider.js
index 8ab7f48ab..af091546f 100644
--- a/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryProvider.js
+++ b/client/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryProvider.js
@@ -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,
   });
 
diff --git a/client/src/containers/FinancialStatements/CustomersTransactions/CustomersTranscationsProvider.js b/client/src/containers/FinancialStatements/CustomersTransactions/CustomersTranscationsProvider.js
index af6d3cdf1..69dbb24b2 100644
--- a/client/src/containers/FinancialStatements/CustomersTransactions/CustomersTranscationsProvider.js
+++ b/client/src/containers/FinancialStatements/CustomersTransactions/CustomersTranscationsProvider.js
@@ -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 (
diff --git a/client/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryProvider.js b/client/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryProvider.js
index b6f5587fb..840b45268 100644
--- a/client/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryProvider.js
+++ b/client/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryProvider.js
@@ -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,
   });
 
diff --git a/client/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsProvider.js b/client/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsProvider.js
index c024e43a1..eed162f2c 100644
--- a/client/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsProvider.js
+++ b/client/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsProvider.js
@@ -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 (