diff --git a/packages/server/src/services/FinancialStatements/InventoryDetails/InventoryDetailsMeta.ts b/packages/server/src/services/FinancialStatements/InventoryDetails/InventoryDetailsMeta.ts index 6c3001373..578954833 100644 --- a/packages/server/src/services/FinancialStatements/InventoryDetails/InventoryDetailsMeta.ts +++ b/packages/server/src/services/FinancialStatements/InventoryDetails/InventoryDetailsMeta.ts @@ -22,9 +22,11 @@ export class InventoryDetailsMetaInjectable { const formattedToDay = moment(query.toDate).format('YYYY/MM/DD'); const formattedDateRange = `From ${formattedFromDate} | To ${formattedToDay}`; + const sheetName = 'Inventory Item Details'; + return { ...commonMeta, - sheetName: 'Inventory Details', + sheetName, formattedFromDate, formattedToDay, formattedDateRange, diff --git a/packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsMeta.ts b/packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsMeta.ts index e1e1d28e8..b47b45215 100644 --- a/packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsMeta.ts +++ b/packages/server/src/services/FinancialStatements/SalesByItems/SalesByItemsMeta.ts @@ -22,9 +22,11 @@ export class SalesByItemsMeta { const formattedFromDate = moment(query.fromDate).format('YYYY/MM/DD'); const formattedDateRange = `From ${formattedFromDate} | To ${formattedToDate}`; + const sheetName = 'Sales By Items'; + return { ...commonMeta, - sheetName: 'Purchases By Items', + sheetName, formattedFromDate, formattedToDate, formattedDateRange, diff --git a/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryApplication.ts b/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryApplication.ts index d5e73d28c..3b9f0d7b3 100644 --- a/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryApplication.ts +++ b/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryApplication.ts @@ -44,7 +44,6 @@ export class SalesTaxLiabilitySummaryApplication { * @param {number} tenantId * @param {SalesTaxLiabilitySummaryQuery} query * @returns {Promise} - * */ public xlsx( tenantId: number, diff --git a/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryMeta.ts b/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryMeta.ts index 0d45366e3..c18a8f55d 100644 --- a/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryMeta.ts +++ b/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryMeta.ts @@ -16,7 +16,7 @@ export class SalesTaxLiabilitySummaryMeta { public async meta(tenantId: number, query: SalesTaxLiabilitySummaryQuery) { const commonMeta = await this.financialSheetMeta.meta(tenantId); const formattedToDate = moment(query.toDate).format('YYYY/MM/DD'); - const formattedFromDate = moment(query.toDate).format('YYYY/MM/DD'); + const formattedFromDate = moment(query.fromDate).format('YYYY/MM/DD'); const formattedDateRange = `From ${formattedFromDate} | To ${formattedToDate}`; const sheetName = 'Sales Tax Liability Summary'; diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/dialogs/PurchasesByItemsDialog/PurchasesByItemsPdfDialogContent.tsx b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/dialogs/PurchasesByItemsDialog/PurchasesByItemsPdfDialogContent.tsx index 45333df60..ec5f24fa7 100644 --- a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/dialogs/PurchasesByItemsDialog/PurchasesByItemsPdfDialogContent.tsx +++ b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/dialogs/PurchasesByItemsDialog/PurchasesByItemsPdfDialogContent.tsx @@ -6,10 +6,10 @@ import { FormattedMessage as T, } from '@/components'; import { usePurchasesByItemsPdfExport } from '@/hooks/query'; -import { usePurchasesByItemsQuery } from '../../utils'; +import { usePurchaseByItemsContext } from '../../PurchasesByItemsProvider'; export default function PurchasesByItemsPdfDialogContent() { - const { httpQuery } = usePurchasesByItemsQuery(); + const { httpQuery } = usePurchaseByItemsContext(); const { isLoading, pdfUrl } = usePurchasesByItemsPdfExport(httpQuery); return ( diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryProvider.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryProvider.tsx index b0f5c8881..7cd33efd5 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryProvider.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryProvider.tsx @@ -40,4 +40,5 @@ function VendorsBalanceSummaryProvider({ filter, ...props }) { const useVendorsBalanceSummaryContext = () => React.useContext(VendorsBalanceSummaryContext); + export { VendorsBalanceSummaryProvider, useVendorsBalanceSummaryContext }; diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/dialogs/VendorBalancePdfDialog/VendorBalancePdfDialog.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/dialogs/VendorBalancePdfDialog/VendorBalancePdfDialog.tsx index 71b013704..c9c2bd8da 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/dialogs/VendorBalancePdfDialog/VendorBalancePdfDialog.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/dialogs/VendorBalancePdfDialog/VendorBalancePdfDialog.tsx @@ -20,7 +20,7 @@ function VendorBalancePdfDialogRoot({ dialogName, payload, isOpen }) { return ( { +export const useRequestPdf = (httpProps) => { const apiRequest = useApiRequest(); const [isLoading, setIsLoading] = React.useState(false); const [isLoaded, setIsLoaded] = React.useState(false); @@ -12,9 +12,10 @@ export const useRequestPdf = (url) => { React.useEffect(() => { setIsLoading(true); apiRequest - .get(url, { + .http({ headers: { accept: 'application/pdf' }, responseType: 'blob', + ...httpProps, }) .then((response) => { // Create a Blob from the PDF Stream.