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

campaign oroduct delete fixx

Browse Source
This commit is contained in:
mustafa içmen
2020-06-30 09:53:24 +03:00
parent 5bb5c8ee47
commit 6e5f8496c4
3 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

40
.idea/jarRepositories.xml generated Normal file
View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven2" />
<option name="name" value="maven2" />
<option name="url" value="https://maven.google.com" />
</remote-repository>
<remote-repository>
<option name="id" value="BintrayJCenter" />
<option name="name" value="BintrayJCenter" />
<option name="url" value="https://jcenter.bintray.com/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven" />
<option name="name" value="maven" />
<option name="url" value="https://jitpack.io" />
</remote-repository>
<remote-repository>
<option name="id" value="Google" />
<option name="name" value="Google" />
<option name="url" value="https://dl.google.com/dl/android/maven2/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven3" />
<option name="name" value="maven3" />
<option name="url" value="https://maven.fabric.io/public" />
</remote-repository>
</component>
</project>

21
app/src/main/java/ch/pizzacucina/android/fragment/CartFragment.java
View File

@@ -89,6 +89,8 @@ public class CartFragment extends BaseFragment {
private CartInfoModel cartInfoModel; private CartInfoModel cartInfoModel;
private ArrayList<CartProductModel> cartProductList = new ArrayList<>(); private ArrayList<CartProductModel> cartProductList = new ArrayList<>();
private CartRecyclerAdapter cartRecyclerAdapter; private CartRecyclerAdapter cartRecyclerAdapter;
private ArrayList<MenuProductModel> pizzapassCampaignProductList = new ArrayList<>();
private ArrayList<MenuProductModel> kebappassCampaignProductList = new ArrayList<>();
public CartFragment() {} 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() && if(response.isSuccessful() &&
response.body().getData() != null && response.body().getData() != null &&
response.body().isSuccess()) { response.body().isSuccess()) {
pizzapassCampaignProductList.clear();
pizzapassCampaignProductList.addAll(response.body().getData());
cartInfoModel.setPizzapassCampaignUsed(isBasketContainsCampaignProduct(response.body().getData())); cartInfoModel.setPizzapassCampaignUsed(isBasketContainsCampaignProduct(response.body().getData()));
if(!kebappassCampaignCategoryId.isEmpty()){ if(!kebappassCampaignCategoryId.isEmpty()){
@@ -710,6 +728,9 @@ public class CartFragment extends BaseFragment {
if(response.isSuccessful() && if(response.isSuccessful() &&
response.body().getData() != null && response.body().getData() != null &&
response.body().isSuccess()) { response.body().isSuccess()) {
kebappassCampaignProductList.clear();
kebappassCampaignProductList.addAll(response.body().getData());
cartInfoModel.setKebappassCampaignUsed(isBasketContainsCampaignProduct(response.body().getData())); cartInfoModel.setKebappassCampaignUsed(isBasketContainsCampaignProduct(response.body().getData()));
openCreateOrderActivity(); openCreateOrderActivity();
} }