Fix archiveordercard to not show schedule tags for cancelled orders +…

… UG complete order
AY1920S1-CS2103T-T09-4 · Nov 11, 2019 · e17130d · e17130d
1 parent f03bbc9
commit e17130d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docs/UserGuide.adoc b/docs/UserGuide.adoc
@@ -513,7 +513,9 @@ Format: `find-o KEYWORD [KEYWORD]...`
 
 
 ==== Complete an order : `complete`
-Completes the order, order status changed to `COMPLETED`. Phone associated with order will also be deleted. +
+Completes the order, order status changed to `COMPLETED`. +
+Only `SCHEDULED` orders can be completed. +
+Phone associated with order will also be deleted. +
 Format: `complete INDEX`
 
 ==== Cancel an order : `cancel`

diff --git a/src/main/java/seedu/address/ui/cards/ArchivedOrderCard.java b/src/main/java/seedu/address/ui/cards/ArchivedOrderCard.java
@@ -87,6 +87,8 @@ public ArchivedOrderCard(Order order, int displayedIndex) {
         orderPrice.setText(order.getPrice().value);
 
         if (order.getStatus().equals(Status.COMPLETED)) {
+            order.getSchedule().get().getTags().stream().sorted(Comparator.comparing(tag -> tag.tagName))
+                    .forEach(tag -> scheduleTags.getChildren().add(new Label(tag.tagName)));
             assert(order.getSchedule().isPresent());
             try {
                 orderStatus.setText(String.format("%s : %s | Venue: %s", order.getStatus().toString(),
@@ -100,10 +102,6 @@ public ArchivedOrderCard(Order order, int displayedIndex) {
             orderStatus.setText(order.getStatus().toString());
         }
 
-        if (order.getSchedule().isPresent()) {
-            order.getSchedule().get().getTags().stream().sorted(Comparator.comparing(tag -> tag.tagName))
-                    .forEach(tag -> scheduleTags.getChildren().add(new Label(tag.tagName)));
-        }
         if (order.getCustomer() != null) {
             order.getCustomer().getTags().stream()
                     .sorted(Comparator.comparing(tag -> tag.tagName))