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 (
<>
-
No Current Actions Available
- Will automatically transition to READY_TO_BUY
- Condition: All three approvals below must be checked
+ To transition status, all three approvals below must
+ be checked
>
)
case 'READY_TO_BUY':
return (
<>
- No Current Actions Available
- Will automatically transition to
- PURCHASED_AND_RECEIPTS_SUBMITTED
-
-
- Condition: Reporter uploads supporting documents and
- manually transitions status
+ To transition status, reporter must upload
+ supporting documents and manually transition the
+ status
>
)
@@ -51,14 +46,10 @@ const PPRAdminContentTable = () => {
case 'REPORTER_PAID':
return (
<>
- No Current Actions Available
-
- Will automatically transition to
- REPORTER_REIMBURSE_CONFIRMED
-
- 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
>
)
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 (
+
{
heading={'Finance/Admin Approval'}
value={
{
heading={'Faculty Advisor Approval'}
value={
{
const currentTicket = useGetCurrentTicket()
+ const statusToText = {
+ ALLOCATED: 'Allocated',
+ CLAIM_SUBMITTED: 'Claim Submitted',
+ REIMBURSED: 'Reimbursed',
+ }
return (
@@ -13,7 +18,7 @@ const SFContentTable = () => {
{
onClick={transitionToPurchased}
disabled={!poNum || !reqNum}
>
- Transition To Purchased
+ Transition To Ordered
)}
{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 (
+
{
heading={'Finance/Admin Approval'}
value={
{
heading={'Faculty Advisor Approval'}
value={