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

beta bug fixes 2

Browse Source
This commit is contained in:
cimenmus
2017-10-28 18:47:33 +03:00
parent 5d5b9c5af7
commit 6491c37fc9
18 changed files with 431 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/ch/pizzalink/android/activity/CreateOrderActivity.java
View File

@@ -9,6 +9,7 @@ import com.badoualy.stepperindicator.StepperIndicator;
import butterknife.BindView;
import butterknife.ButterKnife;
import ch.pizzalink.android.R;
import ch.pizzalink.android.fragment.createOrder.CreateOrderNoteFragment;
import ch.pizzalink.android.fragment.createOrder.CreateOrderResultFragment;
import ch.pizzalink.android.fragment.createOrder.CreateOrderSummaryFragment;
import ch.pizzalink.android.fragment.createOrder.PaymentMethodFragment;
@@ -30,6 +31,7 @@ public class CreateOrderActivity extends BaseActivity {
private ShippingMethodModel selectedShippingMethod;
private AddressModel selectedShippingAddress;
private PaymentMethodModel selectedPaymentMethod;
private String orderNote;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -57,9 +59,9 @@ public class CreateOrderActivity extends BaseActivity {
private void initStepIndicator(){
/*
5 fragment var, ama sonuncu step'te tik göstersin diye step sayısını, fragment sayısı - 1 yaptık
6 fragment var, ama sonuncu step'te tik göstersin diye step sayısını, fragment sayısı - 1 yaptık
*/
stepperIndicator.setStepCount(4);
stepperIndicator.setStepCount(5);
/*
stepperIndicator.addOnStepClickListener(new StepperIndicator.OnStepClickListener() {
@Override
@@ -86,9 +88,14 @@ public class CreateOrderActivity extends BaseActivity {
break;
case 3:
fragmentManager.beginTransaction().replace(R.id.orderFragmentsContainer,
CreateOrderSummaryFragment.newInstance()).commit();
CreateOrderNoteFragment.newInstance()).commit();
break;
case 4:
fragmentManager.beginTransaction().replace(R.id.orderFragmentsContainer,
CreateOrderSummaryFragment.newInstance()).commit();
break;
case 5:
fragmentManager.beginTransaction().replace(R.id.orderFragmentsContainer,
CreateOrderResultFragment.newInstance()).commit();
break;
@@ -107,9 +114,12 @@ public class CreateOrderActivity extends BaseActivity {
case PaymentMethodFragment.FRAGMENT_NAME:
openFragment(3);
break;
case CreateOrderSummaryFragment.FRAGMENT_NAME:
case CreateOrderNoteFragment.FRAGMENT_NAME:
openFragment(4);
break;
case CreateOrderSummaryFragment.FRAGMENT_NAME:
openFragment(5);
break;
case CreateOrderResultFragment.FRAGMENT_NAME:
Intent mainActivityIntent = new Intent(this, MainActivity.class);
mainActivityIntent.putExtra("isStartWithOrderHistory", true);
@@ -128,9 +138,12 @@ public class CreateOrderActivity extends BaseActivity {
case PaymentMethodFragment.FRAGMENT_NAME:
openFragment(1);
break;
case CreateOrderSummaryFragment.FRAGMENT_NAME:
case CreateOrderNoteFragment.FRAGMENT_NAME:
openFragment(2);
break;
case CreateOrderSummaryFragment.FRAGMENT_NAME:
openFragment(3);
break;
}
}
@@ -161,4 +174,14 @@ public class CreateOrderActivity extends BaseActivity {
public void setSelectedPaymentMethod(PaymentMethodModel selectedPaymentMethod){
this.selectedPaymentMethod = selectedPaymentMethod;
}
public String getOrderNote(){
if(orderNote == null)
orderNote = "";
return orderNote;
}
public void setOrderNote(String orderNote){
this.orderNote = orderNote;
}
}