src/components/Dashboard/Finance/Payments/AuthorisePayment.jsx

@@ -1,46 +0,0 @@
-import { useState, useContext } from 'react'
-import PropTypes from 'prop-types'
-import { ApiServerContext } from '../../context/ApiServerContext'
-import { message } from 'antd'
-import MessageDialogView from '../../common/MessageDialogView.jsx'
-
-const AuthorisePayment = ({ onOk, objectData }) => {
-  const [authoriseLoading, setAuthoriseLoading] = useState(false)
-  const { sendObjectFunction } = useContext(ApiServerContext)
-
-  const handleAuthorise = async () => {
-    setAuthoriseLoading(true)
-    try {
-      const result = await sendObjectFunction(
-        objectData._id,
-        'Payment',
-        'authorise'
-      )
-      if (result) {
-        message.success('Payment authorised successfully')
-        onOk(result)
-      }
-    } catch (error) {
-      console.error('Error authorising payment:', error)
-    } finally {
-      setAuthoriseLoading(false)
-    }
-  }
-
-  return (
-    <MessageDialogView
-      title={'Are you sure you want to authorise this payment?'}
-      description={`Authorising payment ${objectData?.name || objectData?._reference || objectData?._id} will update its status to authorised.`}
-      onOk={handleAuthorise}
-      okText='Authorise'
-      okLoading={authoriseLoading}
-    />
-  )
-}
-
-AuthorisePayment.propTypes = {
-  onOk: PropTypes.func.isRequired,
-  objectData: PropTypes.object
-}
-
-export default AuthorisePayment

src/components/Dashboard/Finance/Payments/CancelPayment.jsx

@@ -1,46 +0,0 @@
-import { useState, useContext } from 'react'
-import PropTypes from 'prop-types'
-import { ApiServerContext } from '../../context/ApiServerContext'
-import { message } from 'antd'
-import MessageDialogView from '../../common/MessageDialogView.jsx'
-
-const CancelPayment = ({ onOk, objectData }) => {
-  const [cancelLoading, setCancelLoading] = useState(false)
-  const { sendObjectFunction } = useContext(ApiServerContext)
-
-  const handleCancel = async () => {
-    setCancelLoading(true)
-    try {
-      const result = await sendObjectFunction(
-        objectData._id,
-        'Payment',
-        'cancel'
-      )
-      if (result) {
-        message.success('Payment cancelled successfully')
-        onOk(result)
-      }
-    } catch (error) {
-      console.error('Error cancelling payment:', error)
-    } finally {
-      setCancelLoading(false)
-    }
-  }
-
-  return (
-    <MessageDialogView
-      title={'Are you sure you want to cancel this payment?'}
-      description={`Cancelling payment ${objectData?.name || objectData?._reference || objectData?._id} will update its status to cancelled.`}
-      onOk={handleCancel}
-      okText='Cancel'
-      okLoading={cancelLoading}
-    />
-  )
-}
-
-CancelPayment.propTypes = {
-  onOk: PropTypes.func.isRequired,
-  objectData: PropTypes.object
-}
-
-export default CancelPayment

src/components/Dashboard/Finance/Payments/DeclinePayment.jsx

@@ -1,46 +0,0 @@
-import { useState, useContext } from 'react'
-import PropTypes from 'prop-types'
-import { ApiServerContext } from '../../context/ApiServerContext'
-import { message } from 'antd'
-import MessageDialogView from '../../common/MessageDialogView.jsx'
-
-const DeclinePayment = ({ onOk, objectData }) => {
-  const [declineLoading, setDeclineLoading] = useState(false)
-  const { sendObjectFunction } = useContext(ApiServerContext)
-
-  const handleDecline = async () => {
-    setDeclineLoading(true)
-    try {
-      const result = await sendObjectFunction(
-        objectData._id,
-        'Payment',
-        'decline'
-      )
-      if (result) {
-        message.success('Payment declined successfully')
-        onOk(result)
-      }
-    } catch (error) {
-      console.error('Error declining payment:', error)
-    } finally {
-      setDeclineLoading(false)
-    }
-  }
-
-  return (
-    <MessageDialogView
-      title={'Are you sure you want to decline this payment?'}
-      description={`Declining payment ${objectData?.name || objectData?._reference || objectData?._id} will update its status to declined.`}
-      onOk={handleDecline}
-      okText='Decline'
-      okLoading={declineLoading}
-    />
-  )
-}
-
-DeclinePayment.propTypes = {
-  onOk: PropTypes.func.isRequired,
-  objectData: PropTypes.object
-}
-
-export default DeclinePayment

src/components/Dashboard/Finance/Payments/NewPayment.jsx

@@ -53,8 +53,6 @@ const NewPayment = ({ onOk, reset, defaultValues }) => {
                   updatedAt: false,
                   _reference: false,
                   postedAt: false,
-                  authorisedAt: false,
-                  declinedAt: false,
                   cancelledAt: false
                 }}
                 isEditing={false}

src/components/Dashboard/Finance/Payments/PaymentInfo.jsx

@@ -24,9 +24,6 @@ import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
 import { getModelByName } from '../../../../database/ObjectModels.js'
 import PostPayment from './PostPayment.jsx'
-import AuthorisePayment from './AuthorisePayment.jsx'
-import DeclinePayment from './DeclinePayment.jsx'
-import CancelPayment from './CancelPayment.jsx'
 
 const log = loglevel.getLogger('PaymentInfo')
 log.setLevel(config.logLevel)
@@ -51,9 +48,6 @@ const PaymentInfo = () => {
     objectData: {}
   })
   const [postPaymentOpen, setPostPaymentOpen] = useState(false)
-  const [authorisePaymentOpen, setAuthorisePaymentOpen] = useState(false)
-  const [declinePaymentOpen, setDeclinePaymentOpen] = useState(false)
-  const [cancelPaymentOpen, setCancelPaymentOpen] = useState(false)
 
   const actions = {
     edit: () => {
@@ -75,18 +69,6 @@ const PaymentInfo = () => {
     post: () => {
       setPostPaymentOpen(true)
       return true
-    },
-    authorise: () => {
-      setAuthorisePaymentOpen(true)
-      return true
-    },
-    decline: () => {
-      setDeclinePaymentOpen(true)
-      return true
-    },
-    cancel: () => {
-      setCancelPaymentOpen(true)
-      return true
     }
   }
 
@@ -252,60 +234,6 @@ const PaymentInfo = () => {
           objectData={objectFormState.objectData}
         />
       </Modal>
-      <Modal
-        open={authorisePaymentOpen}
-        onCancel={() => {
-          setAuthorisePaymentOpen(false)
-        }}
-        width={515}
-        footer={null}
-        destroyOnHidden={true}
-        centered={true}
-      >
-        <AuthorisePayment
-          onOk={() => {
-            setAuthorisePaymentOpen(false)
-            objectFormRef?.current.handleFetchObject()
-          }}
-          objectData={objectFormState.objectData}
-        />
-      </Modal>
-      <Modal
-        open={declinePaymentOpen}
-        onCancel={() => {
-          setDeclinePaymentOpen(false)
-        }}
-        width={515}
-        footer={null}
-        destroyOnHidden={true}
-        centered={true}
-      >
-        <DeclinePayment
-          onOk={() => {
-            setDeclinePaymentOpen(false)
-            objectFormRef?.current.handleFetchObject()
-          }}
-          objectData={objectFormState.objectData}
-        />
-      </Modal>
-      <Modal
-        open={cancelPaymentOpen}
-        onCancel={() => {
-          setCancelPaymentOpen(false)
-        }}
-        width={515}
-        footer={null}
-        destroyOnHidden={true}
-        centered={true}
-      >
-        <CancelPayment
-          onOk={() => {
-            setCancelPaymentOpen(false)
-            objectFormRef?.current.handleFetchObject()
-          }}
-          objectData={objectFormState.objectData}
-        />
-      </Modal>
     </>
   )
 }

src/components/Dashboard/common/StateTag.jsx

@@ -140,14 +140,6 @@ const StateTag = ({ state, showBadge = true, style = {} }) => {
         status = 'magenta'
         text = 'Posted'
         break
-      case 'authorised':
-        status = 'success'
-        text = 'Authorised'
-        break
-      case 'declined':
-        status = 'error'
-        text = 'Declined'
-        break
       case 'received':
         status = 'success'
         text = 'Received'

src/database/models/Payment.js

@@ -82,35 +82,6 @@ export const Payment = {
         return objectData?.state?.type == 'draft'
       }
     },
-    {
-      name: 'authorise',
-      label: 'Authorise',
-      type: 'button',
-      icon: CheckIcon,
-      url: (_id) =>
-        `/dashboard/finance/payments/info?paymentId=${_id}&action=authorise`,
-      disabled: (objectData) => {
-        return objectData?.state?.type != 'posted'
-      },
-      visible: (objectData) => {
-        return objectData?.state?.type == 'posted'
-      }
-    },
-    {
-      name: 'decline',
-      label: 'Decline',
-      type: 'button',
-      icon: XMarkIcon,
-      danger: true,
-      url: (_id) =>
-        `/dashboard/finance/payments/info?paymentId=${_id}&action=decline`,
-      disabled: (objectData) => {
-        return objectData?.state?.type != 'posted'
-      },
-      visible: (objectData) => {
-        return objectData?.state?.type == 'posted'
-      }
-    },
     {
       name: 'cancel',
       label: 'Cancel',
@@ -120,10 +91,13 @@ export const Payment = {
       url: (_id) =>
         `/dashboard/finance/payments/info?paymentId=${_id}&action=cancel`,
       disabled: (objectData) => {
-        return objectData?.state?.type != 'posted'
+        return objectData?.state?.type == 'cancelled'
       },
       visible: (objectData) => {
-        return objectData?.state?.type == 'posted'
+        return (
+          objectData?.state?.type == 'draft' ||
+          objectData?.state?.type == 'posted'
+        )
       }
     }
   ],
@@ -223,20 +197,6 @@ export const Payment = {
       readOnly: true,
       columnWidth: 175
     },
-    {
-      name: 'authorisedAt',
-      label: 'Authorised At',
-      type: 'dateTime',
-      readOnly: true,
-      columnWidth: 175
-    },
-    {
-      name: 'declinedAt',
-      label: 'Declined At',
-      type: 'dateTime',
-      readOnly: true,
-      columnWidth: 175
-    },
     {
       name: 'cancelledAt',
       label: 'Cancelled At',
@@ -296,34 +256,6 @@ export const Payment = {
       prefix: '£',
       roundNumber: 2,
       color: 'cyan'
-    },
-    {
-      name: 'authorised.authorisedCount.count',
-      label: 'Authorised',
-      type: 'number',
-      color: 'green'
-    },
-    {
-      name: 'authorised.authorisedAmount.sum',
-      label: 'Authorised Amount',
-      type: 'number',
-      prefix: '£',
-      roundNumber: 2,
-      color: 'green'
-    },
-    {
-      name: 'declined.declinedCount.count',
-      label: 'Declined',
-      type: 'number',
-      color: 'red'
-    },
-    {
-      name: 'declined.declinedAmount.sum',
-      label: 'Declined Amount',
-      type: 'number',
-      prefix: '£',
-      roundNumber: 2,
-      color: 'red'
     }
   ]
 }

src/database/models/TaxRecord.js

@@ -17,7 +17,7 @@ export const TaxRecord = {
       default: true,
       row: true,
       icon: InfoCircleIcon,
-      url: (_id) => `/dashboard/finance/taxrecords/info?taxRecordId=${_id}`
+      url: (_id) => `/dashboard/management/taxrecords/info?taxRecordId=${_id}`
     },
     {
       name: 'edit',
@@ -25,7 +25,7 @@ export const TaxRecord = {
       row: true,
       icon: EditIcon,
       url: (_id) =>
-        `/dashboard/finance/taxrecords/info?taxRecordId=${_id}&action=edit`,
+        `/dashboard/management/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/finance/taxrecords/info?taxRecordId=${_id}&action=finishEdit`,
+        `/dashboard/management/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/finance/taxrecords/info?taxRecordId=${_id}&action=cancelEdit`,
+        `/dashboard/management/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/finance/taxrecords/info?taxRecordId=${_id}&action=delete`
+        `/dashboard/management/taxrecords/info?taxRecordId=${_id}&action=delete`
     }
   ],
   columns: [

src/database/sidebars/finance.js

@@ -17,12 +17,6 @@ const financeSidebarItems = [
     label: 'Payments',
     iconKey: 'payment',
     path: '/dashboard/finance/payments'
-  },
-  {
-    key: 'taxRecords',
-    iconKey: 'taxRecord',
-    label: 'Tax Records',
-    path: '/dashboard/finance/taxrecords'
   }
 ]
 

src/database/sidebars/management.js

@@ -73,6 +73,12 @@ const managementSidebarItems = [
     label: 'Tax Rates',
     path: '/dashboard/management/taxrates'
   },
+  {
+    key: 'taxRecords',
+    iconKey: 'taxRecord',
+    label: 'Tax Records',
+    path: '/dashboard/management/taxrecords'
+  },
   { type: 'divider' },
   {
     key: 'noteTypes',

src/routes/FinanceRoutes.jsx

@@ -1,15 +1,5 @@
 import { lazy } from 'react'
-import { Navigate, Route, useLocation } from 'react-router-dom'
+import { Route } from 'react-router-dom'
-
-const TaxRecordsInfoRedirect = () => {
-  const location = useLocation()
-  return (
-    <Navigate
-      to={`/dashboard/finance/taxrecords/info${location.search}`}
-      replace
-    />
-  )
-}
 
 const Invoices = lazy(
   () => import('../components/Dashboard/Finance/Invoices.jsx')
@@ -26,12 +16,6 @@ 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 = [
   <Route
@@ -50,22 +34,6 @@ const FinanceRoutes = [
     key='payments-info'
     path='finance/payments/info'
     element={<PaymentInfo />}
-  />,
-  <Route key='taxrecords' path='finance/taxrecords' element={<TaxRecords />} />,
-  <Route
-    key='taxrecords-info'
-    path='finance/taxrecords/info'
-    element={<TaxRecordInfo />}
-  />,
-  <Route
-    key='taxrecords-redirect'
-    path='management/taxrecords'
-    element={<Navigate to='/dashboard/finance/taxrecords' replace />}
-  />,
-  <Route
-    key='taxrecords-info-redirect'
-    path='management/taxrecords/info'
-    element={<TaxRecordsInfoRedirect />}
   />
 ]
 

src/routes/ManagementRoutes.jsx

@@ -139,6 +139,13 @@ 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 = [
@@ -312,6 +319,16 @@ const ManagementRoutes = [
     key='taxrates-info'
     path='management/taxrates/info'
     element={<TaxRateInfo />}
+  />,
+  <Route
+    key='taxrecords'
+    path='management/taxrecords'
+    element={<TaxRecords />}
+  />,
+  <Route
+    key='taxrecords-info'
+    path='management/taxrecords/info'
+    element={<TaxRecordInfo />}
   />
 ]