From 712ab4f1b34bcc81c7c21b69da59d3dfd6113a66 Mon Sep 17 00:00:00 2001 From: cimenmus Date: Fri, 22 Jun 2018 22:54:37 +0300 Subject: [PATCH] payment final --- .../main/java/ch/pizzapp/android/api/ApiConstants.java | 5 +++-- .../main/java/ch/pizzapp/android/api/ApiEndPoints.java | 2 +- .../main/java/ch/pizzapp/android/api/ApiInterface.java | 2 +- app/src/main/java/ch/pizzapp/android/api/ApiService.java | 2 +- .../fragment/createOrder/CreateOrderSummaryFragment.java | 9 +++++---- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiConstants.java b/app/src/main/java/ch/pizzapp/android/api/ApiConstants.java index 97735a0..30c7a5a 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiConstants.java @@ -3,7 +3,8 @@ package ch.pizzapp.android.api; public class ApiConstants { public static final int API_READ_TIMEOUT = 30; public static final int API_CONNECT_TIMEOUT = 10; - public static final String API_PATH = "http://www.pizzalink.ch/"; + //public static final String API_PATH = "http://www.pizzalink.ch/"; + public static final String API_PATH = "http://pizzapp.ddns.net/"; public static final int CATEGORY_ID_WUNSCHPIZZA = 9999; public static final int CATEGORY_ID_EKSTRA_KEBAP = 9998; public static final int PRODUCT_ID_WUNSCHPIZZA = 56; @@ -22,7 +23,7 @@ public class ApiConstants { public static final String PAYMENT_METHOD_CODE_BANK_CASH = "cod"; // Bar public static final String PAYMENT_METHOD_CODE_TRANSFER = "bank_transfer"; // Kreditkarten-Kartenzahlung public static final String PAYMENT_METHOD_CODE_TWINT = "twintcw_twint"; // TWINT - public static final String PAYMENT_METHOD_CODE_PAYPAL = "paypal"; + public static final String PAYMENT_METHOD_CODE_PAYPAL = "pp_standard"; public static final String PAYMENT_METHOD_CODE_ANDROID_PAY = "android_pay"; public static final String PAYMENT_METHOD_CODE_APPLE_PAY = "apple_pay"; } 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 f04ddec..8160d6e 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java @@ -39,5 +39,5 @@ public class ApiEndPoints { 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; - public static final String API_CREATE_PAYMENT = PREFIX + "createPayment" + SUFFIX + "&token="; + public static final String API_CREATE_PAYMENT = PREFIX + "checkBrainTreePayment" + SUFFIX + "&token="; } diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java b/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java index 1d1343f..2aa8e9a 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiInterface.java @@ -165,6 +165,6 @@ public interface ApiInterface { @FormUrlEncoded @POST - Call> createPayment(@Url String url, @FieldMap HashMap body); + Call createPayment(@Url String url, @FieldMap HashMap body); } diff --git a/app/src/main/java/ch/pizzapp/android/api/ApiService.java b/app/src/main/java/ch/pizzapp/android/api/ApiService.java index 7179396..ff90680 100644 --- a/app/src/main/java/ch/pizzapp/android/api/ApiService.java +++ b/app/src/main/java/ch/pizzapp/android/api/ApiService.java @@ -50,7 +50,7 @@ public class ApiService { HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); // set your desired log level logging.setLevel(HttpLoggingInterceptor.Level.BODY); - //builder.addInterceptor(logging); + builder.addInterceptor(logging); OkHttpClient client = builder.build(); 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 ad2f5dd..9983e9c 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 @@ -744,12 +744,12 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { private void createBraintreePayment(final DropInResult dropInResult){ DialogHelper.showLoadingDialog(); - Call> call = ApiService.apiInterface.createPayment( + Call call = ApiService.apiInterface.createPayment( ApiEndPoints.API_CREATE_PAYMENT + SessionHelper.getCustomerToken().getToken(), getBraintreePaymentParams(dropInResult)); - call.enqueue(new Callback>() { + call.enqueue(new Callback() { @Override - public void onResponse(Call> call, final Response> response) { + public void onResponse(Call call, final Response response) { DialogHelper.hideLoadingDialog(); if(response.isSuccessful() && response.body().getData() != null && @@ -766,7 +766,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { } @Override - public void onFailure(Call> call, Throwable t) { + public void onFailure(Call call, Throwable t) { DialogHelper.hideLoadingDialog(); DialogHelper.showFailedDialog(); } @@ -776,6 +776,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { private HashMap getBraintreePaymentParams(DropInResult dropInResult){ HashMap params = new HashMap<>(); params.put("payment_method_nonce", dropInResult.getPaymentMethodNonce().getNonce()); + params.put("amount", PriceHelper.removeCurrencyFromPrice(createOrderActivity.getCartInfo().getCartTotalModel().getText())); return params; }