diff --git a/src/components/Dashboard/Management/TaxRecords.jsx b/src/components/Dashboard/Finance/TaxRecords.jsx
similarity index 100%
rename from src/components/Dashboard/Management/TaxRecords.jsx
rename to src/components/Dashboard/Finance/TaxRecords.jsx
diff --git a/src/components/Dashboard/Management/TaxRecords/NewTaxRecord.jsx b/src/components/Dashboard/Finance/TaxRecords/NewTaxRecord.jsx
similarity index 100%
rename from src/components/Dashboard/Management/TaxRecords/NewTaxRecord.jsx
rename to src/components/Dashboard/Finance/TaxRecords/NewTaxRecord.jsx
diff --git a/src/components/Dashboard/Management/TaxRecords/TaxRecordInfo.jsx b/src/components/Dashboard/Finance/TaxRecords/TaxRecordInfo.jsx
similarity index 100%
rename from src/components/Dashboard/Management/TaxRecords/TaxRecordInfo.jsx
rename to src/components/Dashboard/Finance/TaxRecords/TaxRecordInfo.jsx
diff --git a/src/database/models/TaxRecord.js b/src/database/models/TaxRecord.js
index f112873..bc69ebb 100644
--- a/src/database/models/TaxRecord.js
+++ b/src/database/models/TaxRecord.js
@@ -17,7 +17,7 @@ export const TaxRecord = {
default: true,
row: true,
icon: InfoCircleIcon,
- url: (_id) => `/dashboard/management/taxrecords/info?taxRecordId=${_id}`
+ url: (_id) => `/dashboard/finance/taxrecords/info?taxRecordId=${_id}`
},
{
name: 'edit',
@@ -25,7 +25,7 @@ export const TaxRecord = {
row: true,
icon: EditIcon,
url: (_id) =>
- `/dashboard/management/taxrecords/info?taxRecordId=${_id}&action=edit`,
+ `/dashboard/finance/taxrecords/info?taxRecordId=${_id}&action=edit`,
visible: (objectData) => {
return !(objectData?._isEditing && objectData?._isEditing == true)
}
@@ -35,7 +35,7 @@ export const TaxRecord = {
label: 'Save Edits',
icon: CheckIcon,
url: (_id) =>
- `/dashboard/management/taxrecords/info?taxRecordId=${_id}&action=finishEdit`,
+ `/dashboard/finance/taxrecords/info?taxRecordId=${_id}&action=finishEdit`,
visible: (objectData) => {
return objectData?._isEditing && objectData?._isEditing == true
}
@@ -45,7 +45,7 @@ export const TaxRecord = {
label: 'Cancel Edits',
icon: XMarkIcon,
url: (_id) =>
- `/dashboard/management/taxrecords/info?taxRecordId=${_id}&action=cancelEdit`,
+ `/dashboard/finance/taxrecords/info?taxRecordId=${_id}&action=cancelEdit`,
visible: (objectData) => {
return objectData?._isEditing && objectData?._isEditing == true
}
@@ -57,7 +57,7 @@ export const TaxRecord = {
icon: BinIcon,
danger: true,
url: (_id) =>
- `/dashboard/management/taxrecords/info?taxRecordId=${_id}&action=delete`
+ `/dashboard/finance/taxrecords/info?taxRecordId=${_id}&action=delete`
}
],
columns: [
diff --git a/src/database/sidebars/finance.js b/src/database/sidebars/finance.js
index ac00605..5e321de 100644
--- a/src/database/sidebars/finance.js
+++ b/src/database/sidebars/finance.js
@@ -17,6 +17,12 @@ const financeSidebarItems = [
label: 'Payments',
iconKey: 'payment',
path: '/dashboard/finance/payments'
+ },
+ {
+ key: 'taxRecords',
+ iconKey: 'taxRecord',
+ label: 'Tax Records',
+ path: '/dashboard/finance/taxrecords'
}
]
diff --git a/src/database/sidebars/management.js b/src/database/sidebars/management.js
index a877649..1826257 100644
--- a/src/database/sidebars/management.js
+++ b/src/database/sidebars/management.js
@@ -73,12 +73,6 @@ const managementSidebarItems = [
label: 'Tax Rates',
path: '/dashboard/management/taxrates'
},
- {
- key: 'taxRecords',
- iconKey: 'taxRecord',
- label: 'Tax Records',
- path: '/dashboard/management/taxrecords'
- },
{ type: 'divider' },
{
key: 'noteTypes',
diff --git a/src/routes/FinanceRoutes.jsx b/src/routes/FinanceRoutes.jsx
index 2b6f07f..675e301 100644
--- a/src/routes/FinanceRoutes.jsx
+++ b/src/routes/FinanceRoutes.jsx
@@ -1,5 +1,15 @@
import { lazy } from 'react'
-import { Route } from 'react-router-dom'
+import { Navigate, Route, useLocation } from 'react-router-dom'
+
+const TaxRecordsInfoRedirect = () => {
+ const location = useLocation()
+ return (
+
+ )
+}
const Invoices = lazy(
() => import('../components/Dashboard/Finance/Invoices.jsx')
@@ -16,6 +26,12 @@ const PaymentInfo = lazy(
const FinanceOverview = lazy(
() => import('../components/Dashboard/Finance/FinanceOverview.jsx')
)
+const TaxRecords = lazy(
+ () => import('../components/Dashboard/Finance/TaxRecords.jsx')
+)
+const TaxRecordInfo = lazy(
+ () => import('../components/Dashboard/Finance/TaxRecords/TaxRecordInfo.jsx')
+)
const FinanceRoutes = [
}
+ />,
+ } />,
+ }
+ />,
+ }
+ />,
+ }
/>
]
diff --git a/src/routes/ManagementRoutes.jsx b/src/routes/ManagementRoutes.jsx
index 043760c..c26bfbc 100644
--- a/src/routes/ManagementRoutes.jsx
+++ b/src/routes/ManagementRoutes.jsx
@@ -139,13 +139,6 @@ const TaxRates = lazy(
const TaxRateInfo = lazy(
() => import('../components/Dashboard/Management/TaxRates/TaxRateInfo.jsx')
)
-const TaxRecords = lazy(
- () => import('../components/Dashboard/Management/TaxRecords.jsx')
-)
-const TaxRecordInfo = lazy(
- () =>
- import('../components/Dashboard/Management/TaxRecords/TaxRecordInfo.jsx')
-)
const About = lazy(() => import('../components/Dashboard/Management/About.jsx'))
const ManagementRoutes = [
@@ -319,16 +312,6 @@ const ManagementRoutes = [
key='taxrates-info'
path='management/taxrates/info'
element={}
- />,
- }
- />,
- }
/>
]