diff --git a/components/StaffPage/index.tsx b/components/StaffPage/index.tsx index bf45688b..435f8d2f 100644 --- a/components/StaffPage/index.tsx +++ b/components/StaffPage/index.tsx @@ -312,7 +312,7 @@ const createData = useMutation(createDataHandler,{ const user = data.data[0] const status = user.status - message = status == 0 ? `Staff could not be added because they aren't registered. A registration link has beens sent to ${user.email} to register and will be added automatically to as ${user.userRoleName} after registration`:`User has been added to service as a ${user.userRoleName}` + message = status == 0 ? `Staff could not be added because they aren't registered. A registration link has beens sent to ${user.email} to register and will be added automatically to as ${user.staffRoleName} after registration`:`User has been added to service as a ${user.staffRoleName}` notification['success']({ message: message, style:{ diff --git a/pages/manager/bookings/events.tsx b/pages/manager/bookings/events.tsx index fb65d779..03c41732 100644 --- a/pages/manager/bookings/events.tsx +++ b/pages/manager/bookings/events.tsx @@ -475,7 +475,12 @@ function DetailDrawer({selectedRecord,isDrawerOpen,closeDrawer}:DrawerProps){ ) })} - {selectedRecord.redeemStatus === 'redeemed'?It appears that your ticket has already been redeemed :null} + {selectedRecord.redeemStatus === 'redeemed' + ?It appears that your ticket has already been redeemed + :selectedRecord.paymentStatus!== 'sucessful' + ?Payment status for this ticket has to be successful before it can be redeemed + :null + } diff --git a/pages/organizations/communities/staff/index.tsx b/pages/organizations/communities/staff/index.tsx index 2ee91494..339512eb 100644 --- a/pages/organizations/communities/staff/index.tsx +++ b/pages/organizations/communities/staff/index.tsx @@ -293,7 +293,7 @@ const createData = useMutation(createDataHandler,{ const user = data.data[0] const status = user.status - message = status == 0 ? `Staff could not be added because they aren't registered. A registration link has beens sent to ${user.email} to register and will be added automatically to as ${user.userRoleName} after registration`:`User has been added to service as a ${user.userRoleName}` + message = status == 0 ? `Staff could not be added because they aren't registered. A registration link has beens sent to ${user.email} to register and will be added automatically to as ${user.staffRoleName} after registration`:`User has been added to service as a ${user.staffRoleName}` notification['success']({ message: message, style:{ diff --git a/pages/organizations/events/bookings/index.tsx b/pages/organizations/events/bookings/index.tsx index d592719b..c082b27d 100644 --- a/pages/organizations/events/bookings/index.tsx +++ b/pages/organizations/events/bookings/index.tsx @@ -430,7 +430,12 @@ return( /> ) })} - {selectedRecord.redeemStatus === 'redeemed'?It appears that your ticket has already been redeemed :null} + {selectedRecord.redeemStatus === 'redeemed' + ?It appears that your ticket has already been redeemed + :selectedRecord.paymentStatus!== 'sucessful' + ?Payment status for this ticket has to be successful before it can be redeemed + :null + } diff --git a/pages/organizations/events/staff/index.tsx b/pages/organizations/events/staff/index.tsx index f82c4ffe..d470b9d1 100644 --- a/pages/organizations/events/staff/index.tsx +++ b/pages/organizations/events/staff/index.tsx @@ -309,7 +309,7 @@ const createData = useMutation(createDataHandler,{ const user = data.data[0] const status = user.status - message = status == 0 ? `Staff could not be added because they aren't registered. A registration link has beens sent to ${user.email} to register and will be added automatically to as ${user.userRoleName} after registration`:`User has been added to event as a ${user.userRoleName}` + message = status == 0 ? `Staff could not be added because they aren't registered. A registration link has beens sent to ${user.email} to register and will be added automatically to as ${user.staffRoleName} after registration`:`User has been added to event as a ${user.staffRoleName}` notification['success']({ message: message, style:{