diff --git a/frontend/dashboard/src/pages/Corporates/Benefit/Form.tsx b/frontend/dashboard/src/pages/Corporates/Benefit/Form.tsx
index 1556576f..85050511 100755
--- a/frontend/dashboard/src/pages/Corporates/Benefit/Form.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Benefit/Form.tsx
@@ -62,12 +62,12 @@ export default function CorporatePlanForm({ isEdit, currentCorporatePlan }: Prop
const onSubmit = async (data: any) => {
if (!isEdit) {
await axios
- .post('/corporates/' + corporate_id + '/divisions', data)
+ .post('/corporate/' + corporate_id + '/divisions', data)
.then((res) => {
enqueueSnackbar('Division created successfully', { variant: 'success' });
})
.then((res) => {
- navigate('/corporates/' + corporate_id + '/divisions', { replace: true });
+ navigate('/corporate/' + corporate_id + '/divisions', { replace: true });
})
.catch(({ response }) => {
if (response.status === 422) {
@@ -81,12 +81,12 @@ export default function CorporatePlanForm({ isEdit, currentCorporatePlan }: Prop
});
} else {
await axios
- .put('/corporates/' + corporate_id + '/divisions/' + currentCorporatePlan?.id, data)
+ .put('/corporate/' + corporate_id + '/divisions/' + currentCorporatePlan?.id, data)
.then((res) => {
enqueueSnackbar('Division updated successfully', { variant: 'success' });
})
.then((res) => {
- navigate('/corporates/' + corporate_id + '/divisions/', { replace: true });
+ navigate('/corporate/' + corporate_id + '/divisions/', { replace: true });
})
.catch(({ response }) => {
enqueueSnackbar('Update Failed : ' + response.data.message, { variant: 'error' });
diff --git a/frontend/dashboard/src/pages/Corporates/Benefit/Index.tsx b/frontend/dashboard/src/pages/Corporates/Benefit/Index.tsx
index 54cac928..21e25e16 100755
--- a/frontend/dashboard/src/pages/Corporates/Benefit/Index.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Benefit/Index.tsx
@@ -35,11 +35,11 @@ export default function Divisions() {
},
{
name: corporate?.name ?? '-',
- href: '/corporates/' + corporate_id,
+ href: '/corporate/' + corporate_id,
},
{
name: 'Benefit',
- href: '/corporates/' + corporate_id + '/benefits',
+ href: '/corporate/' + corporate_id + '/benefits',
},
]}
/>
diff --git a/frontend/dashboard/src/pages/Corporates/Benefit/List.tsx b/frontend/dashboard/src/pages/Corporates/Benefit/List.tsx
index e1648df6..6442086e 100755
--- a/frontend/dashboard/src/pages/Corporates/Benefit/List.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Benefit/List.tsx
@@ -326,7 +326,7 @@ export default function PlanList() {
)}
-
+ {/*
-
+ */}
{/* COLLAPSIBLE ROW */}
@@ -767,9 +767,9 @@ export default function PlanList() {
Status
-
+ {/*
Action
-
+ */}
{dataTableIsLoading ? (
diff --git a/frontend/dashboard/src/pages/Corporates/ClaimHistory/Form.tsx b/frontend/dashboard/src/pages/Corporates/ClaimHistory/Form.tsx
index dfdde430..2e088d92 100755
--- a/frontend/dashboard/src/pages/Corporates/ClaimHistory/Form.tsx
+++ b/frontend/dashboard/src/pages/Corporates/ClaimHistory/Form.tsx
@@ -64,12 +64,12 @@ export default function CorporatePlanForm({ isEdit, currentCorporatePlan }: Prop
const onSubmit = async (data: any) => {
if (!isEdit) {
await axios
- .post('/corporates/' + corporate_id + '/divisions', data)
+ .post('/corporate/' + corporate_id + '/divisions', data)
.then((res) => {
enqueueSnackbar('Division created successfully', { variant: 'success' });
})
.then((res) => {
- navigate('/corporates/' + corporate_id + '/divisions', { replace: true });
+ navigate('/corporate/' + corporate_id + '/divisions', { replace: true });
})
.catch(({ response }) => {
if (response.status === 422) {
@@ -84,12 +84,12 @@ export default function CorporatePlanForm({ isEdit, currentCorporatePlan }: Prop
});
} else {
await axios
- .put('/corporates/' + corporate_id + '/divisions/' + currentCorporatePlan?.id , data)
+ .put('/corporate/' + corporate_id + '/divisions/' + currentCorporatePlan?.id , data)
.then((res) => {
enqueueSnackbar('Division updated successfully', { variant: 'success' });
})
.then((res) => {
- navigate('/corporates/' + corporate_id + '/divisions/' , { replace: true });
+ navigate('/corporate/' + corporate_id + '/divisions/' , { replace: true });
})
.catch(({ response }) => {
enqueueSnackbar('Update Failed : '+ response.data.message, { variant: 'error' });
diff --git a/frontend/dashboard/src/pages/Corporates/ClaimHistory/Index.tsx b/frontend/dashboard/src/pages/Corporates/ClaimHistory/Index.tsx
index e30db1cd..6fe66cdf 100755
--- a/frontend/dashboard/src/pages/Corporates/ClaimHistory/Index.tsx
+++ b/frontend/dashboard/src/pages/Corporates/ClaimHistory/Index.tsx
@@ -33,11 +33,11 @@ export default function Divisions() {
},
{
name: corporate?.name ?? '-',
- href: '/corporates/' + corporate_id,
+ href: '/corporate/' + corporate_id,
},
{
name: 'Claim History',
- href: '/corporates/' + corporate_id + '/claim-histories',
+ href: '/corporate/' + corporate_id + '/claim-histories',
},
]}
/>
diff --git a/frontend/dashboard/src/pages/Corporates/CorporateBenefit/Form.tsx b/frontend/dashboard/src/pages/Corporates/CorporateBenefit/Form.tsx
index 6f1c583a..cd8a387b 100755
--- a/frontend/dashboard/src/pages/Corporates/CorporateBenefit/Form.tsx
+++ b/frontend/dashboard/src/pages/Corporates/CorporateBenefit/Form.tsx
@@ -64,12 +64,12 @@ export default function CorporatePlanForm({ isEdit, currentCorporateBenefit }: P
const onSubmit = async (data: any) => {
if (!isEdit) {
await axios
- .post('/corporates/' + corporate_id + '/corporate-benefits', data)
+ .post('/corporate/' + corporate_id + '/corporate-benefits', data)
.then((res) => {
enqueueSnackbar('Corporate Plan created successfully', { variant: 'success' });
})
.then((res) => {
- navigate('/corporates/' + corporate_id + '/corporate-benefits', { replace: true });
+ navigate('/corporate/' + corporate_id + '/corporate-benefits', { replace: true });
})
.catch(({ response }) => {
if (response.status === 422) {
@@ -84,12 +84,12 @@ export default function CorporatePlanForm({ isEdit, currentCorporateBenefit }: P
});
} else {
await axios
- .put('/corporates/' + corporate_id + '/corporate-benefits/' + currentCorporateBenefit?.id , data)
+ .put('/corporate/' + corporate_id + '/corporate-benefits/' + currentCorporateBenefit?.id , data)
.then((res) => {
enqueueSnackbar('Corporate Benefit updated successfully', { variant: 'success' });
})
.then((res) => {
- navigate('/corporates/' + corporate_id + '/corporate-benefits/' , { replace: true });
+ navigate('/corporate/' + corporate_id + '/corporate-benefits/' , { replace: true });
})
.catch(({ response }) => {
enqueueSnackbar('Update Failed : '+ response.data.message, { variant: 'error' });
diff --git a/frontend/dashboard/src/pages/Corporates/CorporatePlan/Form.tsx b/frontend/dashboard/src/pages/Corporates/CorporatePlan/Form.tsx
index 236a4e01..145980be 100755
--- a/frontend/dashboard/src/pages/Corporates/CorporatePlan/Form.tsx
+++ b/frontend/dashboard/src/pages/Corporates/CorporatePlan/Form.tsx
@@ -64,12 +64,12 @@ export default function CorporatePlanForm({ isEdit, currentCorporatePlan }: Prop
const onSubmit = async (data: any) => {
if (!isEdit) {
await axios
- .post('/corporates/' + corporate_id + '/corporate-plans', data)
+ .post('/corporate/' + corporate_id + '/corporate-plans', data)
.then((res) => {
enqueueSnackbar('Corporate Plan created successfully', { variant: 'success' });
})
.then((res) => {
- navigate('/corporates/' + corporate_id + '/corporate-plans', { replace: true });
+ navigate('/corporate/' + corporate_id + '/corporate-plans', { replace: true });
})
.catch(({ response }) => {
if (response.status === 422) {
@@ -83,12 +83,12 @@ export default function CorporatePlanForm({ isEdit, currentCorporatePlan }: Prop
});
} else {
await axios
- .put('/corporates/' + corporate_id + '/corporate-plans/' + currentCorporatePlan?.id, data)
+ .put('/corporate/' + corporate_id + '/corporate-plans/' + currentCorporatePlan?.id, data)
.then((res) => {
enqueueSnackbar('Corporate Plan updated successfully', { variant: 'success' });
})
.then((res) => {
- navigate('/corporates/' + corporate_id + '/corporate-plans/', { replace: true });
+ navigate('/corporate/' + corporate_id + '/corporate-plans/', { replace: true });
})
.catch(({ response }) => {
enqueueSnackbar('Update Failed : ' + response.data.message, { variant: 'error' });
diff --git a/frontend/dashboard/src/pages/Corporates/CorporatePlan/Index.tsx b/frontend/dashboard/src/pages/Corporates/CorporatePlan/Index.tsx
index 247d941e..ddc01dbd 100755
--- a/frontend/dashboard/src/pages/Corporates/CorporatePlan/Index.tsx
+++ b/frontend/dashboard/src/pages/Corporates/CorporatePlan/Index.tsx
@@ -32,11 +32,11 @@ export default function Divisions() {
},
{
name: corporate?.name ?? '-',
- href: '/corporates/' + corporate_id,
+ href: '/corporate/' + corporate_id,
},
{
name: 'Corporate Plan',
- href: '/corporates/' + corporate_id + '/corporate-plans',
+ href: '/corporate/' + corporate_id + '/corporate-plans',
},
]}
/>
diff --git a/frontend/dashboard/src/pages/Corporates/DiagnosisExclusion/Index.tsx b/frontend/dashboard/src/pages/Corporates/DiagnosisExclusion/Index.tsx
index 05a3808b..f07e76ff 100755
--- a/frontend/dashboard/src/pages/Corporates/DiagnosisExclusion/Index.tsx
+++ b/frontend/dashboard/src/pages/Corporates/DiagnosisExclusion/Index.tsx
@@ -36,11 +36,11 @@ export default function Divisions() {
},
{
name: corporate?.name ?? '-',
- href: '/corporates/' + corporate_id,
+ href: '/corporate/' + corporate_id,
},
{
name: 'Diagnosis Exclusion',
- href: '/corporates/' + corporate_id + '/diagnosis-exclusions',
+ href: '/corporate/' + corporate_id + '/diagnosis-exclusions',
},
]}
/>
diff --git a/frontend/dashboard/src/pages/Corporates/Division/Form.tsx b/frontend/dashboard/src/pages/Corporates/Division/Form.tsx
index dfdde430..2e088d92 100755
--- a/frontend/dashboard/src/pages/Corporates/Division/Form.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Division/Form.tsx
@@ -64,12 +64,12 @@ export default function CorporatePlanForm({ isEdit, currentCorporatePlan }: Prop
const onSubmit = async (data: any) => {
if (!isEdit) {
await axios
- .post('/corporates/' + corporate_id + '/divisions', data)
+ .post('/corporate/' + corporate_id + '/divisions', data)
.then((res) => {
enqueueSnackbar('Division created successfully', { variant: 'success' });
})
.then((res) => {
- navigate('/corporates/' + corporate_id + '/divisions', { replace: true });
+ navigate('/corporate/' + corporate_id + '/divisions', { replace: true });
})
.catch(({ response }) => {
if (response.status === 422) {
@@ -84,12 +84,12 @@ export default function CorporatePlanForm({ isEdit, currentCorporatePlan }: Prop
});
} else {
await axios
- .put('/corporates/' + corporate_id + '/divisions/' + currentCorporatePlan?.id , data)
+ .put('/corporate/' + corporate_id + '/divisions/' + currentCorporatePlan?.id , data)
.then((res) => {
enqueueSnackbar('Division updated successfully', { variant: 'success' });
})
.then((res) => {
- navigate('/corporates/' + corporate_id + '/divisions/' , { replace: true });
+ navigate('/corporate/' + corporate_id + '/divisions/' , { replace: true });
})
.catch(({ response }) => {
enqueueSnackbar('Update Failed : '+ response.data.message, { variant: 'error' });
diff --git a/frontend/dashboard/src/pages/Corporates/Division/Index.tsx b/frontend/dashboard/src/pages/Corporates/Division/Index.tsx
index 78da9fe0..84aa6e6e 100755
--- a/frontend/dashboard/src/pages/Corporates/Division/Index.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Division/Index.tsx
@@ -36,11 +36,11 @@ export default function Divisions() {
},
{
name: corporate?.name ?? '-',
- href: '/corporates/'+corporate_id,
+ href: '/corporate/' + corporate_id,
},
{
name: 'Division',
- href: '/corporates/'+corporate_id+'/divisions',
+ href: '/corporate/' + corporate_id + '/divisions',
},
]}
/>
diff --git a/frontend/dashboard/src/pages/Corporates/Division/List.tsx b/frontend/dashboard/src/pages/Corporates/Division/List.tsx
index 123a603f..e41f2a32 100755
--- a/frontend/dashboard/src/pages/Corporates/Division/List.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Division/List.tsx
@@ -191,7 +191,7 @@ export default function PlanList() {
const loadDataTableData = async (appliedFilter: any | null = null) => {
setDataTableLoading(true);
const filter = appliedFilter ? appliedFilter : Object.fromEntries([...searchParams.entries()]);
- const response = await axios.get('/corporates/' + corporate_id + '/divisions', {
+ const response = await axios.get('/corporate/' + corporate_id + '/divisions', {
params: filter,
});
// console.log(response.data);
diff --git a/frontend/dashboard/src/pages/Corporates/Formularium/Index.tsx b/frontend/dashboard/src/pages/Corporates/Formularium/Index.tsx
index a28a5518..c07b5233 100755
--- a/frontend/dashboard/src/pages/Corporates/Formularium/Index.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Formularium/Index.tsx
@@ -34,11 +34,11 @@ export default function CorporateFormularium() {
},
{
name: corporate?.name ?? '-',
- href: '/corporates/' + corporate_id,
+ href: '/corporate/' + corporate_id,
},
{
name: 'Formularium',
- href: '/corporates/' + corporate_id + '/formularium',
+ href: '/corporate/' + corporate_id + '/formularium',
},
]}
/>
diff --git a/frontend/dashboard/src/pages/Corporates/Hospital/Form.tsx b/frontend/dashboard/src/pages/Corporates/Hospital/Form.tsx
index dfdde430..2e088d92 100755
--- a/frontend/dashboard/src/pages/Corporates/Hospital/Form.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Hospital/Form.tsx
@@ -64,12 +64,12 @@ export default function CorporatePlanForm({ isEdit, currentCorporatePlan }: Prop
const onSubmit = async (data: any) => {
if (!isEdit) {
await axios
- .post('/corporates/' + corporate_id + '/divisions', data)
+ .post('/corporate/' + corporate_id + '/divisions', data)
.then((res) => {
enqueueSnackbar('Division created successfully', { variant: 'success' });
})
.then((res) => {
- navigate('/corporates/' + corporate_id + '/divisions', { replace: true });
+ navigate('/corporate/' + corporate_id + '/divisions', { replace: true });
})
.catch(({ response }) => {
if (response.status === 422) {
@@ -84,12 +84,12 @@ export default function CorporatePlanForm({ isEdit, currentCorporatePlan }: Prop
});
} else {
await axios
- .put('/corporates/' + corporate_id + '/divisions/' + currentCorporatePlan?.id , data)
+ .put('/corporate/' + corporate_id + '/divisions/' + currentCorporatePlan?.id , data)
.then((res) => {
enqueueSnackbar('Division updated successfully', { variant: 'success' });
})
.then((res) => {
- navigate('/corporates/' + corporate_id + '/divisions/' , { replace: true });
+ navigate('/corporate/' + corporate_id + '/divisions/' , { replace: true });
})
.catch(({ response }) => {
enqueueSnackbar('Update Failed : '+ response.data.message, { variant: 'error' });
diff --git a/frontend/dashboard/src/pages/Corporates/Hospital/Index.tsx b/frontend/dashboard/src/pages/Corporates/Hospital/Index.tsx
index d5fa1fa3..ecea90a4 100755
--- a/frontend/dashboard/src/pages/Corporates/Hospital/Index.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Hospital/Index.tsx
@@ -34,11 +34,11 @@ export default function Divisions() {
},
{
name: corporate?.name ?? '-',
- href: '/corporates/' + corporate_id,
+ href: '/corporate/' + corporate_id,
},
{
name: 'Hospitals',
- href: '/corporates/' + corporate_id + '/hospitals',
+ href: '/corporate/' + corporate_id + '/hospitals',
},
]}
/>
diff --git a/frontend/dashboard/src/pages/Corporates/Member/Index.tsx b/frontend/dashboard/src/pages/Corporates/Member/Index.tsx
index 1f6264ee..380e83d5 100755
--- a/frontend/dashboard/src/pages/Corporates/Member/Index.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Member/Index.tsx
@@ -4,7 +4,7 @@ import HeaderBreadcrumbs from '../../../components/HeaderBreadcrumbs';
import Page from '../../../components/Page';
import useSettings from '../../../hooks/useSettings';
import CorporateTabNavigations from '../CorporateTabNavigations';
-import DivisionsList from './List';
+import MemberList from './List';
import { useContext, useEffect, useState } from 'react';
import { ConfiguredCorporateContext } from '@/contexts/ConfiguredCorporateContext';
@@ -33,18 +33,18 @@ export default function Divisions() {
},
{
name: corporate?.name ?? '-',
- href: '/corporates/' + corporate_id,
+ href: '/corporate/' + corporate_id,
},
{
name: 'Member',
- href: '/corporates/' + corporate_id + '/members',
+ href: '/corporate/' + corporate_id + '/members',
},
]}
/>
-
+
);
diff --git a/frontend/dashboard/src/pages/Corporates/Member/List.tsx b/frontend/dashboard/src/pages/Corporates/Member/List.tsx
index 3bab2c33..b474fb2c 100755
--- a/frontend/dashboard/src/pages/Corporates/Member/List.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Member/List.tsx
@@ -540,9 +540,9 @@ export default function CorporatePlanList() {
Status
-
+ {/*
Action
-
+ */}
{dataTableIsLoading ? (
diff --git a/frontend/dashboard/src/pages/Corporates/Plan/Index.tsx b/frontend/dashboard/src/pages/Corporates/Plan/Index.tsx
index ac8c62b6..3c9f4a5e 100755
--- a/frontend/dashboard/src/pages/Corporates/Plan/Index.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Plan/Index.tsx
@@ -32,11 +32,11 @@ export default function Divisions() {
},
{
name: corporate?.name ?? '-',
- href: '/corporates/' + corporate_id,
+ href: '/corporate/' + corporate_id,
},
{
name: 'Plan',
- href: '/corporates/' + corporate_id + '/plans',
+ href: '/corporate/' + corporate_id + '/plans',
},
]}
/>
diff --git a/frontend/dashboard/src/pages/Corporates/Plan/List.tsx b/frontend/dashboard/src/pages/Corporates/Plan/List.tsx
index 83d4e89c..12c0ebfa 100755
--- a/frontend/dashboard/src/pages/Corporates/Plan/List.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Plan/List.tsx
@@ -309,11 +309,11 @@ export default function CorporatePlanList() {
)}
-
+ {/*
-
+ */}
{/* COLLAPSIBLE ROW */}
@@ -677,9 +677,9 @@ export default function CorporatePlanList() {
Status
-
+ {/*
Action
-
+ */}
{dataTableIsLoading ? (
diff --git a/frontend/dashboard/src/pages/Corporates/Services/Create.tsx b/frontend/dashboard/src/pages/Corporates/Services/Create.tsx
index d72fe8a0..26aa8e35 100755
--- a/frontend/dashboard/src/pages/Corporates/Services/Create.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Services/Create.tsx
@@ -50,19 +50,27 @@ import Page from '../../../components/Page';
import useSettings from '../../../hooks/useSettings';
import CorporateTabNavigations from '../CorporateTabNavigations';
import DivisionsList from './List';
-import { ChangeEvent, useEffect, useMemo, useState } from 'react';
+import { ChangeEvent, useContext, useEffect, useMemo, useState } from 'react';
import axios from '../../../utils/axios';
-import { CorporateService } from '../../../@types/corporates';
+import { Corporate, CorporateService } from '../../../@types/corporates';
import { InfoIcon } from '../../../theme/overrides/CustomIcons';
import { includes, min, set } from 'lodash';
import { array } from 'yup/lib/locale';
import CancelIcon from '@mui/icons-material/Cancel';
import { enqueueSnackbar, useSnackbar } from 'notistack';
+import { ConfiguredCorporateContext } from '@/contexts/ConfiguredCorporateContext';
export default function Divisions() {
const { themeStretch } = useSettings();
const { corporate_id, service_code } = useParams();
+ const [corporate, setCorporate] = useState();
+
+ const configuredCorporateContext = useContext(ConfiguredCorporateContext);
+
+ useEffect(() => {
+ setCorporate(configuredCorporateContext.currentCorporate);
+ }, [configuredCorporateContext]);
const [service, setService] = useState({
configurations: {},
@@ -80,7 +88,7 @@ export default function Divisions() {
// console.log('specialities', specialities);
useEffect(() => {
- axios.get('/corporates/' + corporate_id + '/services/' + service_code).then((res) => {
+ axios.get('/corporate/' + corporate_id + '/services/' + service_code).then((res) => {
setService(res.data.service);
setPlans(
res.data.corporate.plans.map((item: any) => ({
@@ -364,22 +372,21 @@ export default function Divisions() {
diff --git a/frontend/dashboard/src/pages/Corporates/Services/Index.tsx b/frontend/dashboard/src/pages/Corporates/Services/Index.tsx
index ca793fcb..7ea2576b 100755
--- a/frontend/dashboard/src/pages/Corporates/Services/Index.tsx
+++ b/frontend/dashboard/src/pages/Corporates/Services/Index.tsx
@@ -34,11 +34,11 @@ export default function Divisions() {
},
{
name: corporate?.name ?? '-',
- href: '/corporates/' + corporate_id,
+ href: '/corporate/' + corporate_id,
},
{
name: 'Services',
- href: '/corporates/' + corporate_id + '/services',
+ href: '/corporate/' + corporate_id + '/services',
},
]}
/>