From 588352ee460f6e8a35a3f97559011e28b9ec7b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Sat, 14 Nov 2020 20:29:25 +0300 Subject: [PATCH] pizzapass campaign added --- .../CampaignProductDetailsActivity.java | 2 +- .../activity/CampaignProductListActivity.java | 2 +- .../android/activity/CreateOrderActivity.java | 6 +-- .../pizzalemon/android/api/ApiConstants.java | 2 +- .../pizzalemon/android/api/ApiEndPoints.java | 2 +- .../pizzalemon/android/api/ApiInterface.java | 6 +-- .../android/fragment/CartFragment.java | 40 +++++++++---------- .../CreateOrderSummaryFragment.java | 4 +- .../android/model/cart/CartInfoModel.java | 10 ++--- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/ch/pizzalemon/android/activity/CampaignProductDetailsActivity.java b/app/src/main/java/ch/pizzalemon/android/activity/CampaignProductDetailsActivity.java index 00bd592..528054a 100644 --- a/app/src/main/java/ch/pizzalemon/android/activity/CampaignProductDetailsActivity.java +++ b/app/src/main/java/ch/pizzalemon/android/activity/CampaignProductDetailsActivity.java @@ -97,7 +97,7 @@ public class CampaignProductDetailsActivity extends BaseActivity { if(SessionHelper.isCustomerLoggedIn()){ addProductToCart(); /* - if((campaignModel.getCode().equals(ApiConstants.PIZZAPROMOTION) && SessionHelper.isUserUsedPizzaPromotionCampaign()){ + if((campaignModel.getCode().equals(ApiConstants.PIZZAPASS) && SessionHelper.isUserUsedPizzaPassCampaign()){ DialogHelper.showAlertDialog(BaseActivity.currentActivity, cannotUseCampaignText); } else { diff --git a/app/src/main/java/ch/pizzalemon/android/activity/CampaignProductListActivity.java b/app/src/main/java/ch/pizzalemon/android/activity/CampaignProductListActivity.java index 4258d2a..c6248de 100644 --- a/app/src/main/java/ch/pizzalemon/android/activity/CampaignProductListActivity.java +++ b/app/src/main/java/ch/pizzalemon/android/activity/CampaignProductListActivity.java @@ -79,7 +79,7 @@ public class CampaignProductListActivity extends BaseActivity { Intent productPropertiesIntent = new Intent(BaseActivity.currentActivity, CampaignProductDetailsActivity.class); productPropertiesIntent.putExtra("menuProductModel", menuProductList.get(position)); productPropertiesIntent.putExtra("campaignModel", campaignModel); - //productPropertiesIntent.putExtra("isFromPizzaPromotionCampaign", categoryModel.isPizzaPromotionCampaign()); + //productPropertiesIntent.putExtra("isFromPizzaPassCampaign", categoryModel.isPizzaPassCampaign()); startActivityForResult(productPropertiesIntent, REQUEST_CODE_CAMPAIGN_PRODUCT_PROPERTIES); } }); diff --git a/app/src/main/java/ch/pizzalemon/android/activity/CreateOrderActivity.java b/app/src/main/java/ch/pizzalemon/android/activity/CreateOrderActivity.java index f237434..f77a451 100644 --- a/app/src/main/java/ch/pizzalemon/android/activity/CreateOrderActivity.java +++ b/app/src/main/java/ch/pizzalemon/android/activity/CreateOrderActivity.java @@ -171,14 +171,14 @@ public class CreateOrderActivity extends BaseActivity { */ /** - * eğer kampanya kullanıldıysa cartInfoModel de isPizzaPromotionCampaignUsed + * eğer kampanya kullanıldıysa cartInfoModel de isPizzaPassCampaignUsed * alanalrını true olarak set ediyoruz. create order ekranlarında herhangi bir yerde sepet sorgusu yapınca - * buradaki cartInfoModel i de güncelliyoruz. fakat isPizzaPromotionCampaignUsed alanları + * buradaki cartInfoModel i de güncelliyoruz. fakat isPizzaPassCampaignUsed alanları * servisten gelmeyen değerler, bizim loaklde tuttuğumuz değişkenler. bu sebeple bu alanlar servisten hep false geliyor, * buradakinde true olsa bile değişkeni guncellediğimiz için bu alanlar kayboluyor. bunu engellemek için bu metodu yazdım. */ public void setCartInfoSafeForCampaigns(CartInfoModel cartInfoModel) { - cartInfoModel.setPizzaPromotionCampaignUsed(this.cartInfoModel.isPizzaPromotionCampaignUsed()); + cartInfoModel.setPizzaPassCampaignUsed(this.cartInfoModel.isPizzaPassCampaignUsed()); this.cartInfoModel = cartInfoModel; } diff --git a/app/src/main/java/ch/pizzalemon/android/api/ApiConstants.java b/app/src/main/java/ch/pizzalemon/android/api/ApiConstants.java index 459646d..2f17018 100644 --- a/app/src/main/java/ch/pizzalemon/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzalemon/android/api/ApiConstants.java @@ -12,7 +12,7 @@ public class ApiConstants { public static final int PRODUCT_ID_MITTAGS_MENU = 732; public static final String PRODUCT_ID_VERSION_MENU = "-111"; - public static final String CAMPAIGN_CODE_PIZZA_PROMOTION = "PIZZAPROMOTION"; + public static final String CAMPAIGN_CODE_PIZZAPASS = "PIZZAPASS"; public static final String PAYMENT_METHOD_CODE_CREDIT_DEBIT_CARD = "braintree"; // Credit / Debit Card public static final String PAYMENT_METHOD_CODE_BANK_CASH = "cod"; // Bar diff --git a/app/src/main/java/ch/pizzalemon/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzalemon/android/api/ApiEndPoints.java index 56fb0c9..ff67377 100644 --- a/app/src/main/java/ch/pizzalemon/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzalemon/android/api/ApiEndPoints.java @@ -30,7 +30,7 @@ public class ApiEndPoints { public static final String API_GET_ZONE_LIST = PREFIX + "getZones" + SUFFIX; public static final String API_GET_CUSTOMER_PROFILE = PREFIX + "getCustomerInfo" + SUFFIX; public static final String API_GET_STORE_INFO = PREFIX + "getStoreInfo" + SUFFIX; - public static final String API_CHECK_CAMPAIGN_PIZZA_PROMOTION = PREFIX + "detectPizzaPromotionCampaign" + SUFFIX + "&token="; + public static final String API_CHECK_CAMPAIGN_PIZZAPASS = PREFIX + "detectPizzaPassCampaign" + SUFFIX + "&token="; public static final String API_CHECK_DELIVERY_TIME = PREFIX + "checkDeliveryTimeService" + SUFFIX; public static final String API_GET_DELIVERY_TIME_OF_STORE = PREFIX + "getDeliveryTimeForStore" + SUFFIX; diff --git a/app/src/main/java/ch/pizzalemon/android/api/ApiInterface.java b/app/src/main/java/ch/pizzalemon/android/api/ApiInterface.java index e4fcbc0..38f72be 100644 --- a/app/src/main/java/ch/pizzalemon/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzalemon/android/api/ApiInterface.java @@ -204,9 +204,9 @@ public interface ApiInterface { Call> checkPersonalCoupon(@Url String url, @Field("voucher") String couponCode); - @GET("{storeName}" + ApiEndPoints.API_CHECK_CAMPAIGN_PIZZA_PROMOTION) - Call> checkPizzaPromotionCampaign(@Path("storeName") String storeName, - @Query("token") String token); + @GET("{storeName}" + ApiEndPoints.API_CHECK_CAMPAIGN_PIZZAPASS) + Call> checkPizzaPassCampaign(@Path("storeName") String storeName, + @Query("token") String token); @GET("{storeName}" + ApiEndPoints.API_CHECK_DELIVERY_TIME) Call> checkDeliveryTime(@Path("storeName") String storeName, diff --git a/app/src/main/java/ch/pizzalemon/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzalemon/android/fragment/CartFragment.java index e1cda6c..e2221f0 100644 --- a/app/src/main/java/ch/pizzalemon/android/fragment/CartFragment.java +++ b/app/src/main/java/ch/pizzalemon/android/fragment/CartFragment.java @@ -83,12 +83,12 @@ public class CartFragment extends BaseFragment { public static final java.lang.String FRAGMENT_NAME = "cartFragment"; private int REQUEST_CODE_CAMPAIGN_PRODUCT_LIST = 7847; - private String pizzaPromotionCampaignCategoryId = ""; + private String pizzaPassCampaignCategoryId = ""; private CartInfoModel cartInfoModel; private ArrayList cartProductList = new ArrayList<>(); private CartRecyclerAdapter cartRecyclerAdapter; - private ArrayList pizzaPromotionCampaignProductList = new ArrayList<>(); + private ArrayList pizzaPassCampaignProductList = new ArrayList<>(); public CartFragment() {} @@ -146,8 +146,8 @@ public class CartFragment extends BaseFragment { case R.id.continueCartButton: // without minimum price control for store. minimum price is contorlled by addOrder2() service. - if(!pizzaPromotionCampaignCategoryId.isEmpty()){ - getCampaignProductsForPizzaPromotionOnContinueButtonClicked(); + if(!pizzaPassCampaignCategoryId.isEmpty()){ + getCampaignProductsForPizzaPassOnContinueButtonClicked(); } else { openCreateOrderActivity(); @@ -161,8 +161,8 @@ public class CartFragment extends BaseFragment { if(cartCurrentPrice >= storeMinimumPrice){ - if(!pizzaPromotionCampaignCategoryId.isEmpty()){ - getCampaignProductsForPizzaPromotionOnContinueButtonClicked(); + if(!pizzaPassCampaignCategoryId.isEmpty()){ + getCampaignProductsForPizzaPassOnContinueButtonClicked(); } else { openCreateOrderActivity(); @@ -228,7 +228,7 @@ public class CartFragment extends BaseFragment { DialogHelper.hideLoadingDialog(); } else { - checkPizzaPromotionCampaign(); + checkPizzaPassCampaign(); } } else { @@ -410,10 +410,10 @@ public class CartFragment extends BaseFragment { } ); - if(!pizzaPromotionCampaignProductList.isEmpty()){ - cartInfoModel.setPizzaPromotionCampaignUsed( + if(!pizzaPassCampaignProductList.isEmpty()){ + cartInfoModel.setPizzaPassCampaignUsed( isBasketContainsCampaignProduct( - pizzaPromotionCampaignProductList)); + pizzaPassCampaignProductList)); } } @@ -467,10 +467,10 @@ public class CartFragment extends BaseFragment { } - private void checkPizzaPromotionCampaign(){ + private void checkPizzaPassCampaign(){ ApiService .apiInterface - .checkPizzaPromotionCampaign( + .checkPizzaPassCampaign( SessionHelper.getSelectedStore().getStoreName(), SessionHelper.getCustomerToken().getToken()) .enqueue(new Callback>() { @@ -486,7 +486,7 @@ public class CartFragment extends BaseFragment { DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText); } else { - pizzaPromotionCampaignCategoryId = response.body().getData().getCategoryId(); + pizzaPassCampaignCategoryId = response.body().getData().getCategoryId(); getCampaignProducts(response.body().getData()); } } @@ -505,7 +505,7 @@ public class CartFragment extends BaseFragment { }); } - private void showPizzaPromotionCampaignDialog(final CampaignModel campaignModel){ + private void showPizzaPassCampaignDialog(final CampaignModel campaignModel){ DialogHelper.showTwoButtonsDialog( campaignModel.getName(), campaignModel.getDescription(), @@ -540,7 +540,7 @@ public class CartFragment extends BaseFragment { response.body().getData() != null && response.body().isSuccess()) { if(!isBasketContainsCampaignProduct(response.body().getData())){ - showPizzaPromotionCampaignDialog(campaignModel); + showPizzaPassCampaignDialog(campaignModel); } } else { @@ -555,13 +555,13 @@ public class CartFragment extends BaseFragment { }); } - private void getCampaignProductsForPizzaPromotionOnContinueButtonClicked(){ + private void getCampaignProductsForPizzaPassOnContinueButtonClicked(){ DialogHelper.showLoadingDialog(); Call> call = ApiService.apiInterface.getProductsByCategory( SessionHelper.getSelectedStore().getStoreName(), - pizzaPromotionCampaignCategoryId); + pizzaPassCampaignCategoryId); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -570,9 +570,9 @@ public class CartFragment extends BaseFragment { response.body().getData() != null && response.body().isSuccess()) { - pizzaPromotionCampaignProductList.clear(); - pizzaPromotionCampaignProductList.addAll(response.body().getData()); - cartInfoModel.setPizzaPromotionCampaignUsed(isBasketContainsCampaignProduct(response.body().getData())); + pizzaPassCampaignProductList.clear(); + pizzaPassCampaignProductList.addAll(response.body().getData()); + cartInfoModel.setPizzaPassCampaignUsed(isBasketContainsCampaignProduct(response.body().getData())); DialogHelper.hideLoadingDialog(); openCreateOrderActivity(); diff --git a/app/src/main/java/ch/pizzalemon/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzalemon/android/fragment/createOrder/CreateOrderSummaryFragment.java index ec66557..8455709 100644 --- a/app/src/main/java/ch/pizzalemon/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzalemon/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -216,7 +216,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { params.put("payment_method_title", createOrderActivity.getSelectedPaymentMethod().getTitle()); params.put("payment_method_code", createOrderActivity.getSelectedPaymentMethod().getCode()); params.put("comment", createOrderNote()); - params.put("is_pizza_promotion_campaign", createOrderActivity.getCartInfo().isPizzaPromotionCampaignUsed()); + params.put("is_pizza_pass_campaign", createOrderActivity.getCartInfo().isPizzaPassCampaignUsed()); params.put("application_id", ApiConstants.APP_TYPE_ID_ANDROID); SessionHelper.addCouponCodeToRequestParamsIfNeeded(params); if(dateOfOrderString != null && !dateOfOrderString.isEmpty() && @@ -708,7 +708,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { params.put("payment_method_title", createOrderActivity.getSelectedPaymentMethod().getTitle()); params.put("payment_method_code", createOrderActivity.getSelectedPaymentMethod().getCode()); params.put("comment", createOrderNote()); - params.put("is_pizza_promotion_campaign", createOrderActivity.getCartInfo().isPizzaPromotionCampaignUsed()); + params.put("is_pizza_pass_campaign", createOrderActivity.getCartInfo().isPizzaPassCampaignUsed()); params.put("application_id", ApiConstants.APP_TYPE_ID_ANDROID); if(paymentMethodNonce != null){ params.put("payment_method_nonce", paymentMethodNonce); diff --git a/app/src/main/java/ch/pizzalemon/android/model/cart/CartInfoModel.java b/app/src/main/java/ch/pizzalemon/android/model/cart/CartInfoModel.java index 4be77e2..1dd864a 100644 --- a/app/src/main/java/ch/pizzalemon/android/model/cart/CartInfoModel.java +++ b/app/src/main/java/ch/pizzalemon/android/model/cart/CartInfoModel.java @@ -13,7 +13,7 @@ public class CartInfoModel implements Serializable { private ArrayList products; private ArrayList totals; - private boolean isPizzaPromotionCampaignUsed; + private boolean isPizzaPassCampaignUsed; public ArrayList getProducts() { return products; @@ -62,11 +62,11 @@ public class CartInfoModel implements Serializable { } - public boolean isPizzaPromotionCampaignUsed() { - return isPizzaPromotionCampaignUsed; + public boolean isPizzaPassCampaignUsed() { + return isPizzaPassCampaignUsed; } - public void setPizzaPromotionCampaignUsed(boolean pizzaPromotionCampaignUsed) { - isPizzaPromotionCampaignUsed = pizzaPromotionCampaignUsed; + public void setPizzaPassCampaignUsed(boolean pizzaPassCampaignUsed) { + isPizzaPassCampaignUsed = pizzaPassCampaignUsed; } }