select all checkboxes problem fixed
This commit is contained in:
@@ -125,6 +125,7 @@ public class CampaignProductDetailsActivity extends BaseActivity {
|
|||||||
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
|
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
|
||||||
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
|
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
|
||||||
|
|
||||||
|
/*
|
||||||
//checkbox
|
//checkbox
|
||||||
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
||||||
menuProductOptionModel.getType().toLowerCase().equals("select"))){
|
menuProductOptionModel.getType().toLowerCase().equals("select"))){
|
||||||
@@ -135,6 +136,13 @@ public class CampaignProductDetailsActivity extends BaseActivity {
|
|||||||
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
|
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
|
||||||
menuProductOptionValueModel.setSelected(true);
|
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()){
|
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
|
||||||
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
|
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
|
||||||
|
|
||||||
|
/*
|
||||||
//checkbox
|
//checkbox
|
||||||
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
||||||
menuProductOptionModel.getType().toLowerCase().equals("select"))){
|
menuProductOptionModel.getType().toLowerCase().equals("select"))){
|
||||||
@@ -255,6 +264,13 @@ public class CampaignProductDetailsActivity extends BaseActivity {
|
|||||||
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
|
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
|
||||||
menuProductOptionValueModel.setSelected(true);
|
menuProductOptionValueModel.setSelected(true);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
||||||
|
menuProductOptionModel.getType().toLowerCase().equals("select") &&
|
||||||
|
!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
|
||||||
|
menuProductOptionValueModel.setSelected(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ public class ProductDetailsActivity extends BaseActivity {
|
|||||||
for(MenuProductOptionModel menuProductOptionModel : menuProductModel.getProductOptionList()){
|
for(MenuProductOptionModel menuProductOptionModel : menuProductModel.getProductOptionList()){
|
||||||
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
|
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
|
||||||
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
|
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
|
||||||
|
/*
|
||||||
//checkbox
|
//checkbox
|
||||||
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
||||||
menuProductOptionModel.getType().toLowerCase().equals("select"))){
|
menuProductOptionModel.getType().toLowerCase().equals("select"))){
|
||||||
@@ -141,6 +141,12 @@ public class ProductDetailsActivity extends BaseActivity {
|
|||||||
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
|
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
|
||||||
menuProductOptionValueModel.setSelected(true);
|
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()){
|
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
|
||||||
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
|
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
|
||||||
|
|
||||||
|
/*
|
||||||
//checkbox
|
//checkbox
|
||||||
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
||||||
menuProductOptionModel.getType().toLowerCase().equals("select"))){
|
menuProductOptionModel.getType().toLowerCase().equals("select"))){
|
||||||
@@ -261,6 +268,13 @@ public class ProductDetailsActivity extends BaseActivity {
|
|||||||
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
|
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
|
||||||
menuProductOptionValueModel.setSelected(true);
|
menuProductOptionValueModel.setSelected(true);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
||||||
|
menuProductOptionModel.getType().toLowerCase().equals("select") &&
|
||||||
|
!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
|
||||||
|
menuProductOptionValueModel.setSelected(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ public class ApiService {
|
|||||||
|
|
||||||
HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); // set your desired log level
|
HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); // set your desired log level
|
||||||
logging.setLevel(HttpLoggingInterceptor.Level.BODY);
|
logging.setLevel(HttpLoggingInterceptor.Level.BODY);
|
||||||
builder.addInterceptor(logging);
|
//builder.addInterceptor(logging);
|
||||||
|
|
||||||
OkHttpClient client = builder.build();
|
OkHttpClient client = builder.build();
|
||||||
|
|
||||||
|
|||||||
@@ -137,6 +137,7 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen
|
|||||||
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
|
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
|
||||||
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
|
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
|
||||||
|
|
||||||
|
/*
|
||||||
//checkbox
|
//checkbox
|
||||||
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
||||||
menuProductOptionModel.getType().toLowerCase().equals("select"))){
|
menuProductOptionModel.getType().toLowerCase().equals("select"))){
|
||||||
@@ -147,6 +148,12 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen
|
|||||||
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
|
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
|
||||||
menuProductOptionValueModel.setSelected(true);
|
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()){
|
for(MenuProductOptionValueModel menuProductOptionValueModel : menuProductOptionModel.getOptionValueModelList()){
|
||||||
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
|
if(menuProductOptionValueModel.getPrice().equals("0") || menuProductOptionValueModel.getPrice().equals("0.00")){
|
||||||
|
|
||||||
|
/*
|
||||||
//checkbox
|
//checkbox
|
||||||
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
if(!(menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
||||||
menuProductOptionModel.getType().toLowerCase().equals("select"))){
|
menuProductOptionModel.getType().toLowerCase().equals("select"))){
|
||||||
@@ -263,6 +271,13 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen
|
|||||||
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
|
else if(!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList())){
|
||||||
menuProductOptionValueModel.setSelected(true);
|
menuProductOptionValueModel.setSelected(true);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
if((menuProductOptionModel.getType().toLowerCase().equals("radio") ||
|
||||||
|
menuProductOptionModel.getType().toLowerCase().equals("select") &&
|
||||||
|
!isAnyOptionValueSelected(menuProductOptionModel.getOptionValueModelList()))){
|
||||||
|
menuProductOptionValueModel.setSelected(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user