-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
IEEE-287 (adding new order statuses) #513
base: develop
Are you sure you want to change the base?
Conversation
Hey @carmen-chau, great start! I will be addressing your next steps below.
|
@@ -160,7 +160,7 @@ def get_team_code(obj: Order): | |||
|
|||
class OrderChangeSerializer(OrderListSerializer): | |||
change_options = { | |||
"Submitted": ["Cancelled", "Ready for Pickup"], | |||
"Submitted": ["Cancelled", "Ready for Pickup"], # TODO: Unsure about whether I need to add the status "Pending" and "Rejected" to the list |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah you should add Pending Status here, I believe it means from submitted status it can changed to cancelled or ready for pickup. I'm thinking now that instead of pending we call it "Preparing" so that means admins are actively building the order.
submitted_orders.push(order); | ||
} else { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change to else if (order.status === "Packing")
Overview
This PR is preliminary work for IEEE-287.
The current list of order statuses are as follows:
Work done so far:
I've re-coloured the Updated Time UI tag on the Admin/Participant table to be pink instead of blue (to avoid colour confusion with the Pending tag)
I've added the Pending tag to all currently packing orders on Admin/Participant table
Made sure that the Pending and Rejected status are in the Admin Order page (via the OrderFilter component)
I've modified the code for Django admin site accordingly to include both the Pending and Rejected status
Work left to be done
Unit Tests Created
Known bugs
No matter how many times I attempt to refresh, on the admin side, the order filter number count for: Ready for Pickup, Returned, Pending, Rejected are always 0
The
Handles double row click event
test inOrdersTable.tsx
is failing, unsure whyScreenshots of changes on HSS site