From 6288fa898917eadfb10b3023a8c07f548ba41954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Sat, 11 Jan 2020 14:38:30 +0300 Subject: [PATCH] product options order changed --- .../android/activity/CampaignProductDetailsActivity.java | 3 ++- .../android/activity/ProductDetailsActivity.java | 3 ++- .../android/model/menu/MenuProductOptionModel.java | 9 +++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) 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 4d0ff66..cdc3972 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/CampaignProductDetailsActivity.java +++ b/app/src/main/java/ch/pizzaleu/android/activity/CampaignProductDetailsActivity.java @@ -282,7 +282,8 @@ public class CampaignProductDetailsActivity extends BaseActivity { @Override public int compare(MenuProductOptionModel o1, MenuProductOptionModel o2) { //return o2.getType().compareTo(o1.getType()); - return o1.getOptionValueModelList().size() - o2.getOptionValueModelList().size(); + //return o1.getOptionValueModelList().size() - o2.getOptionValueModelList().size(); + return o1.getOrder() - o2.getOrder(); } }); menuProductModel.setProductOptionList(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 d36bf6e..31fd9a0 100644 --- a/app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java +++ b/app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java @@ -285,7 +285,8 @@ public class ProductDetailsActivity extends BaseActivity { @Override public int compare(MenuProductOptionModel o1, MenuProductOptionModel o2) { //return o2.getType().compareTo(o1.getType()); - return o1.getOptionValueModelList().size() - o2.getOptionValueModelList().size(); + //return o1.getOptionValueModelList().size() - o2.getOptionValueModelList().size(); + return o1.getOrder() - o2.getOrder(); } }); menuProductModel.setProductOptionList(sortedOptionList); diff --git a/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionModel.java b/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionModel.java index 30dec99..ab48891 100644 --- a/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionModel.java +++ b/app/src/main/java/ch/pizzaleu/android/model/menu/MenuProductOptionModel.java @@ -25,6 +25,7 @@ public class MenuProductOptionModel implements Serializable { private String value; private String type; private String required; + private int order; private void checkNull(){ @@ -112,4 +113,12 @@ public class MenuProductOptionModel implements Serializable { public void setRequired(String required) { this.required = required; } + + public int getOrder() { + return order; + } + + public void setOrder(int order) { + this.order = order; + } }