From 5079fd81297967551ed4641bd19b566fa326cee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Wed, 4 Nov 2020 10:24:52 +0300 Subject: [PATCH] kebappas removed --- .idea/caches/build_file_checksums.ser | Bin 542 -> 542 bytes .idea/compiler.xml | 3 + .idea/gradle.xml | 1 + .idea/modules.xml | 8 +- .../CampaignProductDetailsActivity.java | 3 +- .../activity/CampaignProductListActivity.java | 1 - .../android/activity/CreateOrderActivity.java | 5 +- .../activity/OrderHistoryDetailsActivity.java | 1 - .../pizzacucina/android/api/ApiConstants.java | 1 - .../pizzacucina/android/api/ApiEndPoints.java | 1 - .../pizzacucina/android/api/ApiInterface.java | 4 - .../android/fragment/CartFragment.java | 166 +----------------- .../fragment/OrderHistoryFragment.java | 1 - .../android/fragment/ProfileFragment.java | 6 - .../CreateOrderSummaryFragment.java | 2 - .../pizzacucina/android/model/UserModel.java | 12 -- .../android/model/cart/CartInfoModel.java | 9 - app/src/main/res/layout/fragment_profile.xml | 12 -- 18 files changed, 16 insertions(+), 220 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 0b531878ed3eb370d356ea3ab8077fa181390660..72adf01bfeaedbaa4ba85d705376833ed5a398e2 100644 GIT binary patch delta 16 YcmbQoGLL1#bkpw{_S=f=QJ?_05`1$sQ>@~ diff --git a/.idea/compiler.xml b/.idea/compiler.xml index a1757ae..442537a 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -4,5 +4,8 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 674414f..41871c2 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -15,6 +15,7 @@ diff --git a/.idea/modules.xml b/.idea/modules.xml index bfcd64e..9e7e9c8 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,12 +2,8 @@ - - - - - - + + \ No newline at end of file diff --git a/app/src/main/java/ch/pizzacucina/android/activity/CampaignProductDetailsActivity.java b/app/src/main/java/ch/pizzacucina/android/activity/CampaignProductDetailsActivity.java index 9614e33..f68d7fe 100644 --- a/app/src/main/java/ch/pizzacucina/android/activity/CampaignProductDetailsActivity.java +++ b/app/src/main/java/ch/pizzacucina/android/activity/CampaignProductDetailsActivity.java @@ -97,8 +97,7 @@ public class CampaignProductDetailsActivity extends BaseActivity { if(SessionHelper.isCustomerLoggedIn()){ addProductToCart(); /* - if((campaignModel.getCode().equals(ApiConstants.CAMPAIGN_CODE_PIZZAPASS) && SessionHelper.isUserUsedPizzapassCampaign()) || - (campaignModel.getCode().equals(ApiConstants.CAMPAIGN_CODE_KEBAPPASS) && SessionHelper.isUserUsedKebappassCampaign())){ + if((campaignModel.getCode().equals(ApiConstants.CAMPAIGN_CODE_PIZZAPASS) && SessionHelper.isUserUsedPizzapassCampaign()){ DialogHelper.showAlertDialog(BaseActivity.currentActivity, cannotUseCampaignText); } else { diff --git a/app/src/main/java/ch/pizzacucina/android/activity/CampaignProductListActivity.java b/app/src/main/java/ch/pizzacucina/android/activity/CampaignProductListActivity.java index e0d33f7..39c46db 100644 --- a/app/src/main/java/ch/pizzacucina/android/activity/CampaignProductListActivity.java +++ b/app/src/main/java/ch/pizzacucina/android/activity/CampaignProductListActivity.java @@ -80,7 +80,6 @@ public class CampaignProductListActivity extends BaseActivity { productPropertiesIntent.putExtra("menuProductModel", menuProductList.get(position)); productPropertiesIntent.putExtra("campaignModel", campaignModel); //productPropertiesIntent.putExtra("isFromPizzapassCampaign", categoryModel.isPizzapassCampaign()); - //productPropertiesIntent.putExtra("isFromKebappassCampaign", categoryModel.isKebappassCampaign()); startActivityForResult(productPropertiesIntent, REQUEST_CODE_CAMPAIGN_PRODUCT_PROPERTIES); } }); diff --git a/app/src/main/java/ch/pizzacucina/android/activity/CreateOrderActivity.java b/app/src/main/java/ch/pizzacucina/android/activity/CreateOrderActivity.java index a603e66..12e540a 100644 --- a/app/src/main/java/ch/pizzacucina/android/activity/CreateOrderActivity.java +++ b/app/src/main/java/ch/pizzacucina/android/activity/CreateOrderActivity.java @@ -171,15 +171,14 @@ public class CreateOrderActivity extends BaseActivity { */ /** - * eğer kampanya kullanıldıysa cartInfoModel de isPizzapassCampaignUsed ve isKebappassCampaignUsed + * eğer kampanya kullanıldıysa cartInfoModel de isPizzapassCampaignUsed * alanalrını true olarak set ediyoruz. create order ekranlarında herhangi bir yerde sepet sorgusu yapınca - * buradaki cartInfoModel i de güncelliyoruz. fakat isPizzapassCampaignUsed ve isKebappassCampaignUsed alanları + * buradaki cartInfoModel i de güncelliyoruz. fakat isPizzapassCampaignUsed alanları * servisten gelmeyen değerler, bizim loaklde tuttuğumuz değişkenler. bu sebeple bu alanlar servisten hep false geliyor, * buradakinde true olsa bile değişkeni guncellediğimiz için bu alanlar kayboluyor. bunu engellemek için bu metodu yazdım. */ public void setCartInfoSafeForCampaigns(CartInfoModel cartInfoModel) { cartInfoModel.setPizzapassCampaignUsed(this.cartInfoModel.isPizzapassCampaignUsed()); - cartInfoModel.setKebappassCampaignUsed(this.cartInfoModel.isKebappassCampaignUsed()); this.cartInfoModel = cartInfoModel; } diff --git a/app/src/main/java/ch/pizzacucina/android/activity/OrderHistoryDetailsActivity.java b/app/src/main/java/ch/pizzacucina/android/activity/OrderHistoryDetailsActivity.java index bce20ec..0d106f8 100644 --- a/app/src/main/java/ch/pizzacucina/android/activity/OrderHistoryDetailsActivity.java +++ b/app/src/main/java/ch/pizzacucina/android/activity/OrderHistoryDetailsActivity.java @@ -209,7 +209,6 @@ public class OrderHistoryDetailsActivity extends BaseActivity { SharedPrefsHelper.setCartItemCount(0); SharedPrefsHelper.setCartTotalPrice("0"); SharedPrefsHelper.setUserUsedPizzapassCampaign(false); - SharedPrefsHelper.setUserUsedKebappassCampaign(false); MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity; mainActivity.setCartItemCount(); */ diff --git a/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java b/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java index 7784691..b9b6889 100644 --- a/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java @@ -13,7 +13,6 @@ public class ApiConstants { public static final int PRODUCT_ID_VERSION_MENU = -111; public static final String CAMPAIGN_CODE_PIZZAPASS = "PIZZAPASS"; - public static final String CAMPAIGN_CODE_KEBAPPASS = "KEBAPPASS"; public static final String PAYMENT_METHOD_CODE_CREDIT_DEBIT_CARD = "braintree"; // Credit / Debit Card public static final String PAYMENT_METHOD_CODE_BANK_CASH = "cod"; // Bar diff --git a/app/src/main/java/ch/pizzacucina/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzacucina/android/api/ApiEndPoints.java index 8b3394e..e187105 100644 --- a/app/src/main/java/ch/pizzacucina/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ApiEndPoints.java @@ -31,7 +31,6 @@ public class ApiEndPoints { public static final String API_GET_CUSTOMER_PROFILE = PREFIX + "getCustomerInfo" + SUFFIX; public static final String API_GET_STORE_INFO = PREFIX + "getStoreInfo" + SUFFIX; public static final String API_CHECK_CAMPAIGN_PIZZAPASS = PREFIX + "detectPizzaPassCampaign" + SUFFIX + "&token="; - public static final String API_CHECK_CAMPAIGN_KEBAPPASS = PREFIX + "detectKebapPassCampaign" + SUFFIX + "&token="; public static final String API_CHECK_DELIVERY_TIME = PREFIX + "checkDeliveryTimeService" + SUFFIX; public static final String API_GET_DELIVERY_TIME_OF_STORE = PREFIX + "getDeliveryTimeForStore" + SUFFIX; diff --git a/app/src/main/java/ch/pizzacucina/android/api/ApiInterface.java b/app/src/main/java/ch/pizzacucina/android/api/ApiInterface.java index 20dfcb5..2ef2148 100644 --- a/app/src/main/java/ch/pizzacucina/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzacucina/android/api/ApiInterface.java @@ -208,10 +208,6 @@ public interface ApiInterface { Call> checkPizzapassCampaign(@Path("storeName") String storeName, @Query("token") String token); - @GET("{storeName}" + ApiEndPoints.API_CHECK_CAMPAIGN_KEBAPPASS) - Call> checkKebapPassCampaign(@Path("storeName") String storeName, - @Query("token") String token); - @GET("{storeName}" + ApiEndPoints.API_CHECK_DELIVERY_TIME) Call> checkDeliveryTime(@Path("storeName") String storeName, @Query("shipping_method_code") String shippingMethodCode); 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 71ab75e..f2ef46a 100644 --- a/app/src/main/java/ch/pizzacucina/android/fragment/CartFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/CartFragment.java @@ -84,13 +84,11 @@ public class CartFragment extends BaseFragment { public static final java.lang.String FRAGMENT_NAME = "cartFragment"; private int REQUEST_CODE_CAMPAIGN_PRODUCT_LIST = 7847; private String pizzapassCampaignCategoryId = ""; - private String kebappassCampaignCategoryId = ""; private CartInfoModel cartInfoModel; private ArrayList cartProductList = new ArrayList<>(); private CartRecyclerAdapter cartRecyclerAdapter; private ArrayList pizzapassCampaignProductList = new ArrayList<>(); - private ArrayList kebappassCampaignProductList = new ArrayList<>(); public CartFragment() {} @@ -151,9 +149,6 @@ public class CartFragment extends BaseFragment { if(!pizzapassCampaignCategoryId.isEmpty()){ getCampaignProductsForPizzapassOnContinueButtonClicked(); } - else if(!kebappassCampaignCategoryId.isEmpty()){ - getCampaignProductsForKebappassOnContinueButtonClicked(); - } else { openCreateOrderActivity(); } @@ -169,9 +164,6 @@ public class CartFragment extends BaseFragment { if(!pizzapassCampaignCategoryId.isEmpty()){ getCampaignProductsForPizzapassOnContinueButtonClicked(); } - else if(!kebappassCampaignCategoryId.isEmpty()){ - getCampaignProductsForKebappassOnContinueButtonClicked(); - } else { openCreateOrderActivity(); } @@ -424,12 +416,6 @@ public class CartFragment extends BaseFragment { pizzapassCampaignProductList)); } - if(!kebappassCampaignProductList.isEmpty()){ - cartInfoModel.setKebappassCampaignUsed( - isBasketContainsCampaignProduct( - kebappassCampaignProductList)); - } - } } @@ -490,27 +476,23 @@ public class CartFragment extends BaseFragment { .enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { + DialogHelper.hideLoadingDialog(); if(response.isSuccessful() && response.body() != null){ if(response.body().isSuccess()){ if(response.body().getData() == null){ - DialogHelper.hideLoadingDialog(); DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText); } else { pizzapassCampaignCategoryId = response.body().getData().getCategoryId(); - getCampaignProducts(response.body().getData(), true); + getCampaignProducts(response.body().getData()); } } - else { - checkKebappassCampaign(); - } } else{ - DialogHelper.hideLoadingDialog(); ApiErrorUtils.parseError(response); } } @@ -540,128 +522,34 @@ public class CartFragment extends BaseFragment { new MaterialDialog.SingleButtonCallback() { @Override public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { - DialogHelper.showLoadingDialog(); - checkKebappassCampaign(); } }, false ); } - private void checkKebappassCampaign(){ - ApiService - .apiInterface - .checkKebapPassCampaign( - SessionHelper.getSelectedStore().getStoreName(), - SessionHelper.getCustomerToken().getToken()) - .enqueue(new Callback>() { - @Override - public void onResponse(Call> call, Response> response) { - DialogHelper.hideLoadingDialog(); - if(response.isSuccessful() && - response.body() != null){ - - if(response.body().isSuccess()){ - - if(response.body().getData() == null){ - DialogHelper.hideLoadingDialog(); - DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText); - } - else { - kebappassCampaignCategoryId = response.body().getData().getCategoryId(); - getCampaignProducts(response.body().getData(), false); - } - } - - /* - if(response.body().isSuccess() && !SessionHelper.isUserUsedKebappassCampaign()){ - if(response.body().getData() == null){ - DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText); - } - else { - response.body().getData().checkNull(); - showKebappassCampaignDialog(response.body().getData()); - } - } - */ - - } - else{ - ApiErrorUtils.parseError(response); - } - } - - @Override - public void onFailure(Call> call, Throwable t) { - DialogHelper.hideLoadingDialog(); - DialogHelper.showFailedDialog(); - } - }); - } - - private void showKebappassCampaignDialog(final CampaignModel campaignModel){ - DialogHelper.showTwoButtonsDialog( - campaignModel.getName(), - campaignModel.getDescription(), - R.string.accept_campaign, - new MaterialDialog.SingleButtonCallback() { - @Override - public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { - Intent campaignIntent = new Intent(BaseActivity.currentActivity, CampaignProductListActivity.class); - campaignIntent.putExtra("campaignModel", campaignModel); - startActivityForResult(campaignIntent, REQUEST_CODE_CAMPAIGN_PRODUCT_LIST); - } - }, - R.string.decline_campaign, - new MaterialDialog.SingleButtonCallback() { - @Override - public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { - - } - }, - false - ); - } - - private void getCampaignProducts(final CampaignModel campaignModel, final boolean isForPizzapass){ + private void getCampaignProducts(final CampaignModel campaignModel){ Call> call = ApiService.apiInterface.getProductsByCategory( SessionHelper.getSelectedStore().getStoreName(), campaignModel.getCategoryId()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { - + DialogHelper.hideLoadingDialog(); if(response.isSuccessful() && response.body().getData() != null && response.body().isSuccess()) { - - if(isBasketContainsCampaignProduct(response.body().getData())){ - if(isForPizzapass){ - checkKebappassCampaign(); - } - else { - DialogHelper.hideLoadingDialog(); - } - } - else { - DialogHelper.hideLoadingDialog(); - if(isForPizzapass){ - showPizzapassCampaignDialog(campaignModel); - } - else { - showKebappassCampaignDialog(campaignModel); - } + if(!isBasketContainsCampaignProduct(response.body().getData())){ + showPizzapassCampaignDialog(campaignModel); } } else { - DialogHelper.hideLoadingDialog(); ApiErrorUtils.parseError(response); } } @Override public void onFailure(Call> call, Throwable t) { - DialogHelper.hideLoadingDialog(); DialogHelper.showFailedDialog(); } }); @@ -686,51 +574,11 @@ public class CartFragment extends BaseFragment { pizzapassCampaignProductList.addAll(response.body().getData()); cartInfoModel.setPizzapassCampaignUsed(isBasketContainsCampaignProduct(response.body().getData())); - if(!kebappassCampaignCategoryId.isEmpty()){ - getCampaignProductsForKebappassOnContinueButtonClicked(); - } - else { - DialogHelper.hideLoadingDialog(); - openCreateOrderActivity(); - } - } - else { DialogHelper.hideLoadingDialog(); - ApiErrorUtils.parseError(response); - } - } - - @Override - public void onFailure(Call> call, Throwable t) { - DialogHelper.hideLoadingDialog(); - DialogHelper.showFailedDialog(); - } - }); - } - - private void getCampaignProductsForKebappassOnContinueButtonClicked(){ - - DialogHelper.showLoadingDialog(); - - Call> call = ApiService.apiInterface.getProductsByCategory( - SessionHelper.getSelectedStore().getStoreName(), - kebappassCampaignCategoryId); - call.enqueue(new Callback>() { - @Override - public void onResponse(Call> call, Response> response) { - - DialogHelper.hideLoadingDialog(); - - if(response.isSuccessful() && - response.body().getData() != null && - response.body().isSuccess()) { - - kebappassCampaignProductList.clear(); - kebappassCampaignProductList.addAll(response.body().getData()); - cartInfoModel.setKebappassCampaignUsed(isBasketContainsCampaignProduct(response.body().getData())); openCreateOrderActivity(); } else { + DialogHelper.hideLoadingDialog(); ApiErrorUtils.parseError(response); } } diff --git a/app/src/main/java/ch/pizzacucina/android/fragment/OrderHistoryFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/OrderHistoryFragment.java index 654bd8a..29faf3b 100644 --- a/app/src/main/java/ch/pizzacucina/android/fragment/OrderHistoryFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/OrderHistoryFragment.java @@ -170,7 +170,6 @@ public class OrderHistoryFragment extends BaseFragment { SharedPrefsHelper.setCartItemCount(0); SharedPrefsHelper.setCartTotalPrice("0"); SharedPrefsHelper.setUserUsedPizzapassCampaign(false); - SharedPrefsHelper.setUserUsedKebappassCampaign(false); MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity; mainActivity.setCartItemCount(); */ diff --git a/app/src/main/java/ch/pizzacucina/android/fragment/ProfileFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/ProfileFragment.java index bcab97c..4015bdf 100644 --- a/app/src/main/java/ch/pizzacucina/android/fragment/ProfileFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/ProfileFragment.java @@ -56,8 +56,6 @@ import static android.app.Activity.RESULT_OK; public class ProfileFragment extends BaseFragment { - @BindView(R.id.pizzapassCountPizzalinkInfoLayout) AppInfoView pizzapassCountPizzalinkInfoLayout; - @BindView(R.id.kebappassCountPizzalinkInfoLayout) AppInfoView kebappassCountPizzalinkInfoLayout; @BindView(R.id.firstnamePizzalinkInfoLayout) AppInfoView firstnamePizzalinkInfoLayout; @BindView(R.id.lastnamePizzalinkInfoLayout) AppInfoView lastnamePizzalinkInfoLayout; @BindView(R.id.emailPizzalinkInfoLayout) AppInfoView emailPizzalinkInfoLayout; @@ -140,8 +138,6 @@ public class ProfileFragment extends BaseFragment { if(requestCode == REQUEST_CODE_UPDATE_PROFILE && resultCode == RESULT_OK){ userModel = SessionHelper.getUser(); - pizzapassCountPizzalinkInfoLayout.setText(userModel.getPizzapassCount()); - kebappassCountPizzalinkInfoLayout.setText(userModel.getKebappassCount()); firstnamePizzalinkInfoLayout.setText(userModel.getFirstname()); lastnamePizzalinkInfoLayout.setText(userModel.getLastname()); emailPizzalinkInfoLayout.setText(userModel.getEmail()); @@ -290,8 +286,6 @@ public class ProfileFragment extends BaseFragment { userModel = user; SessionHelper.saveCustomer(userModel); - pizzapassCountPizzalinkInfoLayout.setText(userModel.getPizzapassCount()); - kebappassCountPizzalinkInfoLayout.setText(userModel.getKebappassCount()); firstnamePizzalinkInfoLayout.setText(userModel.getFirstname()); lastnamePizzalinkInfoLayout.setText(userModel.getLastname()); emailPizzalinkInfoLayout.setText(userModel.getEmail()); diff --git a/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java index 0ee4a89..36ecff4 100644 --- a/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -217,7 +217,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { params.put("payment_method_code", createOrderActivity.getSelectedPaymentMethod().getCode()); params.put("comment", createOrderNote()); params.put("is_pizza_pass_campaign", createOrderActivity.getCartInfo().isPizzapassCampaignUsed()); - params.put("is_kebap_pass_campaign", createOrderActivity.getCartInfo().isKebappassCampaignUsed()); params.put("application_id", ApiConstants.APP_TYPE_ID_ANDROID); SessionHelper.addCouponCodeToRequestParamsIfNeeded(params); if(dateOfOrderString != null && !dateOfOrderString.isEmpty() && @@ -714,7 +713,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { params.put("payment_method_code", createOrderActivity.getSelectedPaymentMethod().getCode()); params.put("comment", createOrderNote()); params.put("is_pizza_pass_campaign", createOrderActivity.getCartInfo().isPizzapassCampaignUsed()); - params.put("is_kebap_pass_campaign", createOrderActivity.getCartInfo().isKebappassCampaignUsed()); params.put("application_id", ApiConstants.APP_TYPE_ID_ANDROID); if(paymentMethodNonce != null){ params.put("payment_method_nonce", paymentMethodNonce); diff --git a/app/src/main/java/ch/pizzacucina/android/model/UserModel.java b/app/src/main/java/ch/pizzacucina/android/model/UserModel.java index bbd1f85..ee04be1 100644 --- a/app/src/main/java/ch/pizzacucina/android/model/UserModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/UserModel.java @@ -14,7 +14,6 @@ public class UserModel implements Serializable{ @Expose @SerializedName("customer_id") private String id; @Expose @SerializedName("address_id") private String addressId; @Expose @SerializedName("pizza_pass_count") private String pizzapassCount; - @Expose @SerializedName("kebab_pass_count") private String kebappassCount; private String firstname; private String lastname; private String email; @@ -44,9 +43,6 @@ public class UserModel implements Serializable{ if(pizzapassCount == null) pizzapassCount = "0"; - if(kebappassCount == null) - kebappassCount = "0"; - if(token != null) token.checkNull(); } @@ -118,12 +114,4 @@ public class UserModel implements Serializable{ public void setPizzapassCount(String pizzapassCount) { this.pizzapassCount = pizzapassCount; } - - public String getKebappassCount() { - return kebappassCount; - } - - public void setKebappassCount(String kebappassCount) { - this.kebappassCount = kebappassCount; - } } diff --git a/app/src/main/java/ch/pizzacucina/android/model/cart/CartInfoModel.java b/app/src/main/java/ch/pizzacucina/android/model/cart/CartInfoModel.java index 0d1d722..258603b 100644 --- a/app/src/main/java/ch/pizzacucina/android/model/cart/CartInfoModel.java +++ b/app/src/main/java/ch/pizzacucina/android/model/cart/CartInfoModel.java @@ -14,7 +14,6 @@ public class CartInfoModel implements Serializable { private ArrayList products; private ArrayList totals; private boolean isPizzapassCampaignUsed; - private boolean isKebappassCampaignUsed; public ArrayList getProducts() { return products; @@ -70,12 +69,4 @@ public class CartInfoModel implements Serializable { public void setPizzapassCampaignUsed(boolean pizzapassCampaignUsed) { isPizzapassCampaignUsed = pizzapassCampaignUsed; } - - public boolean isKebappassCampaignUsed() { - return isKebappassCampaignUsed; - } - - public void setKebappassCampaignUsed(boolean kebappassCampaignUsed) { - isKebappassCampaignUsed = kebappassCampaignUsed; - } } diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index 31a9bae..d0c2bd4 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -34,18 +34,6 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - -