From b211f5a1882338c220eb0f99f88c220d0cb412a5 Mon Sep 17 00:00:00 2001
From: Anson He <60114875+ansonjwhe@users.noreply.github.com>
Date: Sat, 18 May 2024 12:43:14 -0400
Subject: [PATCH] Update ticket status texts (#196)

---
 backend/emails/emails.js                      |  8 +++---
 .../TicketContent/PPRAdminContentTable.js     | 25 ++++++-------------
 .../TicketContent/PPRContentTable.js          | 24 +++++++++++++++++-
 .../TicketContent/SFContentTable.js           |  7 +++++-
 .../TicketContent/UPRAdminContentTable.js     |  2 +-
 .../TicketContent/UPRContentTable.js          | 24 +++++++++++++++++-
 6 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/backend/emails/emails.js b/backend/emails/emails.js
index aae3c5e..af1ba9b 100644
--- a/backend/emails/emails.js
+++ b/backend/emails/emails.js
@@ -172,10 +172,10 @@ const sendEmailUPRCreatedToApprovers = async (upr) => {
 }
 
 const sendEmailUPRPurchasedToReporter = async (upr) => {
-    const Subject = `[Purchased] ${upr.codename}`
+    const Subject = `[Ordered] ${upr.codename}`
     const HTMLPart =
         getMainMessageHTML(
-            `Your UW Finance Purchase Request has been purchased! When the item is ready to be picked up, we will let you know.`
+            `Your UW Finance Purchase Request has been ordered! When the item is ready to be picked up, we will let you know.`
         ) +
         (await getUPRTicketInfoHTML(upr)) +
         getTicketLinkHTML(upr.path)
@@ -191,10 +191,10 @@ const sendEmailUPRPurchasedToReporter = async (upr) => {
 }
 
 const sendEmailUPRPurchasedToCoordinator = async (upr) => {
-    const Subject = `[Purchased] ${upr.codename}`
+    const Subject = `[Ordered] ${upr.codename}`
     const HTMLPart =
         getMainMessageHTML(
-            'Thanks for purchasing the item(s)! When the item is ready to be picked up, please update the ticket below.'
+            'Thanks for ordering the item(s)! When the item is ready to be picked up, please update the ticket below.'
         ) +
         (await getUPRTicketInfoHTML(upr)) +
         getTicketLinkHTML(upr.path)
diff --git a/frontend/src/components/TicketContent/PPRAdminContentTable.js b/frontend/src/components/TicketContent/PPRAdminContentTable.js
index d9eaa5b..ba6a16f 100644
--- a/frontend/src/components/TicketContent/PPRAdminContentTable.js
+++ b/frontend/src/components/TicketContent/PPRAdminContentTable.js
@@ -25,24 +25,19 @@ const PPRAdminContentTable = () => {
             case 'SEEKING_APPROVAL':
                 return (
                     <>
-                        <h1>No Current Actions Available</h1>
-                        <h2>Will automatically transition to READY_TO_BUY</h2>
                         <h2>
-                            Condition: All three approvals below must be checked
+                            To transition status, all three approvals below must
+                            be checked
                         </h2>
                     </>
                 )
             case 'READY_TO_BUY':
                 return (
                     <>
-                        <h1>No Current Actions Available</h1>
                         <h2>
-                            Will automatically transition to
-                            PURCHASED_AND_RECEIPTS_SUBMITTED
-                        </h2>
-                        <h2>
-                            Condition: Reporter uploads supporting documents and
-                            manually transitions status
+                            To transition status, reporter must upload
+                            supporting documents and manually transition the
+                            status
                         </h2>
                     </>
                 )
@@ -51,14 +46,10 @@ const PPRAdminContentTable = () => {
             case 'REPORTER_PAID':
                 return (
                     <>
-                        <h1>No Current Actions Available</h1>
-                        <h2>
-                            Will automatically transition to
-                            REPORTER_REIMBURSE_CONFIRMED
-                        </h2>
                         <h2>
-                            Condition: Reporter confirms they have been
-                            reimbursed and manually transitions status
+                            To transition status, reporter must confirm they
+                            have been reimbursed and manually transition the
+                            status
                         </h2>
                     </>
                 )
diff --git a/frontend/src/components/TicketContent/PPRContentTable.js b/frontend/src/components/TicketContent/PPRContentTable.js
index a1fec1a..8dec6c4 100644
--- a/frontend/src/components/TicketContent/PPRContentTable.js
+++ b/frontend/src/components/TicketContent/PPRContentTable.js
@@ -47,13 +47,33 @@ const PPRContentTable = () => {
         }
     }
 
+    const statusToStatusText = {
+        SEEKING_APPROVAL: 'Seeking Approval',
+        READY_TO_BUY: 'Ready to Buy',
+        PURCHASED_AND_RECEIPTS_SUBMITTED: 'Purchased and Receipts Submitted',
+        REPORTER_PAID: 'Reporter Paid',
+        REPORTER_REIMBURSE_CONFIRMED: 'Reporter Reimbursed',
+    }
+
+    const statusToNextStatusText = {
+        SEEKING_APPROVAL: 'Ready to Buy',
+        READY_TO_BUY: 'Purchased and Receipts Submitted',
+        PURCHASED_AND_RECEIPTS_SUBMITTED: 'Reporter Paid',
+        REPORTER_PAID: 'Reporter Reimbursed',
+        REPORTER_REIMBURSE_CONFIRMED: 'N/A',
+    }
+
     return (
         <VStack>
             <Table mb="12px">
                 <Tbody>
                     <TicketContentTableRow
                         heading={'Status'}
-                        value={currentTicket.status}
+                        value={statusToStatusText[currentTicket.status]}
+                    />
+                    <TicketContentTableRow
+                        heading={'Next Status'}
+                        value={statusToNextStatusText[currentTicket.status]}
                     />
                     <TicketContentTableRow
                         heading={'Cost'}
@@ -84,6 +104,7 @@ const PPRContentTable = () => {
                         heading={'Finance/Admin Approval'}
                         value={
                             <Checkbox
+                                borderColor="lightslategrey"
                                 disabled={
                                     !auth.isAdmin ||
                                     currentTicket.status !==
@@ -101,6 +122,7 @@ const PPRContentTable = () => {
                         heading={'Faculty Advisor Approval'}
                         value={
                             <Checkbox
+                                borderColor="lightslategrey"
                                 disabled={
                                     !auth.isAdmin ||
                                     currentTicket.status !==
diff --git a/frontend/src/components/TicketContent/SFContentTable.js b/frontend/src/components/TicketContent/SFContentTable.js
index 548f740..ba2e77a 100644
--- a/frontend/src/components/TicketContent/SFContentTable.js
+++ b/frontend/src/components/TicketContent/SFContentTable.js
@@ -6,6 +6,11 @@ import { useGetCurrentTicket } from '../../hooks/hooks'
 
 const SFContentTable = () => {
     const currentTicket = useGetCurrentTicket()
+    const statusToText = {
+        ALLOCATED: 'Allocated',
+        CLAIM_SUBMITTED: 'Claim Submitted',
+        REIMBURSED: 'Reimbursed',
+    }
 
     return (
         <VStack>
@@ -13,7 +18,7 @@ const SFContentTable = () => {
                 <Tbody>
                     <TicketContentTableRow
                         heading={'Status'}
-                        value={currentTicket.status}
+                        value={statusToText[currentTicket.status]}
                     />
                     <TicketContentTableRow
                         heading={'Funding Allocation'}
diff --git a/frontend/src/components/TicketContent/UPRAdminContentTable.js b/frontend/src/components/TicketContent/UPRAdminContentTable.js
index bdc3a08..a80b256 100644
--- a/frontend/src/components/TicketContent/UPRAdminContentTable.js
+++ b/frontend/src/components/TicketContent/UPRAdminContentTable.js
@@ -117,7 +117,7 @@ const UPRAdminContentTable = () => {
                         onClick={transitionToPurchased}
                         disabled={!poNum || !reqNum}
                     >
-                        Transition To Purchased
+                        Transition To Ordered
                     </Button>
                 )}
                 {currentTicket.status === 'ORDERED' && (
diff --git a/frontend/src/components/TicketContent/UPRContentTable.js b/frontend/src/components/TicketContent/UPRContentTable.js
index 9de76b0..b7c650a 100644
--- a/frontend/src/components/TicketContent/UPRContentTable.js
+++ b/frontend/src/components/TicketContent/UPRContentTable.js
@@ -47,13 +47,33 @@ const UPRContentTable = () => {
         }
     }
 
+    const statusToStatusText = {
+        SEEKING_APPROVAL: 'Seeking Approval',
+        SENT_TO_COORDINATOR: 'Sent to Coordinator',
+        ORDERED: 'Ordered',
+        READY_FOR_PICKUP: 'Ready for Pickup',
+        PICKED_UP: 'Picked up',
+    }
+
+    const statusToNextStatusText = {
+        SEEKING_APPROVAL: 'Sent to Coordinator',
+        SENT_TO_COORDINATOR: 'Ordered',
+        ORDERED: 'Ready for Pickup',
+        READY_FOR_PICKUP: 'Picked up',
+        PICKED_UP: 'N/A',
+    }
+
     return (
         <VStack>
             <Table mb="12px">
                 <Tbody>
                     <TicketContentTableRow
                         heading={'Status'}
-                        value={currentTicket.status}
+                        value={statusToStatusText[currentTicket.status]}
+                    />
+                    <TicketContentTableRow
+                        heading={'Next Status'}
+                        value={statusToNextStatusText[currentTicket.status]}
                     />
                     <TicketContentTableRow
                         heading={'Cost'}
@@ -92,6 +112,7 @@ const UPRContentTable = () => {
                         heading={'Finance/Admin Approval'}
                         value={
                             <Checkbox
+                                borderColor="lightslategrey"
                                 disabled={
                                     !auth.isAdmin ||
                                     currentTicket.status !==
@@ -109,6 +130,7 @@ const UPRContentTable = () => {
                         heading={'Faculty Advisor Approval'}
                         value={
                             <Checkbox
+                                borderColor="lightslategrey"
                                 disabled={
                                     !auth.isAdmin ||
                                     currentTicket.status !==