diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index bea1b0a..6c967d0 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index b079200..c15b923 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java b/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java index 61a6325..e37d0e7 100644 --- a/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java +++ b/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java @@ -95,7 +95,7 @@ public class CampaignProductDetailsActivity extends BaseActivity { addProductToCart(); /* if((campaignModel.getCode().equals(ApiConstants.CAMPAIGN_CODE_PIZZAPASS) && SessionHelper.isUserUsedPizzapassCampaign()) || - (campaignModel.getCode().equals(ApiConstants.CAMPAIGN_CODE_CHAMPAGNE) && SessionHelper.isUserUsedChampagneCampaign())){ + (campaignModel.getCode().equals(ApiConstants.CAMPAIGN_CODE_KEBAPPASS) && SessionHelper.isUserUsedKebappassCampaign())){ DialogHelper.showAlertDialog(BaseActivity.currentActivity, cannotUseCampaignText); } else { diff --git a/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductListActivity.java b/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductListActivity.java index 0d873d2..559ffbd 100644 --- a/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductListActivity.java +++ b/app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductListActivity.java @@ -81,7 +81,7 @@ public class CampaignProductListActivity extends BaseActivity { productPropertiesIntent.putExtra("menuProductModel", menuProductList.get(position)); productPropertiesIntent.putExtra("campaignModel", campaignModel); //productPropertiesIntent.putExtra("isFromPizzapassCampaign", categoryModel.isPizzapassCampaign()); - //productPropertiesIntent.putExtra("isFromChampagneCampaign", categoryModel.isChampagneCampaign()); + //productPropertiesIntent.putExtra("isFromKebappassCampaign", categoryModel.isKebappassCampaign()); startActivityForResult(productPropertiesIntent, REQUEST_CODE_CAMPAIGN_PRODUCT_PROPERTIES); } }); diff --git a/app/src/main/java/ch/pizzamaxx/android/activity/OrderHistoryDetailsActivity.java b/app/src/main/java/ch/pizzamaxx/android/activity/OrderHistoryDetailsActivity.java index e21f279..74a1b40 100644 --- a/app/src/main/java/ch/pizzamaxx/android/activity/OrderHistoryDetailsActivity.java +++ b/app/src/main/java/ch/pizzamaxx/android/activity/OrderHistoryDetailsActivity.java @@ -209,7 +209,7 @@ public class OrderHistoryDetailsActivity extends BaseActivity { SharedPrefsHelper.setCartItemCount(0); SharedPrefsHelper.setCartTotalPrice("0"); SharedPrefsHelper.setUserUsedPizzapassCampaign(false); - SharedPrefsHelper.setUserUsedChampagneCampaign(false); + SharedPrefsHelper.setUserUsedKebappassCampaign(false); MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity; mainActivity.setCartItemCount(); */ diff --git a/app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java b/app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java index 1c7272d..6f453aa 100644 --- a/app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java @@ -14,7 +14,7 @@ public class ApiConstants { public static final int APP_ERROR_CODE_AUTHORIZATION = 1; public static final String CAMPAIGN_CODE_PIZZAPASS = "PIZZAPASS"; - public static final String CAMPAIGN_CODE_CHAMPAGNE = "CHAMPAGNE"; + public static final String CAMPAIGN_CODE_KEBAPPASS = "KEBAPPASS"; 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/pizzamaxx/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzamaxx/android/api/ApiEndPoints.java index dbfb583..ef47ed3 100644 --- a/app/src/main/java/ch/pizzamaxx/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzamaxx/android/api/ApiEndPoints.java @@ -28,7 +28,7 @@ public class ApiEndPoints { 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_PIZZAPASS = PREFIX + "detectPizzaPassCampaign" + SUFFIX + "&token="; - public static final String API_CHECK_CAMPAIGN_CHAMPAGNE = PREFIX + "detectChampagneCampaign" + SUFFIX + "&token="; + public static final String API_CHECK_CAMPAIGN_KEBAPPASS = PREFIX + "detectKebapPassCampaign" + 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/pizzamaxx/android/api/ApiInterface.java b/app/src/main/java/ch/pizzamaxx/android/api/ApiInterface.java index 1ae5e45..15520e9 100644 --- a/app/src/main/java/ch/pizzamaxx/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzamaxx/android/api/ApiInterface.java @@ -197,8 +197,8 @@ public interface ApiInterface { Call> checkPizzapassCampaign(@Path("storeName") String storeName, @Query("token") String token); - @GET("{storeName}" + ApiEndPoints.API_CHECK_CAMPAIGN_CHAMPAGNE) - Call> checkChampagneCampaign(@Path("storeName") String storeName, + @GET("{storeName}" + ApiEndPoints.API_CHECK_CAMPAIGN_KEBAPPASS) + Call> checkKebapPassCampaign(@Path("storeName") String storeName, @Query("token") String token); @GET("{storeName}" + ApiEndPoints.API_CHECK_DELIVERY_TIME) @@ -361,8 +361,8 @@ public interface ApiInterface { @GET(ApiEndPoints.API_CHECK_CAMPAIGN_PIZZAPASS) Call> checkPizzapassCampaign(@Query("token") String token); - @GET(ApiEndPoints.API_CHECK_CAMPAIGN_CHAMPAGNE) - Call> checkChampagneCampaign(@Query("token") String token); + @GET(ApiEndPoints.API_CHECK_CAMPAIGN_KEBAPPASS) + Call> checkKebapPassCampaign(@Query("token") String token); @GET(ApiEndPoints.API_CHECK_DELIVERY_TIME) Call> checkDeliveryTime(); diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/CartFragment.java index aac44aa..c1330b3 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/CartFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/CartFragment.java @@ -84,7 +84,7 @@ public class CartFragment extends BaseFragment { public static final java.lang.String FRAGMENT_NAME = "cartFragment"; private int REQUEST_CODE_CAMPAIGN_PRODUCT_LIST = 7847; private String pizzapassCampaignCategoryId = ""; - private String champagneCampaignCategoryId = ""; + private String kebappassCampaignCategoryId = ""; private CartInfoModel cartInfoModel; private ArrayList cartProductList = new ArrayList<>(); @@ -149,8 +149,8 @@ public class CartFragment extends BaseFragment { if(!pizzapassCampaignCategoryId.isEmpty()){ getCampaignProductsForPizzapassOnContinueButtonClicked(); } - else if(!champagneCampaignCategoryId.isEmpty()){ - getCampaignProductsForChampagneOnContinueButtonClicked(); + else if(!kebappassCampaignCategoryId.isEmpty()){ + getCampaignProductsForKebappassOnContinueButtonClicked(); } else { openCreateOrderActivity(); @@ -167,8 +167,8 @@ public class CartFragment extends BaseFragment { if(!pizzapassCampaignCategoryId.isEmpty()){ getCampaignProductsForPizzapassOnContinueButtonClicked(); } - else if(!champagneCampaignCategoryId.isEmpty()){ - getCampaignProductsForChampagneOnContinueButtonClicked(); + else if(!kebappassCampaignCategoryId.isEmpty()){ + getCampaignProductsForKebappassOnContinueButtonClicked(); } else { openCreateOrderActivity(); @@ -494,7 +494,7 @@ public class CartFragment extends BaseFragment { } } else { - checkChampagneCampaign(); + checkKebappassCampaign(); } } @@ -530,17 +530,17 @@ public class CartFragment extends BaseFragment { @Override public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { DialogHelper.showLoadingDialog(); - checkChampagneCampaign(); + checkKebappassCampaign(); } }, false ); } - private void checkChampagneCampaign(){ + private void checkKebappassCampaign(){ ApiService .apiInterface - .checkChampagneCampaign( + .checkKebapPassCampaign( SessionHelper.getSelectedStore().getStoreName(), SessionHelper.getCustomerToken().getToken()) .enqueue(new Callback>() { @@ -557,19 +557,19 @@ public class CartFragment extends BaseFragment { DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText); } else { - champagneCampaignCategoryId = response.body().getData().getCategoryId(); + kebappassCampaignCategoryId = response.body().getData().getCategoryId(); getCampaignProducts(response.body().getData(), false); } } /* - if(response.body().isSuccess() && !SessionHelper.isUserUsedChampagneCampaign()){ + if(response.body().isSuccess() && !SessionHelper.isUserUsedKebappassCampaign()){ if(response.body().getData() == null){ DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText); } else { response.body().getData().checkNull(); - showChampagneCampaignDialog(response.body().getData()); + showKebappassCampaignDialog(response.body().getData()); } } */ @@ -588,7 +588,7 @@ public class CartFragment extends BaseFragment { }); } - private void showChampagneCampaignDialog(final CampaignModel campaignModel){ + private void showKebappassCampaignDialog(final CampaignModel campaignModel){ DialogHelper.showTwoButtonsDialog( campaignModel.getName(), campaignModel.getDescription(), @@ -626,7 +626,7 @@ public class CartFragment extends BaseFragment { if(isBasketContainsCampaignProduct(response.body().getData())){ if(isForPizzapass){ - checkChampagneCampaign(); + checkKebappassCampaign(); } else { DialogHelper.hideLoadingDialog(); @@ -638,7 +638,7 @@ public class CartFragment extends BaseFragment { showPizzapassCampaignDialog(campaignModel); } else { - showChampagneCampaignDialog(campaignModel); + showKebappassCampaignDialog(campaignModel); } } } @@ -672,8 +672,8 @@ public class CartFragment extends BaseFragment { response.body().isSuccess()) { cartInfoModel.setPizzapassCampaignUsed(isBasketContainsCampaignProduct(response.body().getData())); - if(!champagneCampaignCategoryId.isEmpty()){ - getCampaignProductsForChampagneOnContinueButtonClicked(); + if(!kebappassCampaignCategoryId.isEmpty()){ + getCampaignProductsForKebappassOnContinueButtonClicked(); } else { DialogHelper.hideLoadingDialog(); @@ -694,13 +694,13 @@ public class CartFragment extends BaseFragment { }); } - private void getCampaignProductsForChampagneOnContinueButtonClicked(){ + private void getCampaignProductsForKebappassOnContinueButtonClicked(){ DialogHelper.showLoadingDialog(); Call> call = ApiService.apiInterface.getProductsByCategory( SessionHelper.getSelectedStore().getStoreName(), - champagneCampaignCategoryId); + kebappassCampaignCategoryId); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -710,7 +710,7 @@ public class CartFragment extends BaseFragment { if(response.isSuccessful() && response.body().getData() != null && response.body().isSuccess()) { - cartInfoModel.setChampagneCampaignUsed(isBasketContainsCampaignProduct(response.body().getData())); + cartInfoModel.setKebappassCampaignUsed(isBasketContainsCampaignProduct(response.body().getData())); openCreateOrderActivity(); } else { diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/OrderHistoryFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/OrderHistoryFragment.java index b445210..b00eea6 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/OrderHistoryFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/OrderHistoryFragment.java @@ -170,7 +170,7 @@ public class OrderHistoryFragment extends BaseFragment { SharedPrefsHelper.setCartItemCount(0); SharedPrefsHelper.setCartTotalPrice("0"); SharedPrefsHelper.setUserUsedPizzapassCampaign(false); - SharedPrefsHelper.setUserUsedChampagneCampaign(false); + SharedPrefsHelper.setUserUsedKebappassCampaign(false); MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity; mainActivity.setCartItemCount(); */ diff --git a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java index b43f755..420eac4 100644 --- a/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -201,7 +201,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { 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()); + params.put("is_kebap_pass_campaign", createOrderActivity.getCartInfo().isKebappassCampaignUsed()); params.put("application_id", ApiConstants.APP_TYPE_ID_ANDROID); if(SessionHelper.getSelectedCoupon() != null){ params.put("coupon", SessionHelper.getSelectedCoupon().getCode()); @@ -561,7 +561,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { 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()); + params.put("is_kebap_pass_campaign", createOrderActivity.getCartInfo().isKebappassCampaignUsed()); 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/pizzamaxx/android/model/cart/CartInfoModel.java b/app/src/main/java/ch/pizzamaxx/android/model/cart/CartInfoModel.java index 4701693..7509344 100644 --- a/app/src/main/java/ch/pizzamaxx/android/model/cart/CartInfoModel.java +++ b/app/src/main/java/ch/pizzamaxx/android/model/cart/CartInfoModel.java @@ -14,7 +14,7 @@ public class CartInfoModel implements Serializable { private ArrayList products; private ArrayList totals; private boolean isPizzapassCampaignUsed; - private boolean isChampagneCampaignUsed; + private boolean isKebappassCampaignUsed; public ArrayList getProducts() { return products; @@ -71,11 +71,11 @@ public class CartInfoModel implements Serializable { isPizzapassCampaignUsed = pizzapassCampaignUsed; } - public boolean isChampagneCampaignUsed() { - return isChampagneCampaignUsed; + public boolean isKebappassCampaignUsed() { + return isKebappassCampaignUsed; } - public void setChampagneCampaignUsed(boolean champagneCampaignUsed) { - isChampagneCampaignUsed = champagneCampaignUsed; + public void setKebappassCampaignUsed(boolean kebappassCampaignUsed) { + isKebappassCampaignUsed = kebappassCampaignUsed; } }