diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4f619e5..d979564 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -62,9 +62,6 @@ - diff --git a/app/src/main/java/ch/pizzapp/android/activity/PaymentActivity.java b/app/src/main/java/ch/pizzapp/android/activity/PaymentActivity.java deleted file mode 100644 index 4bb447f..0000000 --- a/app/src/main/java/ch/pizzapp/android/activity/PaymentActivity.java +++ /dev/null @@ -1,118 +0,0 @@ -package ch.pizzapp.android.activity; - -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; - -import com.braintreepayments.api.BraintreeFragment; -import com.braintreepayments.api.Card; -import com.braintreepayments.api.PayPal; -import com.braintreepayments.api.exceptions.BraintreeError; -import com.braintreepayments.api.exceptions.ErrorWithResponse; -import com.braintreepayments.api.exceptions.InvalidArgumentException; -import com.braintreepayments.api.interfaces.BraintreeCancelListener; -import com.braintreepayments.api.interfaces.BraintreeErrorListener; -import com.braintreepayments.api.interfaces.ConfigurationListener; -import com.braintreepayments.api.interfaces.PaymentMethodNonceCallback; -import com.braintreepayments.api.interfaces.PaymentMethodNonceCreatedListener; -import com.braintreepayments.api.interfaces.PaymentMethodNoncesUpdatedListener; -import com.braintreepayments.api.models.CardBuilder; -import com.braintreepayments.api.models.Configuration; -import com.braintreepayments.api.models.PayPalRequest; -import com.braintreepayments.api.models.PaymentMethodNonce; - - -import java.util.List; - -import butterknife.ButterKnife; -import ch.pizzapp.android.R; -import ch.pizzapp.android.api.ApiConstants; -import ch.pizzapp.android.helper.DialogHelper; - -public class PaymentActivity extends BaseActivity - implements PaymentMethodNonceCreatedListener, - PaymentMethodNoncesUpdatedListener, ConfigurationListener, - BraintreeCancelListener, PaymentMethodNonceCallback, - BraintreeErrorListener { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_payment); - ButterKnife.bind(this); - showBraintreePaymentFragment(); - } - - @Override - public void onPaymentMethodNonceCreated(PaymentMethodNonce paymentMethodNonce) { - // Send this nonce to your server - String nonce = paymentMethodNonce.getNonce(); - } - - @Override - public void onConfigurationFetched(Configuration configuration) { - - } - - @Override - public void onPaymentMethodNoncesUpdated(List paymentMethodNonces) { - - } - - @Override - public void onCancel(int requestCode) { - // Use this to handle a canceled activity, if the given requestCode is important. - // You may want to use this callback to hide loading indicators, and prepare your UI for input - } - - @Override - public void success(PaymentMethodNonce paymentMethodNonce) { - - } - - @Override - public void failure(Exception exception) { - - } - - @Override - public void onError(Exception error) { - if (error instanceof ErrorWithResponse) { - ErrorWithResponse errorWithResponse = (ErrorWithResponse) error; - BraintreeError cardErrors = errorWithResponse.errorFor("creditCard"); - if (cardErrors != null) { - // There is an issue with the credit card. - BraintreeError expirationMonthError = cardErrors.errorFor("expirationMonth"); - if (expirationMonthError != null) { - // There is an issue with the expiration month. - DialogHelper.showAlertDialog(this, expirationMonthError.getMessage()); - } - } - } - } - - - private void showBraintreePaymentFragment(){ - try { - - BraintreeFragment braintreeFragment = - BraintreeFragment.newInstance( - BaseActivity.currentActivity, ApiConstants.BRAINTREE_TOKENIZATION_KEY_SANDBOX); - - /* - // create paypal payment - PayPal.requestBillingAgreement(braintreeFragment, new PayPalRequest()); - */ - - CardBuilder cardBuilder = new CardBuilder() - .cardNumber("4111111111111111") - .expirationMonth("08") - .expirationYear("2018"); - Card.tokenize(braintreeFragment, cardBuilder); - - }catch (InvalidArgumentException e){ - e.printStackTrace(); - } - - } - -} diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java index b28e9ae..f04ddec 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java @@ -38,6 +38,6 @@ public class ApiEndPoints { public static final String API_CHECK_COUPON = PREFIX + "checkCoupon" + SUFFIX + "&token="; public static final String API_CHECK_CAMPAIGN_PIZZAPASS = PREFIX + "detectPizzaPassCampaign" + SUFFIX + "&token="; public static final String API_CHECK_CAMPAIGN_CHAMPAGNE = PREFIX + "detectChampagneCampaign" + SUFFIX + "&token="; - public static final String API_CHECK_DELIVERY_TIME = PREFIX + "checkDeliveryTimeService" + SUFFIX + "&token="; + public static final String API_CHECK_DELIVERY_TIME = PREFIX + "checkDeliveryTimeService" + SUFFIX; public static final String API_CREATE_PAYMENT = PREFIX + "createPayment" + SUFFIX + "&token="; } 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 2403e6a..60ecde5 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 @@ -512,7 +512,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { // CVV kodu default olarak gozukmuyor. // Gozukmesi için braintree'ye login ol // Go to Settings --> Processing --> CVV --> Click on Edit --> Check option 'CVV not provided(l)', Enable option 'for any transaction' - // DropInRequest paymentRequest = new DropInRequest() .tokenizationKey(ApiConstants.BRAINTREE_TOKENIZATION_KEY_SANDBOX) diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java index 4bad151..e3698a0 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java @@ -143,9 +143,18 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment { private void fillAndNotifyAdapter(ArrayList paymentMethodModels){ PaymentMethodModel.checkNull(paymentMethodModels); + for(PaymentMethodModel paymentMethodModel : paymentMethodModels){ if(paymentMethodModel.getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.APPLE_PAY){ paymentMethodModels.remove(paymentMethodModel); + break; + } + } + + for(PaymentMethodModel paymentMethodModel : paymentMethodModels){ + if(paymentMethodModel.getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.ANDROID_PAY){ + paymentMethodModels.remove(paymentMethodModel); + break; } } diff --git a/app/src/main/res/layout/activity_payment.xml b/app/src/main/res/layout/activity_payment.xml deleted file mode 100644 index d70db3e..0000000 --- a/app/src/main/res/layout/activity_payment.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - -