devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some improvements in payment record

Browse Source
This commit is contained in:
Tiago Ribeiro
2024-12-31 11:56:37 +00:00
parent 8ff0d16402
commit 548163d66c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/Sidebar.tsx
View File

@@ -96,6 +96,7 @@ export default function Sidebar({
const { permissions } = usePermissions(user.id); const { permissions } = usePermissions(user.id);
const entitiesAllowStatistics = useAllowedEntities(user, entities, "view_statistics") const entitiesAllowStatistics = useAllowedEntities(user, entities, "view_statistics")
const entitiesAllowPaymentRecord = useAllowedEntities(user, entities, "view_payment_record")
const entitiesAllowGeneration = useAllowedEntitiesSomePermissions(user, entities, [ const entitiesAllowGeneration = useAllowedEntitiesSomePermissions(user, entities, [
"generate_reading", "generate_listening", "generate_writing", "generate_speaking", "generate_level" "generate_reading", "generate_listening", "generate_writing", "generate_speaking", "generate_level"
@@ -140,7 +141,7 @@ export default function Sidebar({
{checkAccess(user, getTypesOfUser(["agent"]), permissions, "viewRecords") && ( {checkAccess(user, getTypesOfUser(["agent"]), permissions, "viewRecords") && (
<Nav disabled={disableNavigation} Icon={CiDumbbell} label="Training" path={path} keyPath="/training" isMinimized={isMinimized} /> <Nav disabled={disableNavigation} Icon={CiDumbbell} label="Training" path={path} keyPath="/training" isMinimized={isMinimized} />
)} )}
{checkAccess(user, ["admin", "developer", "agent", "corporate", "mastercorporate"], permissions, "viewPaymentRecords") && ( {checkAccess(user, ["admin", "developer", "agent", "corporate", "mastercorporate"]) && entitiesAllowPaymentRecord.length > 0 && (
<Nav <Nav
disabled={disableNavigation} disabled={disableNavigation}
Icon={BsCurrencyDollar} Icon={BsCurrencyDollar}

1
src/pages/payment-record.tsx
View File

@@ -49,6 +49,7 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDs) const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDs)
const allowedEntities = findAllowedEntities(user, entities, "view_payment_record") const allowedEntities = findAllowedEntities(user, entities, "view_payment_record")
if (allowedEntities.length === 0) return redirect("/")
return { return {
props: serialize({ user, entities: allowedEntities }), props: serialize({ user, entities: allowedEntities }),