solve conflict

This commit is contained in:
korospace
2023-10-20 15:47:18 +07:00
51 changed files with 14614 additions and 3939 deletions

View File

@@ -135,6 +135,10 @@ export default function Router() {
path: ':corporate_id/benefits/:benefit_id/history',
element: <CorporateBenefitsHistory />,
},
{
path: ':corporate_id/benefits/:benefit_id/edit',
element: <CorporateBenefitsEdit />,
},
{
path: ':corporate_id/members',
element: <CorporateMembers />,
@@ -178,7 +182,14 @@ export default function Router() {
path: ':corporate_id/hospitals',
element: <CorporateHospitals />,
},
{
path: ':corporate_id/hospitals/create',
element: <HospitalCreateUpdate />,
},
{
path: ':corporate_id/hospitals/edit/:id/:organization_id',
element: <HospitalCreateUpdate />,
},
{
path: ':corporate_id/claim-history',
element: <CorporateClaimHistories />,
@@ -444,6 +455,9 @@ const CorporateBenefits = Loadable(
const CorporateBenefitsHistory = Loadable(
lazy(() => import('../pages/Corporates/Benefit/sections/History'))
);
const CorporateBenefitsEdit = Loadable(
lazy(() => import('../pages/Corporates/Benefit/Create'))
);
const CorporatePlanCreate = Loadable(
lazy(() => import('../pages/Corporates/CorporatePlan/CreateUpdate'))
@@ -505,6 +519,7 @@ const CorporateServicesCreate = Loadable(lazy(() => import('../pages/Corporates/
const CorporateServicesHistory = Loadable(lazy(() => import('../pages/Corporates/Services/sections/History')));
const CorporateHospitals = Loadable(lazy(() => import('../pages/Corporates/Hospital/Index')));
const HospitalCreateUpdate = Loadable(lazy(() => import('../pages/Corporates/Hospital/CreateUpdate')));
const CorporateClaimHistories = Loadable(
lazy(() => import('../pages/Corporates/ClaimHistory/Index'))
);