fixed some small things. App should be "complete"

Raymond123 · Dec 6, 2022 · 9021458 · 9021458
1 parent 2a144f8
commit 9021458
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/src/main/java/com/mealer/ui/ui/notifications/NotificationsFragment.java b/app/src/main/java/com/mealer/ui/ui/notifications/NotificationsFragment.java
@@ -131,7 +131,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                             if ("cook".equals(Objects.requireNonNull(child.getValue(CookUser.class)).getUserType())) {
                                 for (DataSnapshot grandChild : child.child("orders").getChildren()) {
                                     Order order = grandChild.getValue(Order.class);
-                                    if (order != null && currentUser.getUid().equals(order.getOrderFrom())) {
+                                    if (order != null
+                                            && !order.getOrderStatus().equals("deleted")
+                                            && !order.getOrderStatus().equals("completed")
+                                            && currentUser.getUid().equals(order.getOrderFrom())) {
                                         orderList.add(order);
                                     }
                                 }

diff --git a/app/src/main/java/com/mealer/ui/ui/notifications/OrderDetailsFragment.java b/app/src/main/java/com/mealer/ui/ui/notifications/OrderDetailsFragment.java
@@ -123,7 +123,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 
             if(order.getOrderStatus().equals("accepted")){
                 reject.setVisibility(View.GONE);
-                accept.setText("Order Completed");
+                accept.setText("Complete Order");
                 accept.setOnClickListener(onCLick -> removeItem(true)); //do nothing atm
             }else if(order.getOrderStatus().equals("rejected")){
                 reject.setVisibility(View.GONE);
@@ -146,7 +146,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
                     String fName = user.getFirstName();
                     String lName = user.getLastName();
 
-                    if(user.getUserType().equals("cook")) {
+                    if(!user.getUserType().equals("cook")) {
                         title.setText("Order From: \n" +
                                 fName.substring(0, 1).toUpperCase(Locale.ROOT) + fName.substring(1) + " " +
                                 lName.substring(0, 1).toUpperCase(Locale.ROOT) + lName.substring(1));