diff --git a/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java b/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java index c7037fd..4efc07f 100644 --- a/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java @@ -48,8 +48,8 @@ public interface ApiInterface { @POST(ApiEndPoints.API_LOGOUT) Call logout(@Field("token") String customerToken); - @POST(ApiEndPoints.API_GET_ORDER_HISTORY) - Call getOrderHistory(@Body HashMap body); + @GET(ApiEndPoints.API_GET_ORDER_HISTORY) + Call getOrderHistory(@Query("token") String token); /* diff --git a/app/src/main/java/ch/pizzalink/android/fragment/HistoryFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/HistoryFragment.java index 9086182..913e504 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/HistoryFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/HistoryFragment.java @@ -81,11 +81,12 @@ public class HistoryFragment extends BaseFragment { orderHistoryRecyclerView.setAdapter(orderHistoryRecyclerAdapter); } + // "cP1sbSmwc6GEE7fCy6du7KqRbkR7bY1q" private void getOrderHistory(){ DialogHelper.showLoadingDialog(); HashMap params = new HashMap<>(); params.put("token", SessionHelper.getCustomerToken().getToken()); - Call call = ApiService.apiInterface.getOrderHistory(params); + Call call = ApiService.apiInterface.getOrderHistory(SessionHelper.getCustomerToken().getToken()); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { diff --git a/app/src/main/java/ch/pizzalink/android/helper/DialogHelper.java b/app/src/main/java/ch/pizzalink/android/helper/DialogHelper.java index faf471e..71c0c68 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/DialogHelper.java +++ b/app/src/main/java/ch/pizzalink/android/helper/DialogHelper.java @@ -69,7 +69,7 @@ public class DialogHelper { if(loadingDialog != null && loadingDialog.isShowing()) return; loadingDialog = new MaterialDialog.Builder(BaseActivity.currentActivity) - .content("Content") + .content(BaseActivity.currentActivity.getString(R.string.loading)) .cancelable(false) .progress(true, 0) .progressIndeterminateStyle(true) diff --git a/app/src/main/res/layout/fragment_cart.xml b/app/src/main/res/layout/fragment_cart.xml index 542125c..c58117a 100644 --- a/app/src/main/res/layout/fragment_cart.xml +++ b/app/src/main/res/layout/fragment_cart.xml @@ -3,7 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:background="@color/actvity_default_background_color_1"> + android:layout_height="match_parent" + android:background="@color/actvity_default_background_color_1"/>