Compare commits

...

3 Commits

Author SHA1 Message Date
victorAnumudu 96e6b6853c fixed page error 2025-09-02 20:49:25 +01:00
ameye eddbc7e13f Merge branch 'subscription-table-fix' of MERMS/MermsFirstOffice into master 2025-09-02 19:20:17 +00:00
CHIEFSOFT\ameye e4d6725dea fix names 2025-09-02 13:40:09 -04:00
3 changed files with 8 additions and 9 deletions
@@ -143,8 +143,8 @@ const asideNavLinks = [
{name: 'Customers', status:1, icon: 'dot', to: RouteLinks.customerPage}, {name: 'Customers', status:1, icon: 'dot', to: RouteLinks.customerPage},
{name: 'Billings', status:1, icon: 'dot', to: RouteLinks.billings}, {name: 'Billings', status:1, icon: 'dot', to: RouteLinks.billings},
{name: 'Configurations', status:1, icon: 'arrow-right', subLinks: [ {name: 'Configurations', status:1, icon: 'arrow-right', subLinks: [
{name: 'Sub. Settings', status:1, icon: 'dot', to: RouteLinks.offers }, {name: 'Product Settings', status:1, icon: 'dot', to: RouteLinks.offers },
{name: 'Users Manager', status:1, icon: 'dot', to: RouteLinks.offers }, {name: 'Admin Manager', status:1, icon: 'dot', to: RouteLinks.offers },
] ]
}, },
], ],
+1 -2
View File
@@ -64,8 +64,7 @@ export default function BillingsCom() {
<div className='w-full sm:max-w-48'> <div className='w-full sm:max-w-48'>
<select name='type' value={filter?.type} className='h-10 w-full p-2 rounded-md' onChange={handleFilter}> <select name='type' value={filter?.type} className='h-10 w-full p-2 rounded-md' onChange={handleFilter}>
<option value=''>All</option> <option value=''>All</option>
<option value='transaction_id'>Transaction ID</option> <option value='option_name'>Option Name</option>
<option value='account_id'>Account ID</option>
</select> </select>
</div> </div>
<div className='w-full sm:max-w-48'> <div className='w-full sm:max-w-48'>
+5 -5
View File
@@ -1,8 +1,8 @@
import { createContext, useContext, useEffect, useState } from 'react' import { createContext, useContext, useEffect, useState } from 'react'
const GeneralContextProvider = createContext({}) const GeneralContextProviderInt = createContext({})
export default function GeneralLayoutContext({children}) { export default function GeneralLayoutContextInt({children}) {
const [theme, setTheme] = useState(null) const [theme, setTheme] = useState(null)
@@ -101,13 +101,13 @@ export default function GeneralLayoutContext({children}) {
} }
return ( return (
<GeneralContextProvider.Provider value={value}> <GeneralContextProviderInt.Provider value={value}>
{children} {children}
</GeneralContextProvider.Provider> </GeneralContextProviderInt.Provider>
) )
} }
export const generalLayoutContext = () => { export const generalLayoutContext = () => {
return useContext(GeneralContextProvider) return useContext(GeneralContextProviderInt)
} }