diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java index e14a538..577236b 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -10,6 +10,7 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Toast; import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; @@ -547,10 +548,14 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment implemen createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TRANSFER){ createOrder(null); } - else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TWINT || - createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.POST_FINANCE_CARD) { + else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.POST_FINANCE_CARD) { DialogHelper.hideLoadingDialog(); - startDatatransPayment(); + Toast.makeText(BaseActivity.currentActivity, "Post Finance payment has not been implemented yet.", Toast.LENGTH_LONG).show(); + } + else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TWINT) { + DialogHelper.hideLoadingDialog(); + //startDatatransPayment(); + Toast.makeText(BaseActivity.currentActivity, "Twint payment has not been implemented yet.", Toast.LENGTH_LONG).show(); } else { DialogHelper.hideLoadingDialog(); @@ -770,7 +775,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment implemen cartTotalList.addAll(cartInfoModel.getTotalsList()); orderPriceRecyclerAdapter.notifyDataSetChanged(); createBraintreePaymentToken(); - getDatatransInitInfoModel(); + //getDatatransInitInfoModel(); } else { DialogHelper.hideLoadingDialog(); diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/PaymentMethodFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/PaymentMethodFragment.java index 6fc8a0d..e052ca3 100644 --- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/PaymentMethodFragment.java +++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/PaymentMethodFragment.java @@ -160,6 +160,12 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment { } } + for(PaymentMethodModel paymentMethodModel : paymentMethodModels){ + if(paymentMethodModel.getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TWINT){ + paymentMethodModels.remove(paymentMethodModel); + break; + } + } /* // dummy //