From 0cf9205a6b84b9a4336e7de2b0fd0a51e380ea4f Mon Sep 17 00:00:00 2001 From: cimenmus Date: Tue, 2 Oct 2018 23:05:41 +0300 Subject: [PATCH] basket minimum price control added before create order --- .../ch/pizzapp/android/api/ApiEndPoints.java | 1 + .../ch/pizzapp/android/api/ApiInterface.java | 6 ++- .../CreateOrderSummaryFragment.java | 43 ++++++++++++++++++- 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java index ec901c5..78dc811 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java @@ -48,5 +48,6 @@ public class ApiEndPoints { public static final String API_CHECK_COUPON = PREFIX + "checkCoupon" + SUFFIX + "&token="; public static final String API_CREATE_PAYMENT = PREFIX + "checkBrainTreePayment" + SUFFIX + "&token="; public static final String API_REPEAT_ORDER = PREFIX + "reOrder" + SUFFIX + "&token="; + public static final String API_CHECK_BASKET_BY_MINIMUM_PRICE = PREFIX + "checkBasketByMinimumPrice" + SUFFIX + "&token="; } diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java b/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java index 1b6501b..a40ce4f 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java @@ -224,8 +224,10 @@ public interface ApiInterface { @GET("{storeName}" + ApiEndPoints.API_GET_DELIVERY_TIME_OF_STORE) Call> getDeliveryTimeOfStore(@Path("storeName") String storeName); - - + @FormUrlEncoded + @POST + Call> checkBasketByMinimumPriceOfStore(@Url String url, + @FieldMap HashMap body); diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java index 89ab692..18139cc 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -143,7 +143,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { createOrderActivity.onPreviousClicked(FRAGMENT_NAME); break; case R.id.nextTextView: - checkDeliveryTime(); + checkBasketByMinimumPriceOfStore(); break; } } @@ -186,6 +186,47 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { orderProductsRecyclerView.setAdapter(productOnOrderSummaryRecyclerAdapter); } + private void checkBasketByMinimumPriceOfStore(){ + + DialogHelper.showLoadingDialog(); + + HashMap params = new HashMap<>(); + params.put("customer_id", SessionHelper.getUser().getId()); + params.put("shipping_method_title", createOrderActivity.getSelectedShippingMethod().getTitle()); + params.put("shipping_method_code", createOrderActivity.getSelectedShippingMethod().getCode()); + params.put("address_id", createOrderActivity.getSelectedShippingAddress().getId()); + params.put("payment_method_title", createOrderActivity.getSelectedPaymentMethod().getTitle()); + params.put("payment_method_code", createOrderActivity.getSelectedPaymentMethod().getCode()); + params.put("comment", createOrderNote()); + params.put("is_pizza_pass_campaign", createOrderActivity.getCartInfo().isPizzapassCampaignUsed()); + params.put("is_champagne_campaign", createOrderActivity.getCartInfo().isChampagneCampaignUsed()); + if(SessionHelper.getSelectedCoupon() != null){ + params.put("coupon", SessionHelper.getSelectedCoupon().getCode()); + } + + Call> call = ApiService.apiInterface.checkBasketByMinimumPriceOfStore( + "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_CHECK_BASKET_BY_MINIMUM_PRICE + SessionHelper.getCustomerToken().getToken(), params); + call.enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if(response.isSuccessful() && response.body().isSuccess()){ + checkDeliveryTime(); + } + else{ + DialogHelper.hideLoadingDialog(); + ApiErrorUtils.parseError(response); + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + DialogHelper.hideLoadingDialog(); + DialogHelper.showFailedDialog(); + } + }); + + } + private void checkDeliveryTime(){ ApiService .apiInterface