diff --git a/app/src/main/java/ch/pizzapp/android/activity/CreateOrderActivity.java b/app/src/main/java/ch/pizzapp/android/activity/CreateOrderActivity.java index 3cda500..e8de3e7 100644 --- a/app/src/main/java/ch/pizzapp/android/activity/CreateOrderActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/CreateOrderActivity.java @@ -35,7 +35,7 @@ public class CreateOrderActivity extends BaseActivity { private ShippingMethodModel selectedShippingMethod; private AddressModel selectedShippingAddress; private PaymentMethodModel selectedPaymentMethod; - private Boolean slicePizza; + //private Boolean slicePizza; private String orderNote; private String discountAmount; private String couponCode; @@ -219,6 +219,7 @@ public class CreateOrderActivity extends BaseActivity { this.orderNote = orderNote; } + /* public Boolean getSlicePizza() { return slicePizza; } @@ -227,6 +228,8 @@ public class CreateOrderActivity extends BaseActivity { this.slicePizza = slicePizza; } + */ + public String getDiscountAmount() { return discountAmount; } diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java index ca16e07..9c59698 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java @@ -69,6 +69,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment { createOrderActivity.onPreviousClicked(FRAGMENT_NAME); break; case R.id.nextTextView: + /* if(isCartContainsAnyPizza(createOrderActivity.getCartInfo().getProducts())){ if(yesRadioButton.isChecked()){ createOrderActivity.setSlicePizza(true); @@ -77,6 +78,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment { createOrderActivity.setSlicePizza(false); } } + */ createOrderActivity.setOrderNote(orderNoteAppEditText.getText()); createOrderActivity.onNextClicked(FRAGMENT_NAME); break; @@ -85,6 +87,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment { private void initViews(){ createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity; + /* if(isCartContainsAnyPizza(createOrderActivity.getCartInfo().getProducts())){ slicePizzaLayout.setVisibility(View.VISIBLE); if(createOrderActivity.getSlicePizza() != null){ @@ -98,6 +101,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment { } } } + */ if(createOrderActivity.getOrderNote() != null){ orderNoteAppEditText.setText(createOrderActivity.getOrderNote()); } diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java index 2673609..01706a1 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -574,6 +574,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity; StringBuilder stringBuilder = new StringBuilder(); + /* if(isCartContainsAnyPizza()){ stringBuilder.append(slicePizzaForStoreText).append(" : "); if(createOrderActivity.getSlicePizza()){ @@ -584,6 +585,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { } stringBuilder.append("\n"); } + */ stringBuilder .append(createOrderActivity.getOrderNote())