diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 8c0460f..6603b9a 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
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();
}