update braintree sdk
This commit is contained in:
@@ -8,7 +8,7 @@ import android.view.View;
|
||||
import android.webkit.WebView;
|
||||
|
||||
import com.badoualy.stepperindicator.StepperIndicator;
|
||||
import com.braintreepayments.api.dropin.utils.PaymentMethodType;
|
||||
import com.braintreepayments.api.DropInPaymentMethod;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -16,17 +16,27 @@ import butterknife.BindView;
|
||||
import butterknife.ButterKnife;
|
||||
import ch.pizzalemon.android.R;
|
||||
import ch.pizzalemon.android.api.ApiConstants;
|
||||
import ch.pizzalemon.android.api.ApiEndPoints;
|
||||
import ch.pizzalemon.android.api.ApiErrorUtils;
|
||||
import ch.pizzalemon.android.api.ApiService;
|
||||
import ch.pizzalemon.android.api.ResponseObject;
|
||||
import ch.pizzalemon.android.fragment.createOrder.CreateOrderNoteFragment;
|
||||
import ch.pizzalemon.android.fragment.createOrder.CreateOrderResultFragment;
|
||||
import ch.pizzalemon.android.fragment.createOrder.CreateOrderSummaryFragment;
|
||||
import ch.pizzalemon.android.fragment.createOrder.PaymentMethodFragment;
|
||||
import ch.pizzalemon.android.fragment.createOrder.ShippingAddressFragment;
|
||||
import ch.pizzalemon.android.fragment.createOrder.ShippingMethodFragment;
|
||||
import ch.pizzalemon.android.helper.DialogHelper;
|
||||
import ch.pizzalemon.android.helper.SessionHelper;
|
||||
import ch.pizzalemon.android.helper.SharedPrefsHelper;
|
||||
import ch.pizzalemon.android.model.AddressModel;
|
||||
import ch.pizzalemon.android.model.PaymentMethodModel;
|
||||
import ch.pizzalemon.android.model.PaymentTokenModel;
|
||||
import ch.pizzalemon.android.model.ShippingMethodModel;
|
||||
import ch.pizzalemon.android.model.cart.CartInfoModel;
|
||||
import retrofit2.Call;
|
||||
import retrofit2.Callback;
|
||||
import retrofit2.Response;
|
||||
|
||||
public class CreateOrderActivity extends BaseActivity {
|
||||
|
||||
@@ -46,6 +56,8 @@ public class CreateOrderActivity extends BaseActivity {
|
||||
private String couponCode;
|
||||
private ArrayList<PaymentMethodModel> paymentMethodList = new ArrayList<>();
|
||||
|
||||
private PaymentTokenModel paymentTokenModel = null;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
@@ -105,7 +117,7 @@ public class CreateOrderActivity extends BaseActivity {
|
||||
break;
|
||||
case 4:
|
||||
fragmentManager.beginTransaction().replace(R.id.orderFragmentsContainer,
|
||||
CreateOrderSummaryFragment.newInstance()).commit();
|
||||
CreateOrderSummaryFragment.newInstance(paymentTokenModel)).commit();
|
||||
break;
|
||||
|
||||
case 5:
|
||||
@@ -128,7 +140,7 @@ public class CreateOrderActivity extends BaseActivity {
|
||||
openFragment(3);
|
||||
break;
|
||||
case CreateOrderNoteFragment.FRAGMENT_NAME:
|
||||
openFragment(4);
|
||||
createBraintreePaymentTokenAndOpenSummaryFragment();
|
||||
break;
|
||||
case CreateOrderSummaryFragment.FRAGMENT_NAME:
|
||||
openFragment(5);
|
||||
@@ -212,13 +224,13 @@ public class CreateOrderActivity extends BaseActivity {
|
||||
this.selectedPaymentMethod = selectedPaymentMethod;
|
||||
}
|
||||
|
||||
public void setSelectedPaymentMethodForBraintree(PaymentMethodType paymentMethodType){
|
||||
public void setSelectedPaymentMethodForBraintree(DropInPaymentMethod paymentMethodType){
|
||||
String paymentMethodCode = "";
|
||||
switch (paymentMethodType){
|
||||
case PAYPAL:
|
||||
paymentMethodCode = ApiConstants.PAYMENT_METHOD_CODE_PAYPAL;
|
||||
break;
|
||||
case GOOGLE_PAYMENT:
|
||||
case GOOGLE_PAY:
|
||||
paymentMethodCode = ApiConstants.PAYMENT_METHOD_CODE_ANDROID_PAY;
|
||||
break;
|
||||
default:
|
||||
@@ -250,6 +262,33 @@ public class CreateOrderActivity extends BaseActivity {
|
||||
}
|
||||
}
|
||||
|
||||
private void createBraintreePaymentTokenAndOpenSummaryFragment(){
|
||||
DialogHelper.showLoadingDialog();
|
||||
Call<ResponseObject<PaymentTokenModel>> call = ApiService.apiInterface.createBraintreePaymentToken(
|
||||
"/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_CREATE_BRAINTREE_PAYMENT_TOKEN + SessionHelper.getCustomerToken().getToken());
|
||||
|
||||
call.enqueue(new Callback<ResponseObject<PaymentTokenModel>>() {
|
||||
@Override
|
||||
public void onResponse(Call<ResponseObject<PaymentTokenModel>> call, Response<ResponseObject<PaymentTokenModel>> response) {
|
||||
if(response.isSuccessful() &&
|
||||
response.body().getData() != null &&
|
||||
response.body().isSuccess() &&
|
||||
response.body().getData().getToken() != null){
|
||||
paymentTokenModel = response.body().getData();
|
||||
openFragment(4);
|
||||
}
|
||||
else {
|
||||
ApiErrorUtils.parseError(response);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(Call<ResponseObject<PaymentTokenModel>> call, Throwable t) {
|
||||
DialogHelper.showFailedDialog();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/*
|
||||
@Override
|
||||
public void onBackPressed() {
|
||||
|
||||
Reference in New Issue
Block a user