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

payment final

Browse Source
This commit is contained in:
cimenmus
2018-06-22 22:54:37 +03:00
parent ab2698bddc
commit 712ab4f1b3
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/ch/pizzapp/android/api/ApiConstants.java
View File

@@ -3,7 +3,8 @@ package ch.pizzapp.android.api;
public class ApiConstants { public class ApiConstants {
public static final int API_READ_TIMEOUT = 30; public static final int API_READ_TIMEOUT = 30;
public static final int API_CONNECT_TIMEOUT = 10; 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_WUNSCHPIZZA = 9999;
public static final int CATEGORY_ID_EKSTRA_KEBAP = 9998; public static final int CATEGORY_ID_EKSTRA_KEBAP = 9998;
public static final int PRODUCT_ID_WUNSCHPIZZA = 56; 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_BANK_CASH = "cod"; // Bar
public static final String PAYMENT_METHOD_CODE_TRANSFER = "bank_transfer"; // Kreditkarten-Kartenzahlung 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_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_ANDROID_PAY = "android_pay";
public static final String PAYMENT_METHOD_CODE_APPLE_PAY = "apple_pay"; public static final String PAYMENT_METHOD_CODE_APPLE_PAY = "apple_pay";
} }

2
app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java
View File

@@ -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_PIZZAPASS = PREFIX + "detectPizzaPassCampaign" + SUFFIX + "&token=";
public static final String API_CHECK_CAMPAIGN_CHAMPAGNE = PREFIX + "detectChampagneCampaign" + 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_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=";
} }

2
app/src/main/java/ch/pizzapp/android/api/ApiInterface.java
View File

@@ -165,6 +165,6 @@ public interface ApiInterface {
@FormUrlEncoded @FormUrlEncoded
@POST @POST
Call<ResponseObject<Boolean>> createPayment(@Url String url, @FieldMap HashMap<String, Object> body); Call<ResponseObject> createPayment(@Url String url, @FieldMap HashMap<String, Object> body);
} }

2
app/src/main/java/ch/pizzapp/android/api/ApiService.java
View File

@@ -50,7 +50,7 @@ public class ApiService {
HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); // set your desired log level HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); // set your desired log level
logging.setLevel(HttpLoggingInterceptor.Level.BODY); logging.setLevel(HttpLoggingInterceptor.Level.BODY);
//builder.addInterceptor(logging); builder.addInterceptor(logging);
OkHttpClient client = builder.build(); OkHttpClient client = builder.build();

9
app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java
View File

@@ -744,12 +744,12 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
private void createBraintreePayment(final DropInResult dropInResult){ private void createBraintreePayment(final DropInResult dropInResult){
DialogHelper.showLoadingDialog(); DialogHelper.showLoadingDialog();
Call<ResponseObject<Boolean>> call = ApiService.apiInterface.createPayment( Call<ResponseObject> call = ApiService.apiInterface.createPayment(
ApiEndPoints.API_CREATE_PAYMENT + SessionHelper.getCustomerToken().getToken(), ApiEndPoints.API_CREATE_PAYMENT + SessionHelper.getCustomerToken().getToken(),
getBraintreePaymentParams(dropInResult)); getBraintreePaymentParams(dropInResult));
call.enqueue(new Callback<ResponseObject<Boolean>>() { call.enqueue(new Callback<ResponseObject>() {
@Override @Override
public void onResponse(Call<ResponseObject<Boolean>> call, final Response<ResponseObject<Boolean>> response) { public void onResponse(Call<ResponseObject> call, final Response<ResponseObject> response) {
DialogHelper.hideLoadingDialog(); DialogHelper.hideLoadingDialog();
if(response.isSuccessful() && if(response.isSuccessful() &&
response.body().getData() != null && response.body().getData() != null &&
@@ -766,7 +766,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
} }
@Override @Override
public void onFailure(Call<ResponseObject<Boolean>> call, Throwable t) { public void onFailure(Call<ResponseObject> call, Throwable t) {
DialogHelper.hideLoadingDialog(); DialogHelper.hideLoadingDialog();
DialogHelper.showFailedDialog(); DialogHelper.showFailedDialog();
} }
@@ -776,6 +776,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
private HashMap<String, Object> getBraintreePaymentParams(DropInResult dropInResult){ private HashMap<String, Object> getBraintreePaymentParams(DropInResult dropInResult){
HashMap<String, Object> params = new HashMap<>(); HashMap<String, Object> params = new HashMap<>();
params.put("payment_method_nonce", dropInResult.getPaymentMethodNonce().getNonce()); params.put("payment_method_nonce", dropInResult.getPaymentMethodNonce().getNonce());
params.put("amount", PriceHelper.removeCurrencyFromPrice(createOrderActivity.getCartInfo().getCartTotalModel().getText()));
return params; return params;
} }