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 e8de3e7..3cda500 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,7 +219,6 @@ public class CreateOrderActivity extends BaseActivity { this.orderNote = orderNote; } - /* public Boolean getSlicePizza() { return slicePizza; } @@ -228,8 +227,6 @@ 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 9c59698..ca16e07 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,7 +69,6 @@ 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); @@ -78,7 +77,6 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment { createOrderActivity.setSlicePizza(false); } } - */ createOrderActivity.setOrderNote(orderNoteAppEditText.getText()); createOrderActivity.onNextClicked(FRAGMENT_NAME); break; @@ -87,7 +85,6 @@ 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){ @@ -101,7 +98,6 @@ 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 01706a1..2673609 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,7 +574,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity; StringBuilder stringBuilder = new StringBuilder(); - /* if(isCartContainsAnyPizza()){ stringBuilder.append(slicePizzaForStoreText).append(" : "); if(createOrderActivity.getSlicePizza()){ @@ -585,7 +584,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { } stringBuilder.append("\n"); } - */ stringBuilder .append(createOrderActivity.getOrderNote())