From 75e882214fb876c4bd4c20e75dda3eecd6974322 Mon Sep 17 00:00:00 2001
From: Nezumi <123229563+Nez27@users.noreply.github.com>
Date: Wed, 3 May 2023 18:25:28 +0700
Subject: [PATCH] Fix bug

---
 app/release/output-metadata.json                                | 2 +-
 .../capstone/foodify/shipper/Activity/OrderDetailActivity.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index bafa014..adcb15b 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "1.0.0-beta",
+      "versionName": "1.0.0",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java b/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java
index 90ae5c3..666d64a 100644
--- a/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java
+++ b/app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java
@@ -208,7 +208,7 @@ public class OrderDetailActivity extends AppCompatActivity {
         geofencingClient = LocationServices.getGeofencingClient(this);
         geofenceHelper = new GeofenceHelper(this);
 
-        if(!order.getStatus().equals(COMPLETE_STATUS)){
+        if(!order.getStatus().equals(COMPLETE_STATUS) || !order.getStatus().equals(CANCEL_STATUS)){
             getLocation();
 
             final Handler handler = new Handler(Looper.getMainLooper());