Merge branch 'main' into staging

weareflexable · Aug 6, 2023 · d6b7ca5 · d6b7ca5
2 parents ea6da6d + 89c2929
commit d6b7ca5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git 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
@@ -475,7 +475,12 @@ function DetailDrawer({selectedRecord,isDrawerOpen,closeDrawer}:DrawerProps){
           )
         })}
 
-        {selectedRecord.redeemStatus === 'redeemed'?<Text type="secondary" >It appears that your ticket has already been redeemed </Text>:null}
+   {selectedRecord.redeemStatus === 'redeemed'
+    ?<Text type="secondary" >It appears that your ticket has already been redeemed </Text>
+    :selectedRecord.paymentStatus!== 'sucessful'
+    ?<Text>Payment status for this ticket has to be successful before it can be redeemed</Text>
+    :null
+    }
     </div>
 
 

diff --git 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
@@ -430,7 +430,12 @@ return(
           />
           )
         })}
-    {selectedRecord.redeemStatus === 'redeemed'?<Text type="secondary" >It appears that your ticket has already been redeemed </Text>:null}
+    {selectedRecord.redeemStatus === 'redeemed'
+    ?<Text type="secondary" >It appears that your ticket has already been redeemed </Text>
+    :selectedRecord.paymentStatus!== 'sucessful'
+    ?<Text>Payment status for this ticket has to be successful before it can be redeemed</Text>
+    :null
+    }
 </div>
 
 

diff --git 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:{