From 0852feecbf978b08c590ad5683811371376528ea Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Fri, 1 Sep 2023 20:48:23 +0200
Subject: [PATCH] fix(server): avoid display total row if no tax rates on sales
 tax report

---
 .../SalesTaxLiabilitySummaryTable.ts          | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryTable.ts b/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryTable.ts
index e469cbdb4..204675ce3 100644
--- a/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryTable.ts
+++ b/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryTable.ts
@@ -7,15 +7,21 @@ import {
 } from '@/interfaces/SalesTaxLiabilitySummary';
 import { tableRowMapper } from '@/utils';
 import { ITableColumn, ITableColumnAccessor, ITableRow } from '@/interfaces';
+import { FinancialSheetStructure } from '../FinancialSheetStructure';
+import { FinancialTable } from '../FinancialTable';
+import AgingReport from '../AgingSummary/AgingReport';
 
 enum IROW_TYPE {
   TaxRate = 'TaxRate',
   Total = 'Total',
 }
 
-export class SalesTaxLiabilitySummaryTable {
-  data: SalesTaxLiabilitySummaryReportData;
-  query: SalesTaxLiabilitySummaryQuery;
+export class SalesTaxLiabilitySummaryTable extends R.compose(
+  FinancialSheetStructure,
+  FinancialTable
+)(AgingReport) {
+  private data: SalesTaxLiabilitySummaryReportData;
+  private query: SalesTaxLiabilitySummaryQuery;
 
   /**
    * Sales tax liability summary table constructor.
@@ -26,6 +32,8 @@ export class SalesTaxLiabilitySummaryTable {
     data: SalesTaxLiabilitySummaryReportData,
     query: SalesTaxLiabilitySummaryQuery
   ) {
+    super();
+
     this.data = data;
     this.query = query;
   }
@@ -119,8 +127,8 @@ export class SalesTaxLiabilitySummaryTable {
    */
   public tableRows(): ITableRow[] {
     return R.compose(
-      R.concat(this.taxRatesRows),
-      R.prepend(this.taxRateTotalRow)
+      R.unless(R.isEmpty, R.append(this.taxRateTotalRow)),
+      R.concat(this.taxRatesRows)
     )([]);
   }
 
@@ -129,7 +137,7 @@ export class SalesTaxLiabilitySummaryTable {
    * @returns {ITableColumn[]}
    */
   public tableColumns(): ITableColumn[] {
-    return [
+    return R.compose(this.tableColumnsCellIndexing)([
       {
         label: 'Tax Name',
         key: 'taxName',
@@ -146,6 +154,6 @@ export class SalesTaxLiabilitySummaryTable {
         label: 'Tax Rate',
         key: 'taxRate',
       },
-    ];
+    ]);
   }
 }