volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

abend menu and mittags menu option fix

Browse Source
This commit is contained in:
mustafa içmen
2019-12-04 22:48:34 +03:00
parent 4e6e476bcc
commit 200cea8e74
3 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/ch/pizzaleu/android/activity/CampaignProductDetailsActivity.java
View File

@@ -256,6 +256,21 @@ public class CampaignProductDetailsActivity extends BaseActivity {
} }
private void fixRadioAndCheckbox(){ 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<MenuProductOptionModel> sortedOptionList = menuProductModel.getProductOptionList(); ArrayList<MenuProductOptionModel> sortedOptionList = menuProductModel.getProductOptionList();
Collections.sort( Collections.sort(
sortedOptionList, sortedOptionList,

15
app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java
View File

@@ -259,6 +259,21 @@ public class ProductDetailsActivity extends BaseActivity {
} }
private void fixRadioAndCheckbox(){ 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<MenuProductOptionModel> sortedOptionList = menuProductModel.getProductOptionList(); ArrayList<MenuProductOptionModel> sortedOptionList = menuProductModel.getProductOptionList();
Collections.sort( Collections.sort(
sortedOptionList, sortedOptionList,

10
app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java
View File

@@ -6,10 +6,13 @@ public class ApiConstants {
//public static final String API_PATH = "http://www.pizzalink.ch/"; //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://pizzaleu.ddns.net/";
//public static final String API_PATH = "http://pizzamaxx.ch/"; //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 String APP_TYPE_ID_ANDROID = "2";
public static final int APP_ERROR_CODE_AUTHORIZATION = 1; 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_PIZZAPASS = "PIZZAPASS";
public static final String CAMPAIGN_CODE_KEBAPPASS = "KEBAPPASS"; 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_COMMISSION = "zahlungsgebühr";
public static final String CART_TOTAL = "total"; 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_KEY = "notificationAllowed";
public static final String ONESIGNAL_NOTIFICATION_TAG_VALUE = "true"; public static final String ONESIGNAL_NOTIFICATION_TAG_VALUE = "true";