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

select all checkboxes problem fixed

Browse Source
This commit is contained in:
cimenmus
2019-04-04 00:05:38 +03:00
parent f1a4760bd8
commit 734696850f
4 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java
View File

@@ -125,6 +125,7 @@ public class CampaignProductDetailsActivity extends BaseActivity {
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
/*
//checkbox
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
menuProductOptionModel.getType().toLowerCase().equals("select"))){
@@ -135,6 +136,13 @@ public class CampaignProductDetailsActivity extends BaseActivity {
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
menuProductOptionValueModel.setSelected(true);
}
*/
if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
menuProductOptionModel.getType().toLowerCase().equals("select") &&
!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
menuProductOptionValueModel.setSelected(true);
}
}
}
@@ -245,6 +253,7 @@ public class CampaignProductDetailsActivity extends BaseActivity {
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
/*
//checkbox
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
menuProductOptionModel.getType().toLowerCase().equals("select"))){
@@ -255,6 +264,13 @@ public class CampaignProductDetailsActivity extends BaseActivity {
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
menuProductOptionValueModel.setSelected(true);
}
*/
if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
menuProductOptionModel.getType().toLowerCase().equals("select") &&
!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
menuProductOptionValueModel.setSelected(true);
}
}
}
}

16
app/src/main/java/ch/pizzamaxx/android/activity/ProductDetailsActivity.java
View File

@@ -130,7 +130,7 @@ public class ProductDetailsActivity extends BaseActivity {
for(MenuProductOptionModel menuProductOptionModel : menuProductModel.getProductOptionList()){
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
/*
//checkbox
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
menuProductOptionModel.getType().toLowerCase().equals("select"))){
@@ -141,6 +141,12 @@ public class ProductDetailsActivity extends BaseActivity {
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
menuProductOptionValueModel.setSelected(true);
}
*/
if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
menuProductOptionModel.getType().toLowerCase().equals("select") &&
!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
menuProductOptionValueModel.setSelected(true);
}
}
}
@@ -251,6 +257,7 @@ public class ProductDetailsActivity extends BaseActivity {
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
/*
//checkbox
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
menuProductOptionModel.getType().toLowerCase().equals("select"))){
@@ -261,6 +268,13 @@ public class ProductDetailsActivity extends BaseActivity {
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
menuProductOptionValueModel.setSelected(true);
}
*/
if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
menuProductOptionModel.getType().toLowerCase().equals("select") &&
!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
menuProductOptionValueModel.setSelected(true);
}
}
}
}

2
app/src/main/java/ch/pizzamaxx/android/api/ApiService.java
View File

@@ -50,7 +50,7 @@ public class ApiService {
HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); // set your desired log level
logging.setLevel(HttpLoggingInterceptor.Level.BODY);
builder.addInterceptor(logging);
//builder.addInterceptor(logging);
OkHttpClient client = builder.build();

15
app/src/main/java/ch/pizzamaxx/android/dialog/ProductPropertiesBottomSheetDialog.java
View File

@@ -137,6 +137,7 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
/*
//checkbox
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
menuProductOptionModel.getType().toLowerCase().equals("select"))){
@@ -147,6 +148,12 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
menuProductOptionValueModel.setSelected(true);
}
*/
if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
menuProductOptionModel.getType().toLowerCase().equals("select") &&
!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
menuProductOptionValueModel.setSelected(true);
}
}
}
@@ -253,6 +260,7 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
/*
//checkbox
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
menuProductOptionModel.getType().toLowerCase().equals("select"))){
@@ -263,6 +271,13 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
menuProductOptionValueModel.setSelected(true);
}
*/
if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
menuProductOptionModel.getType().toLowerCase().equals("select") &&
!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
menuProductOptionValueModel.setSelected(true);
}
}
}
}