From 200cea8e7402e32eed6432b98dbe70eef8d24775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Wed, 4 Dec 2019 22:48:34 +0300 Subject: [PATCH] abend menu and mittags menu option fix --- .../activity/CampaignProductDetailsActivity.java | 15 +++++++++++++++ .../android/activity/ProductDetailsActivity.java | 15 +++++++++++++++ .../ch/pizzaleu/android/api/ApiConstants.java | 10 +++++++++- 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/ch/pizzaleu/android/activity/CampaignProductDetailsActivity.java b/app/src/main/java/ch/pizzaleu/android/activity/CampaignProductDetailsActivity.java index bd6dd69..ef7e7f4 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/CampaignProductDetailsActivity.java +++ b/app/src/main/java/ch/pizzaleu/android/activity/CampaignProductDetailsActivity.java @@ -256,6 +256,21 @@ public class CampaignProductDetailsActivity extends BaseActivity { } private void fixRadioAndCheckbox(){ + if(menuProductModel.getId().equals(String.valueOf(ApiConstants.PRODUCT_ID_ABEND_MENU)) || + menuProductModel.getId().equals(String.valueOf(ApiConstants.PRODUCT_ID_MITTAGS_MENU))){ + for(MenuProductOptionModel menuProductOptionModel : menuProductModel.getProductOptionList()){ + boolean isAbendMenuPizzaSelection = + menuProductOptionModel.getOptionId().equals(ApiConstants.OPTION_ID_ABEND_AND_MITTAGS_MENU_PIZZA_SELECTION) && + menuProductOptionModel.getProductOptionId().equals(ApiConstants.PRODUCT_OPTION_ID_ABEND_MENU_PIZZA_SELECTION); + boolean isMittagsMenuPizzaSelection = + menuProductOptionModel.getOptionId().equals(ApiConstants.OPTION_ID_ABEND_AND_MITTAGS_MENU_PIZZA_SELECTION) && + menuProductOptionModel.getProductOptionId().equals(ApiConstants.PRODUCT_OPTION_ID_MITTAGS_MENU_OPTIONS); + if(isAbendMenuPizzaSelection || isMittagsMenuPizzaSelection){ + menuProductOptionModel.setType("radio"); + } + } + } + ArrayList sortedOptionList = menuProductModel.getProductOptionList(); Collections.sort( sortedOptionList, diff --git a/app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java b/app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java index 90e0714..71ffbc0 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java +++ b/app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java @@ -259,6 +259,21 @@ public class ProductDetailsActivity extends BaseActivity { } private void fixRadioAndCheckbox(){ + if(menuProductModel.getId().equals(String.valueOf(ApiConstants.PRODUCT_ID_ABEND_MENU)) || + menuProductModel.getId().equals(String.valueOf(ApiConstants.PRODUCT_ID_MITTAGS_MENU))){ + for(MenuProductOptionModel menuProductOptionModel : menuProductModel.getProductOptionList()){ + boolean isAbendMenuPizzaSelection = + menuProductOptionModel.getOptionId().equals(ApiConstants.OPTION_ID_ABEND_AND_MITTAGS_MENU_PIZZA_SELECTION) && + menuProductOptionModel.getProductOptionId().equals(ApiConstants.PRODUCT_OPTION_ID_ABEND_MENU_PIZZA_SELECTION); + boolean isMittagsMenuPizzaSelection = + menuProductOptionModel.getOptionId().equals(ApiConstants.OPTION_ID_ABEND_AND_MITTAGS_MENU_PIZZA_SELECTION) && + menuProductOptionModel.getProductOptionId().equals(ApiConstants.PRODUCT_OPTION_ID_MITTAGS_MENU_OPTIONS); + if(isAbendMenuPizzaSelection || isMittagsMenuPizzaSelection){ + menuProductOptionModel.setType("radio"); + } + } + } + ArrayList sortedOptionList = menuProductModel.getProductOptionList(); Collections.sort( sortedOptionList, diff --git a/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java b/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java index 3744808..e0c4195 100644 --- a/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java @@ -6,10 +6,13 @@ public class ApiConstants { //public static final String API_PATH = "http://www.pizzalink.ch/"; public static final String API_PATH = "http://pizzaleu.ddns.net/"; //public static final String API_PATH = "http://pizzamaxx.ch/"; - public static final int PRODUCT_ID_WUNSCHPIZZA = 56; public static final String APP_TYPE_ID_ANDROID = "2"; public static final int APP_ERROR_CODE_AUTHORIZATION = 1; + public static final int PRODUCT_ID_WUNSCHPIZZA = 56; + public static final int PRODUCT_ID_ABEND_MENU = 733; + public static final int PRODUCT_ID_MITTAGS_MENU = 732; + public static final String CAMPAIGN_CODE_PIZZAPASS = "PIZZAPASS"; public static final String CAMPAIGN_CODE_KEBAPPASS = "KEBAPPASS"; @@ -27,6 +30,11 @@ public class ApiConstants { public static final String CART_COMMISSION = "zahlungsgebühr"; public static final String CART_TOTAL = "total"; + public static final String OPTION_ID_ABEND_AND_MITTAGS_MENU_PIZZA_SELECTION = "73"; + + public static final String PRODUCT_OPTION_ID_ABEND_MENU_PIZZA_SELECTION = "869"; + public static final String PRODUCT_OPTION_ID_MITTAGS_MENU_OPTIONS = "872"; + public static final String ONESIGNAL_NOTIFICATION_TAG_KEY = "notificationAllowed"; public static final String ONESIGNAL_NOTIFICATION_TAG_VALUE = "true";