From 6e5f8496c4bdbc92ee4cbe7a5932685130f03254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Tue, 30 Jun 2020 09:53:24 +0300 Subject: [PATCH] campaign oroduct delete fixx --- .idea/caches/build_file_checksums.ser | Bin 542 -> 542 bytes .idea/jarRepositories.xml | 40 ++++++++++++++++++ .../android/fragment/CartFragment.java | 21 +++++++++ 3 files changed, 61 insertions(+) create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 8c0460feb46b422aef0ae4df9ce6e497fb6416d7..6603b9ad30dad233c9e948ffcaa1181f63cea6a0 100644 GIT binary patch delta 16 YcmbQoGLL1#bk<_#Kl|2hoYTYz066Ri9smFU delta 16 YcmbQoGLL1#bk?GayABp^oYTYz06c34Z~y=R diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..4205295 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/ch/pizzacucina/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/CartFragment.java index 630efc8..3f94993 100644 --- a/app/src/main/java/ch/pizzacucina/android/fragment/CartFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/CartFragment.java @@ -89,6 +89,8 @@ public class CartFragment extends BaseFragment { private CartInfoModel cartInfoModel; private ArrayList cartProductList = new ArrayList<>(); private CartRecyclerAdapter cartRecyclerAdapter; + private ArrayList pizzapassCampaignProductList = new ArrayList<>(); + private ArrayList kebappassCampaignProductList = new ArrayList<>(); public CartFragment() {} @@ -419,6 +421,19 @@ public class CartFragment extends BaseFragment { } } ); + + if(!pizzapassCampaignProductList.isEmpty()){ + cartInfoModel.setPizzapassCampaignUsed( + isBasketContainsCampaignProduct( + pizzapassCampaignProductList)); + } + + if(!kebappassCampaignProductList.isEmpty()){ + cartInfoModel.setKebappassCampaignUsed( + isBasketContainsCampaignProduct( + kebappassCampaignProductList)); + } + } } @@ -670,6 +685,9 @@ public class CartFragment extends BaseFragment { if(response.isSuccessful() && response.body().getData() != null && response.body().isSuccess()) { + + pizzapassCampaignProductList.clear(); + pizzapassCampaignProductList.addAll(response.body().getData()); cartInfoModel.setPizzapassCampaignUsed(isBasketContainsCampaignProduct(response.body().getData())); if(!kebappassCampaignCategoryId.isEmpty()){ @@ -710,6 +728,9 @@ public class CartFragment extends BaseFragment { if(response.isSuccessful() && response.body().getData() != null && response.body().isSuccess()) { + + kebappassCampaignProductList.clear(); + kebappassCampaignProductList.addAll(response.body().getData()); cartInfoModel.setKebappassCampaignUsed(isBasketContainsCampaignProduct(response.body().getData())); openCreateOrderActivity(); }