From d471dc295e7376c902de263b6334eaff4bd2bf2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Sat, 15 Aug 2020 14:36:38 +0300 Subject: [PATCH] voucher fixes 2 --- .../pizzacucina/android/api/ApiInterface.java | 149 ------------------ .../createOrder/PaymentMethodFragment.java | 47 +++--- .../android/helper/SessionHelper.java | 2 + 3 files changed, 30 insertions(+), 168 deletions(-) diff --git a/app/src/main/java/ch/pizzacucina/android/api/ApiInterface.java b/app/src/main/java/ch/pizzacucina/android/api/ApiInterface.java index bbdeea6..20dfcb5 100644 --- a/app/src/main/java/ch/pizzacucina/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ApiInterface.java @@ -256,153 +256,4 @@ public interface ApiInterface { Call> getPersonalCouponList(@Path("storeName") String storeName, @Query("token") String token); - - - - - - - /* - @GET(ApiEndPoints.API_GET_ALL_CATEGORIES) - Call> getAllCategories(@Path("id") int id); - - @GET(ApiEndPoints.API_GET_IGNORED_CATEGORY_IDS) - Call> getIgnoredCategoryIds(); - - @GET(ApiEndPoints.API_GET_PIZZA_CATEGORY_IDS) - Call> getPizzaCategoryIds(); - - @FormUrlEncoded - @POST(ApiEndPoints.API_REGISTER) - Call> register(@FieldMap HashMap body); - - @FormUrlEncoded - @POST(ApiEndPoints.API_LOGIN) - Call> login(@Field("email") String email, @Field("password") String password); - - @FormUrlEncoded - @POST(ApiEndPoints.API_LOGOUT) - Call logout(@Field("token") String customerToken); - - @GET(ApiEndPoints.API_GET_ORDER_HISTORY) - Call> getOrderHistory(@Query("token") String token); - - @POST - Call> getCartProducts(@Url String url); - - @FormUrlEncoded - @POST - Call> getCartProductsForCommission(@Url String url, - @Field("payment_method") String paymentMethodCode, - @Field("shipping_method") String shippingMethodCode); - - @GET(ApiEndPoints.API_GET_CLEAR_CART) - Call clearCart(@Query("token") String token); - - @GET(ApiEndPoints.API_GET_PRODUCTS_BY_CATEGORY) - Call> getProductsByCategory(@Query("category_id") String categoryId); - - @FormUrlEncoded - @POST(ApiEndPoints.API_GET_PRODUCT) - Call> getProductById(@Field("product_id") int productId); - - - // * Bu projedeki post servisler bizden form-data bekliyor. Bu serviste @FormUrlEncoded yapınca ve - // * body'i @FieldMap HashMap body olarak verince, body içindeki alanlar - // * encode ediliyor, mesela body içindeki "[" karakteri "%5D" ye falan dönüşüyor, dolayısı ile servis bunları okuyamıyor. - // * Bu sebeple body olarak RequestBody verdim ve servisi çağırırken bod içindeki alanları FormBody olarak ekledim. - @POST - Call> addProductsToBasket(@Url String url, - @Body RequestBody body); - @GET(ApiEndPoints.API_GET_SHIPPING_METHODS) - Call> getShippingMethods(@Query("token") String token); - - @GET(ApiEndPoints.API_GET_CUSTOMER_ADDRESSES) - Call> getCustomerAddresses(@Query("token") String token); - - @FormUrlEncoded - @POST - Call> addNewAddress(@Url String url, - @FieldMap HashMap body); - @FormUrlEncoded - @POST - Call> deleteAddress(@Url String url, - @Field("address_id") String addressId); - @GET(ApiEndPoints.API_GET_PAYMENT_METHODS) - Call> getPaymentMethods(@Query("token") String token); - - @FormUrlEncoded - @POST - Call> createOrder(@Url String url, @FieldMap HashMap body); - - @FormUrlEncoded - @POST(ApiEndPoints.API_CHECK_UPDATE) - Call> checkUpdate(@FieldMap HashMap body); - - @FormUrlEncoded - @POST(ApiEndPoints.API_FORGOT_PASSWORD) - Call forgotPassword(@Field("email") String emailAddress); - - @GET(ApiEndPoints.API_GET_CITY_LIST) - Call> getCityList(); - - @GET(ApiEndPoints.API_GET_COUNTRY_LIST) - Call> getCountryList(); - - @FormUrlEncoded - @POST(ApiEndPoints.API_GET_ZONE_LIST) - Call> getZoneList(@Field("country_id") String countryId); - - @GET(ApiEndPoints.API_GET_CUSTOMER_PROFILE) - Call> getCustomerProfile(@Query("token") String token); - - @FormUrlEncoded - @POST - Call updatePassword(@Url String url, @FieldMap HashMap body); - - @FormUrlEncoded - @POST - Call> updateProfile(@Url String url, @FieldMap HashMap body); - - @FormUrlEncoded - @POST - Call> removeProductFromCart(@Url String url, - @FieldMap HashMap body); - @GET(ApiEndPoints.API_GET_STORE_INFO) - Call> getStoreInfo(); - - @FormUrlEncoded - @POST - Call> getOrderProductList(@Url String url, - @Field("order_id") String orderId); - @FormUrlEncoded - @POST - Call> checkCoupon(@Url String url, @Field("coupon") String couponCode); - - @GET(ApiEndPoints.API_CHECK_CAMPAIGN_PIZZAPASS) - Call> checkPizzapassCampaign(@Query("token") String token); - - @GET(ApiEndPoints.API_CHECK_CAMPAIGN_KEBAPPASS) - Call> checkKebapPassCampaign(@Query("token") String token); - - @GET(ApiEndPoints.API_CHECK_DELIVERY_TIME) - Call> checkDeliveryTime(); - - @FormUrlEncoded - @POST(ApiEndPoints.API_CHECK_DELIVERY_TIME) - Call> checkDeliveryTimeWithDateAndTime(@Field("delivery_date") String deliveryDateAndTime); - - @FormUrlEncoded - @POST - Call createPayment(@Url String url, @FieldMap HashMap body); - - @FormUrlEncoded - @POST - Call repeatOrder(@Url String url, @FieldMap HashMap body); - - @GET(ApiEndPoints.API_GET_STORE_LIST) - Call> getStoreList(); - */ - - } diff --git a/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/PaymentMethodFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/PaymentMethodFragment.java index 0404b6e..ba19758 100644 --- a/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/PaymentMethodFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/PaymentMethodFragment.java @@ -236,32 +236,41 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment { call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { - if(response.isSuccessful() && - response.body().getData() != null && - response.body().isSuccess()){ - couponModel = response.body().getData(); - couponModel.setStoreName(SessionHelper.getSelectedStore().getStoreName()); - if(couponModel.isActive()){ + if(response.isSuccessful()){ - String couponName = ""; - if(couponModel instanceof PersonalCouponModel){ - couponName = ((PersonalCouponModel) couponModel).getTheme(); + if(response.body().getData() != null && + response.body().isSuccess()){ + + couponModel = response.body().getData(); + couponModel.setStoreName(SessionHelper.getSelectedStore().getStoreName()); + if(couponModel.isActive()){ + + String couponName = ""; + if(couponModel instanceof PersonalCouponModel){ + couponName = ((PersonalCouponModel) couponModel).getTheme(); + } + + SessionHelper.saveSelectedCoupon(couponModel); + DialogHelper.showDialogWithPositiveButton( + couponUsedDialogTitle, + BaseActivity.currentActivity, + couponUsedDialogContentPart1 + " " + couponName + " " + couponUsedDialogContentPart2); + getCartProducts(); + } + else { + DialogHelper.hideLoadingDialog(); + ApiErrorUtils.parseError(response); } - - SessionHelper.saveSelectedCoupon(couponModel); - DialogHelper.showDialogWithPositiveButton( - couponUsedDialogTitle, - BaseActivity.currentActivity, - couponUsedDialogContentPart1 + " " + couponName + " " + couponUsedDialogContentPart2); - getCartProducts(); } else { - checkGeneralCoupon(); + DialogHelper.hideLoadingDialog(); + ApiErrorUtils.parseError(response); } } else { - DialogHelper.hideLoadingDialog(); - ApiErrorUtils.parseError(response); + checkGeneralCoupon(); + //DialogHelper.hideLoadingDialog(); + //ApiErrorUtils.parseError(response); } } diff --git a/app/src/main/java/ch/pizzacucina/android/helper/SessionHelper.java b/app/src/main/java/ch/pizzacucina/android/helper/SessionHelper.java index 0df8b70..4ab6979 100644 --- a/app/src/main/java/ch/pizzacucina/android/helper/SessionHelper.java +++ b/app/src/main/java/ch/pizzacucina/android/helper/SessionHelper.java @@ -81,10 +81,12 @@ public class SessionHelper { public static void saveSelectedCoupon(CouponModel couponModel){ if(couponModel instanceof PersonalCouponModel){ PersonalCouponModel personalCouponModel = (PersonalCouponModel) couponModel; + SessionHelper.clearSelectedCoupon(); SharedPrefsHelper.saveSelectedPersonalCoupon(personalCouponModel); } else if(couponModel instanceof GeneralCouponModel){ GeneralCouponModel generalCouponModel = (GeneralCouponModel) couponModel; + SessionHelper.clearSelectedCoupon(); SharedPrefsHelper.saveSelectedGeneralCoupon(generalCouponModel); } }