Open
Conversation
Contributor
|
Hey @carmen-chau, great start! I will be addressing your next steps below.
|
Mustaballer
reviewed
Jan 2, 2024
| 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 |
Contributor
There was a problem hiding this comment.
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.
Mustaballer
reviewed
Jan 8, 2024
| } else { | ||
| } else if (order.status === "Submitted") { | ||
| submitted_orders.push(order); | ||
| } else { |
Contributor
There was a problem hiding this comment.
change to else if (order.status === "Packing")
Contributor
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.




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 eventtest inOrdersTable.tsxis failing, unsure whyScreenshots of changes on HSS site