feat: sales tax report query

This commit is contained in:
Ahmed Bouhuolia
2023-09-08 19:49:46 +02:00
parent 983ceb5cc6
commit 7657337c4f
4 changed files with 12 additions and 12 deletions

View File

@@ -33,19 +33,17 @@ function SalesTaxLiabilitySummaryActionsBar({
numberFormat, numberFormat,
onNumberFormatSubmit, onNumberFormatSubmit,
}) { }) {
const { isLoading, refetchBalanceSheet } = const { isLoading, refetchSalesTaxLiabilitySummary } =
useSalesTaxLiabilitySummaryContext(); useSalesTaxLiabilitySummaryContext();
// Handle filter toggle click. // Handle filter toggle click.
const handleFilterToggleClick = () => { const handleFilterToggleClick = () => {
toggleFilterDrawer(); toggleFilterDrawer();
}; };
// Handle re-calculate the report button.
// Handle recalculate the report button.
const handleRecalcReport = () => { const handleRecalcReport = () => {
refetchBalanceSheet(); refetchSalesTaxLiabilitySummary();
}; };
// Handle number format form submit. // Handle number format form submit.
const handleNumberFormatSubmit = (values) => { const handleNumberFormatSubmit = (values) => {
saveInvoke(onNumberFormatSubmit, values); saveInvoke(onNumberFormatSubmit, values);

View File

@@ -26,6 +26,7 @@ function SalesTaxLiabilitySummaryBoot({ filter, ...props }) {
const provider = { const provider = {
salesTaxLiabilitySummary, salesTaxLiabilitySummary,
refetchSalesTaxLiabilitySummary: refetch,
isFetching, isFetching,
isLoading, isLoading,
query, query,

View File

@@ -34,6 +34,9 @@ function SalesTaxLiabilitySummaryHeader({
}) { }) {
const defaultValues = getDefaultSalesTaxLiablitySummaryQuery(); const defaultValues = getDefaultSalesTaxLiablitySummaryQuery();
// Validation schema.
const validationSchema = getSalesTaxLiabilitySummaryQueryValidation();
// Filter form initial values. // Filter form initial values.
const initialValues = transformToForm( const initialValues = transformToForm(
{ {
@@ -44,8 +47,6 @@ function SalesTaxLiabilitySummaryHeader({
}, },
defaultValues, defaultValues,
); );
// Validation schema.
const validationSchema = getSalesTaxLiabilitySummaryQueryValidation();
// Handle form submit. // Handle form submit.
const handleSubmit = (values, actions) => { const handleSubmit = (values, actions) => {
@@ -108,6 +109,6 @@ export default compose(
const SalesTaxSummaryFinancialHeader = styled(FinancialStatementHeader)` const SalesTaxSummaryFinancialHeader = styled(FinancialStatementHeader)`
.bp3-drawer { .bp3-drawer {
max-height: 520px; max-height: 320px;
} }
`; `;

View File

@@ -1,7 +1,7 @@
// @ts-nocheck // @ts-nocheck
import React from 'react'; import React from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import intl from 'react-intl-universal'; import { compose } from 'ramda';
import { TableStyle } from '@/constants'; import { TableStyle } from '@/constants';
import { ReportDataTable, FinancialSheet } from '@/components'; import { ReportDataTable, FinancialSheet } from '@/components';
@@ -9,7 +9,6 @@ import { defaultExpanderReducer, tableRowTypesToClassnames } from '@/utils';
import { useSalesTaxLiabilitySummaryContext } from './SalesTaxLiabilitySummaryBoot'; import { useSalesTaxLiabilitySummaryContext } from './SalesTaxLiabilitySummaryBoot';
import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization';
import { useSalesTaxLiabilitySummaryColumns } from './utils'; import { useSalesTaxLiabilitySummaryColumns } from './utils';
import { compose } from 'ramda';
/** /**
* Balance sheet table. * Balance sheet table.
@@ -20,7 +19,7 @@ function SalesTaxLiabilitySummaryTableRoot({
}) { }) {
// Balance sheet context. // Balance sheet context.
const { const {
salesTaxLiabilitySummary: { table }, salesTaxLiabilitySummary: { table, query },
} = useSalesTaxLiabilitySummaryContext(); } = useSalesTaxLiabilitySummaryContext();
// Retrieve the database columns. // Retrieve the database columns.
@@ -36,7 +35,8 @@ function SalesTaxLiabilitySummaryTableRoot({
<FinancialSheet <FinancialSheet
companyName={organizationName} companyName={organizationName}
sheetType={'Sales Tax Liability Summary'} sheetType={'Sales Tax Liability Summary'}
asDate={new Date()} fromDate={query.from_date}
toDate={query.to_date}
basis={''} basis={''}
> >
<SalesTaxLiabilitySummaryDataTable <SalesTaxLiabilitySummaryDataTable