From b2da19462875bf2b9ef8dce7e63a2014fe332254 Mon Sep 17 00:00:00 2001
From: Nezumi <123229563+Nez27@users.noreply.github.com>
Date: Mon, 1 May 2023 09:49:15 +0700
Subject: [PATCH] Fix bug

---
 app/release/output-metadata.json                            | 2 +-
 .../foodify/shipper/Activity/OrderDetailActivity.java       | 6 ++++--
 app/src/main/res/layout/fragment_profile.xml                | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 7b9dab4..bafa014 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "0.5.2",
+      "versionName": "1.0.0-beta",
       "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 faab0bd..90ae5c3 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
@@ -79,6 +79,7 @@ public class OrderDetailActivity extends AppCompatActivity {
     private static final String TAG = "OrderDetailActivity";
     private static final String COMPLETE_STATUS = "COMPLETED";
     private static final String CANCEL_STATUS = "REJECT_DELIVERY";
+    private static final String SHIPPING_STATUS = "SHIPPING";
     Order order;
     Button btn_shipping, btn_call, btn_confirm_ship_completed, btn_cancel_order;
     TextView order_tracking_number, txt_user_name, txt_phone, txt_address, txt_distance, txt_status, txt_total,
@@ -147,7 +148,7 @@ public class OrderDetailActivity extends AppCompatActivity {
                 startLocationService();
 
                 //Change order status
-                FoodApiToken.apiService.changeStatusOrder(order.getUser().getId(), order.getId(), "SHIPPING").enqueue(new Callback<CustomResponse>() {
+                FoodApiToken.apiService.changeStatusOrder(order.getUser().getId(), order.getId(), SHIPPING_STATUS).enqueue(new Callback<CustomResponse>() {
                     @Override
                     public void onResponse(Call<CustomResponse> call, Response<CustomResponse> response) {
                         if(response.code() == 200){
@@ -156,9 +157,10 @@ public class OrderDetailActivity extends AppCompatActivity {
                             LatLng latLng = new LatLng(order.getLat(), order.getLng());
                             addGeofence(latLng, GEOFENCE_RADIUS);
 
+                            order.setStatus(SHIPPING_STATUS);
                             Common.CURRENT_ORDER = order;
 
-
+                            txt_status.setText(translateStatus(SHIPPING_STATUS));
 
                             Intent intent = new Intent(Intent.ACTION_VIEW,
                                     Uri.parse("google.navigation:q=" + order.getLat() + "," + order.getLng() + "&mode=l"));
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 819bec4..52f9e79 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -241,6 +241,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:orientation="horizontal"
+            android:visibility="visible"
             >
 
             <ImageView