Skip to content

Commit

Permalink
minor comment and formatting changes
Browse files Browse the repository at this point in the history
  • Loading branch information
carmen-chau committed Jan 14, 2024
1 parent f29f40e commit 7f4f7c7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion hackathon_site/hardware/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ class Order(models.Model):
("Picked Up", "Picked Up"),
("Cancelled", "Cancelled"),
("Returned", "Returned"),
("Packing", "Packing"), # TODO: ADDED NEW ENTRIES HERE. See this for ref: https://github.com/ieeeuoft/hackathon-template/pull/293/files#diff-b5fcbda10cee3497387c38bdc3a12e6281d696a490b4bbbbce23e0c052baad4d
("Packing", "Packing",),
# TODO: ADDED NEW ENTRIES HERE.
# See ref: https://github.com/ieeeuoft/hackathon-template/pull/293/files#diff-b5fcbda10cee3497387c38bdc3a12e6281d696a490b4bbbbce23e0c052baad4d
]

hardware = models.ManyToManyField(Hardware, through=OrderItem)
Expand Down
6 changes: 3 additions & 3 deletions hackathon_site/hardware/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,12 @@ def get_team_code(obj: Order):
return obj.team.team_code if obj.team else None


class OrderChangeSerializer(OrderListSerializer): # TODO: Modified flow of serializers
class OrderChangeSerializer(OrderListSerializer): # TODO: Modified flow of serializers
change_options = {
"Submitted": ["Cancelled", "Packing"], # TODO: Unsure about whether I need to add the status "Pending" and "Rejected" to the list
"Submitted": ["Cancelled", "Packing"],
"Ready for Pickup": ["Picked Up"],
"Picked Up": ["Returned"],
"Packing": ["Ready for Pickup"]
"Packing": ["Ready for Pickup"],
}

class Meta:
Expand Down

0 comments on commit 7f4f7c7

Please sign in to comment.