From 7657337c4fa8c50476e73ae0f61fed861f3bf130 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Fri, 8 Sep 2023 19:49:46 +0200
Subject: [PATCH] feat: sales tax report query

---
 .../SalesTaxLiabilitySummaryActionsBar.tsx                | 8 +++-----
 .../SalesTaxLiabilitySummaryBoot.tsx                      | 1 +
 .../SalesTaxLiabilitySummaryHeader.tsx                    | 7 ++++---
 .../SalesTaxLiabilitySummaryTable.tsx                     | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryActionsBar.tsx
index 1ffc90c18..9c551ff24 100644
--- a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryActionsBar.tsx
+++ b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryActionsBar.tsx
@@ -33,19 +33,17 @@ function SalesTaxLiabilitySummaryActionsBar({
   numberFormat,
   onNumberFormatSubmit,
 }) {
-  const { isLoading, refetchBalanceSheet } =
+  const { isLoading, refetchSalesTaxLiabilitySummary } =
     useSalesTaxLiabilitySummaryContext();
 
   // Handle filter toggle click.
   const handleFilterToggleClick = () => {
     toggleFilterDrawer();
   };
-
-  // Handle recalculate the report button.
+  // Handle re-calculate the report button.
   const handleRecalcReport = () => {
-    refetchBalanceSheet();
+    refetchSalesTaxLiabilitySummary();
   };
-
   // Handle number format form submit.
   const handleNumberFormatSubmit = (values) => {
     saveInvoke(onNumberFormatSubmit, values);
diff --git a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryBoot.tsx b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryBoot.tsx
index 98190eb3d..c4329d307 100644
--- a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryBoot.tsx
+++ b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryBoot.tsx
@@ -26,6 +26,7 @@ function SalesTaxLiabilitySummaryBoot({ filter, ...props }) {
 
   const provider = {
     salesTaxLiabilitySummary,
+    refetchSalesTaxLiabilitySummary: refetch,
     isFetching,
     isLoading,
     query,
diff --git a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryHeader.tsx b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryHeader.tsx
index 5ca3e1d2e..42213c2ee 100644
--- a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryHeader.tsx
+++ b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryHeader.tsx
@@ -34,6 +34,9 @@ function SalesTaxLiabilitySummaryHeader({
 }) {
   const defaultValues = getDefaultSalesTaxLiablitySummaryQuery();
 
+  // Validation schema.
+  const validationSchema = getSalesTaxLiabilitySummaryQueryValidation();
+
   // Filter form initial values.
   const initialValues = transformToForm(
     {
@@ -44,8 +47,6 @@ function SalesTaxLiabilitySummaryHeader({
     },
     defaultValues,
   );
-  // Validation schema.
-  const validationSchema = getSalesTaxLiabilitySummaryQueryValidation();
 
   // Handle form submit.
   const handleSubmit = (values, actions) => {
@@ -108,6 +109,6 @@ export default compose(
 
 const SalesTaxSummaryFinancialHeader = styled(FinancialStatementHeader)`
   .bp3-drawer {
-    max-height: 520px;
+    max-height: 320px;
   }
 `;
diff --git a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryTable.tsx b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryTable.tsx
index 9f1a0ec1d..a78ee4a8c 100644
--- a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryTable.tsx
+++ b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryTable.tsx
@@ -1,7 +1,7 @@
 // @ts-nocheck
 import React from 'react';
 import styled from 'styled-components';
-import intl from 'react-intl-universal';
+import { compose } from 'ramda';
 
 import { TableStyle } from '@/constants';
 import { ReportDataTable, FinancialSheet } from '@/components';
@@ -9,7 +9,6 @@ import { defaultExpanderReducer, tableRowTypesToClassnames } from '@/utils';
 import { useSalesTaxLiabilitySummaryContext } from './SalesTaxLiabilitySummaryBoot';
 import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization';
 import { useSalesTaxLiabilitySummaryColumns } from './utils';
-import { compose } from 'ramda';
 
 /**
  * Balance sheet table.
@@ -20,7 +19,7 @@ function SalesTaxLiabilitySummaryTableRoot({
 }) {
   // Balance sheet context.
   const {
-    salesTaxLiabilitySummary: { table },
+    salesTaxLiabilitySummary: { table, query },
   } = useSalesTaxLiabilitySummaryContext();
 
   // Retrieve the database columns.
@@ -36,7 +35,8 @@ function SalesTaxLiabilitySummaryTableRoot({
     <FinancialSheet
       companyName={organizationName}
       sheetType={'Sales Tax Liability Summary'}
-      asDate={new Date()}
+      fromDate={query.from_date}
+      toDate={query.to_date}
       basis={''}
     >
       <SalesTaxLiabilitySummaryDataTable