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

create order fix

Browse Source
This commit is contained in:
mustafa içmen
2019-12-12 23:36:52 +03:00
parent 4ae2621d3c
commit e43e4da695
3 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/ch/pizzaleu/android/activity/CreateOrderActivity.java
View File

@@ -213,7 +213,7 @@ public class CreateOrderActivity extends BaseActivity {
this.selectedPaymentMethod = selectedPaymentMethod; this.selectedPaymentMethod = selectedPaymentMethod;
} }
public void setSelectedPaymentMethod(PaymentMethodType paymentMethodType){ public void setSelectedPaymentMethodForBraintree(PaymentMethodType paymentMethodType){
String paymentMethodCode = ""; String paymentMethodCode = "";
switch (paymentMethodType){ switch (paymentMethodType){
case PAYPAL: case PAYPAL:

3
app/src/main/java/ch/pizzaleu/android/api/ApiConstants.java
View File

@@ -3,9 +3,8 @@ package ch.pizzaleu.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://pizza-leu.ch/"; public static final String API_PATH = "http://pizza-leu.ch/";
//public static final String API_PATH = "http://pizzamaxx.ch/"; //public static final String API_PATH = "http://pizzaleu.ddns.net/";
public static final String APP_TYPE_ID_ANDROID = "2"; public static final String APP_TYPE_ID_ANDROID = "2";
public static final int APP_ERROR_CODE_AUTHORIZATION = 1; public static final int APP_ERROR_CODE_AUTHORIZATION = 1;

28
app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
View File

@@ -138,7 +138,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment implemen
if (requestCode == REQUEST_CODE_BRAINTREE_PAYMENT) { if (requestCode == REQUEST_CODE_BRAINTREE_PAYMENT) {
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
DropInResult result = data.getParcelableExtra(DropInResult.EXTRA_DROP_IN_RESULT); DropInResult result = data.getParcelableExtra(DropInResult.EXTRA_DROP_IN_RESULT);
createOrderActivity.setSelectedPaymentMethod(result.getPaymentMethodType()); createOrderActivity.setSelectedPaymentMethodForBraintree(result.getPaymentMethodType());
createBraintreePayment(result); createBraintreePayment(result);
// use the result to update your UI and send the payment method nonce to your server // use the result to update your UI and send the payment method nonce to your server
} else if (resultCode == Activity.RESULT_CANCELED) { } else if (resultCode == Activity.RESULT_CANCELED) {
@@ -357,30 +357,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment implemen
public void onFailure(Call<ResponseObject<Boolean>> call, Throwable t) { public void onFailure(Call<ResponseObject<Boolean>> call, Throwable t) {
DialogHelper.hideLoadingDialog(); DialogHelper.hideLoadingDialog();
DialogHelper.showFailedDialog(); DialogHelper.showFailedDialog();
/*
// dummy //
if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.UNKNOWN){
DialogHelper.hideLoadingDialog();
DialogHelper.showAlertDialog(BaseActivity.currentActivity, unknownPaymentMethodText);
}
else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.CASH ||
createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TRANSFER){
createOrder(null);
}
else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TWINT) {
DialogHelper.hideLoadingDialog();
startDatatransPayment();
}
else {
DialogHelper.hideLoadingDialog();
startBraintreePayment();
}
*/
} }
}); });
} }
@@ -546,7 +522,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment implemen
} }
else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.CASH || else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.CASH ||
createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TRANSFER){ createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TRANSFER){
createOrder(null); createOrder(getCreateOrderParams(null));
} }
else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.POST_FINANCE_CARD) { else if(createOrderActivity.getSelectedPaymentMethod().getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.POST_FINANCE_CARD) {
DialogHelper.hideLoadingDialog(); DialogHelper.hideLoadingDialog();