From bb7cf41e3e6ae7ea6298c151c41c81bbc3b23985 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Sat, 2 Sep 2023 01:51:28 +0200
Subject: [PATCH] feat: add sales tax summary report to reports list

---
 .../src/constants/financialReportsMenu.tsx    | 35 +++++++------------
 packages/webapp/src/constants/sidebarMenu.tsx | 15 ++++++++
 .../FinancialStatements/FinancialReports.tsx  | 13 +------
 3 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/packages/webapp/src/constants/financialReportsMenu.tsx b/packages/webapp/src/constants/financialReportsMenu.tsx
index 8f749728f..c659462bd 100644
--- a/packages/webapp/src/constants/financialReportsMenu.tsx
+++ b/packages/webapp/src/constants/financialReportsMenu.tsx
@@ -85,18 +85,8 @@ export const financialReportMenus = [
         subject: AbilitySubject.Report,
         ability: ReportsAction.READ_PROFIT_LOSS,
       },
-      {
-        title: 'Sales Tax Liability Summary',
-        desc: 'Reports the total amount of sales tax collected from customers',
-        link: '/financial-reports/sales-tax-liability-summary',
-        subject: AbilitySubject.Report,
-        ability: ReportsAction.READ_SALES_TAX_LIABILITY_SUMMARY,
-      }
     ],
   },
-];
-
-export const SalesAndPurchasesReportMenus = [
   {
     sectionTitle: <T id={'sales_purchases_reports'} />,
     reports: [
@@ -126,19 +116,6 @@ export const SalesAndPurchasesReportMenus = [
         subject: AbilitySubject.Report,
         ability: ReportsAction.READ_SALES_BY_ITEMS,
       },
-      {
-        title: <T id={'inventory_valuation'} />,
-        desc: (
-          <T
-            id={
-              'summarize_the_business_s_purchase_items_quantity_cost_and_average'
-            }
-          />
-        ),
-        link: '/financial-reports/inventory-valuation',
-        subject: AbilitySubject.Report,
-        ability: ReportsAction.READ_INVENTORY_VALUATION_SUMMARY,
-      },
       {
         title: <T id={'customers_balance_summary'} />,
         desc: (
@@ -196,4 +173,16 @@ export const SalesAndPurchasesReportMenus = [
       },
     ],
   },
+  {
+    sectionTitle: 'Taxes',
+    reports: [
+      {
+        title: 'Sales Tax Liability Summary',
+        desc: 'Reports the total amount of sales tax collected from customers',
+        link: '/financial-reports/sales-tax-liability-summary',
+        subject: AbilitySubject.Report,
+        ability: ReportsAction.READ_SALES_TAX_LIABILITY_SUMMARY,
+      },
+    ],
+  },
 ];
diff --git a/packages/webapp/src/constants/sidebarMenu.tsx b/packages/webapp/src/constants/sidebarMenu.tsx
index 3f5c16cb1..53189dd1f 100644
--- a/packages/webapp/src/constants/sidebarMenu.tsx
+++ b/packages/webapp/src/constants/sidebarMenu.tsx
@@ -741,6 +741,21 @@ export const SidebarMenu = [
           },
         ],
       },
+      {
+        text: 'Taxes',
+        type: ISidebarMenuItemType.Group,
+        children: [
+          {
+            text: 'Sales Tax Liability Summary',
+            href: '/financial-reports/sales-tax-liability-summary',
+            type: ISidebarMenuItemType.Link,
+            permission: {
+              subject: AbilitySubject.Report,
+              ability: ReportsAction.READ_SALES_TAX_LIABILITY_SUMMARY,
+            },
+          },
+        ],
+      },
       {
         text: <T id={'sidebar.inventory'} />,
         type: ISidebarMenuItemType.Group,
diff --git a/packages/webapp/src/containers/FinancialStatements/FinancialReports.tsx b/packages/webapp/src/containers/FinancialStatements/FinancialReports.tsx
index 984c86868..bde19bad6 100644
--- a/packages/webapp/src/containers/FinancialStatements/FinancialReports.tsx
+++ b/packages/webapp/src/containers/FinancialStatements/FinancialReports.tsx
@@ -3,11 +3,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { For, DashboardInsider } from '@/components';
 import useFilterFinancialReports from './FilterFinancialReports';
-
-import {
-  financialReportMenus,
-  SalesAndPurchasesReportMenus,
-} from '@/constants/financialReportsMenu';
+import { financialReportMenus } from '@/constants/financialReportsMenu';
 
 import '@/style/pages/FinancialStatements/FinancialSheets.scss';
 
@@ -39,18 +35,11 @@ function FinancialReportsSection({ sectionTitle, reports }) {
  */
 export default function FinancialReports() {
   const financialReportMenu = useFilterFinancialReports(financialReportMenus);
-  const SalesAndPurchasesReportMenu = useFilterFinancialReports(
-    SalesAndPurchasesReportMenus,
-  );
 
   return (
     <DashboardInsider name={'financial-reports'}>
       <div class="financial-reports">
         <For render={FinancialReportsSection} of={financialReportMenu} />
-        <For
-          render={FinancialReportsSection}
-          of={SalesAndPurchasesReportMenu}
-        />
       </div>
     </DashboardInsider>
   );