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

slice pizza activated

Browse Source
This commit is contained in:
cimenmus
2018-10-27 13:07:00 +03:00
parent 6baa8838e3
commit 1ee1719d5a
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/ch/pizzapp/android/activity/CreateOrderActivity.java
View File

@@ -35,7 +35,7 @@ public class CreateOrderActivity extends BaseActivity {
private ShippingMethodModel selectedShippingMethod; private ShippingMethodModel selectedShippingMethod;
private AddressModel selectedShippingAddress; private AddressModel selectedShippingAddress;
private PaymentMethodModel selectedPaymentMethod; private PaymentMethodModel selectedPaymentMethod;
//private Boolean slicePizza; private Boolean slicePizza;
private String orderNote; private String orderNote;
private String discountAmount; private String discountAmount;
private String couponCode; private String couponCode;
@@ -219,7 +219,6 @@ public class CreateOrderActivity extends BaseActivity {
this.orderNote = orderNote; this.orderNote = orderNote;
} }
/*
public Boolean getSlicePizza() { public Boolean getSlicePizza() {
return slicePizza; return slicePizza;
} }
@@ -228,8 +227,6 @@ public class CreateOrderActivity extends BaseActivity {
this.slicePizza = slicePizza; this.slicePizza = slicePizza;
} }
*/
public String getDiscountAmount() { public String getDiscountAmount() {
return discountAmount; return discountAmount;
} }

4
app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java
View File

@@ -69,7 +69,6 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment {
createOrderActivity.onPreviousClicked(FRAGMENT_NAME); createOrderActivity.onPreviousClicked(FRAGMENT_NAME);
break; break;
case R.id.nextTextView: case R.id.nextTextView:
/*
if(isCartContainsAnyPizza(createOrderActivity.getCartInfo().getProducts())){ if(isCartContainsAnyPizza(createOrderActivity.getCartInfo().getProducts())){
if(yesRadioButton.isChecked()){ if(yesRadioButton.isChecked()){
createOrderActivity.setSlicePizza(true); createOrderActivity.setSlicePizza(true);
@@ -78,7 +77,6 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment {
createOrderActivity.setSlicePizza(false); createOrderActivity.setSlicePizza(false);
} }
} }
*/
createOrderActivity.setOrderNote(orderNoteAppEditText.getText()); createOrderActivity.setOrderNote(orderNoteAppEditText.getText());
createOrderActivity.onNextClicked(FRAGMENT_NAME); createOrderActivity.onNextClicked(FRAGMENT_NAME);
break; break;
@@ -87,7 +85,6 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment {
private void initViews(){ private void initViews(){
createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity; createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
/*
if(isCartContainsAnyPizza(createOrderActivity.getCartInfo().getProducts())){ if(isCartContainsAnyPizza(createOrderActivity.getCartInfo().getProducts())){
slicePizzaLayout.setVisibility(View.VISIBLE); slicePizzaLayout.setVisibility(View.VISIBLE);
if(createOrderActivity.getSlicePizza() != null){ if(createOrderActivity.getSlicePizza() != null){
@@ -101,7 +98,6 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment {
} }
} }
} }
*/
if(createOrderActivity.getOrderNote() != null){ if(createOrderActivity.getOrderNote() != null){
orderNoteAppEditText.setText(createOrderActivity.getOrderNote()); orderNoteAppEditText.setText(createOrderActivity.getOrderNote());
} }

2
app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java
View File

@@ -574,7 +574,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity; CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
/*
if(isCartContainsAnyPizza()){ if(isCartContainsAnyPizza()){
stringBuilder.append(slicePizzaForStoreText).append(" : "); stringBuilder.append(slicePizzaForStoreText).append(" : ");
if(createOrderActivity.getSlicePizza()){ if(createOrderActivity.getSlicePizza()){
@@ -585,7 +584,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
} }
stringBuilder.append("\n"); stringBuilder.append("\n");
} }
*/
stringBuilder stringBuilder
.append(createOrderActivity.getOrderNote()) .append(createOrderActivity.getOrderNote())