From 548163d66c7177c8613c22535f491ca107fec04c Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Tue, 31 Dec 2024 11:56:37 +0000
Subject: [PATCH] Some improvements in payment record

---
 src/components/Sidebar.tsx   | 3 ++-
 src/pages/payment-record.tsx | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index f89c97b9..daffc144 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -96,6 +96,7 @@ export default function Sidebar({
 	const { permissions } = usePermissions(user.id);
 
 	const entitiesAllowStatistics = useAllowedEntities(user, entities, "view_statistics")
+	const entitiesAllowPaymentRecord = useAllowedEntities(user, entities, "view_payment_record")
 
 	const entitiesAllowGeneration = useAllowedEntitiesSomePermissions(user, entities, [
 		"generate_reading", "generate_listening", "generate_writing", "generate_speaking", "generate_level"
@@ -140,7 +141,7 @@ export default function Sidebar({
 				{checkAccess(user, getTypesOfUser(["agent"]), permissions, "viewRecords") && (
 					<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
 						disabled={disableNavigation}
 						Icon={BsCurrencyDollar}
diff --git a/src/pages/payment-record.tsx b/src/pages/payment-record.tsx
index daf277ce..a1594bc2 100644
--- a/src/pages/payment-record.tsx
+++ b/src/pages/payment-record.tsx
@@ -49,6 +49,7 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDs)
 
 	const allowedEntities = findAllowedEntities(user, entities, "view_payment_record")
+	if (allowedEntities.length === 0) return redirect("/")
 
 	return {
 		props: serialize({ user, entities: allowedEntities }),