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

checkDelvierytime service for with date

Browse Source
This commit is contained in:
cimenmus
2018-06-21 22:55:20 +03:00
parent 0c8fdd05fe
commit e0f8337b86
3 changed files with 70 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,6 +159,10 @@ public interface ApiInterface {
@GET(ApiEndPoints.API_CHECK_DELIVERY_TIME)
Call<ResponseObject<Boolean>> checkDeliveryTime();
@FormUrlEncoded
@POST(ApiEndPoints.API_CHECK_DELIVERY_TIME)
Call<ResponseObject<Boolean>> checkDeliveryTimeWithDateAndTime(@Field("delivery_date") String deliveryDateAndTime);
@FormUrlEncoded
@POST
Call<ResponseObject<Boolean>> createPayment(@Url String url, @FieldMap HashMap<String, Object> body);

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

@@ -76,6 +76,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
@BindString(R.string.yes) String yesText;
@BindString(R.string.no) String noText;
@BindString(R.string.restaurant_out_of_order) String restaurantOutOfOrderText;
@BindString(R.string.restaurant_out_of_order_on_selected_date) String restaurantOutOfOrderOnSelectedDateText;
@BindString(R.string.something_went_wrong) String genericErrorText;
@BindString(R.string.unknown_payment_method) String unknownPaymentMethodText;
@BindString(R.string.payment_canceled) String paymentCanceledText;
@@ -358,7 +359,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
}
else {
DialogHelper.hideLoadingDialog();
showRestaurantOutOfOrderDialog();
showRestaurantOutOfOrderDialog(restaurantOutOfOrderText);
}
}
@@ -400,11 +401,69 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
});
}
private void showRestaurantOutOfOrderDialog(){
private void checkDeliveryTimeWithDateAndTime(){
DialogHelper.showLoadingDialog();
String deliveryDateAndTime = dateOfOrder + " " + timeOfOrder;
ApiService
.apiInterface
.checkDeliveryTimeWithDateAndTime(deliveryDateAndTime)
.enqueue(new Callback<ResponseObject<Boolean>>() {
@Override
public void onResponse(Call<ResponseObject<Boolean>> call, Response<ResponseObject<Boolean>> response) {
DialogHelper.hideLoadingDialog();
if(response.isSuccessful() &&
response.body() != null){
if(response.body().isSuccess()){
redirectToPayment();
}
else {
showRestaurantOutOfOrderDialog(restaurantOutOfOrderOnSelectedDateText);
}
}
else{
ApiErrorUtils.parseError(response);
}
}
@Override
public void onFailure(Call<ResponseObject<Boolean>> call, Throwable t) {
DialogHelper.hideLoadingDialog();
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();
startTwintPayment();
}
else {
DialogHelper.hideLoadingDialog();
startBraintreePayment();
}
*/
}
});
}
private void showRestaurantOutOfOrderDialog(String message){
DialogHelper.showTwoButtonsDialog(
alertText,
restaurantOutOfOrderText,
message,
R.string.accept_campaign,
new MaterialDialog.SingleButtonCallback() {
@Override
@@ -450,7 +509,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
dayOfOrder = "0" + dayOfOrder;
}
dateOfOrder = dayOfOrder + "." + monthOfOrder + "." + yearOfOrder;
dateOfOrder = dayOfOrder + "-" + monthOfOrder + "-" + yearOfOrder;
showTimePickerDialog();
}
},
@@ -491,7 +550,8 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
}
timeOfOrder = hourOfOrder + ":" + minuteOfOrder;
redirectToPayment();
checkDeliveryTimeWithDateAndTime();
//redirectToPayment();
}
},
nowHour,

1
app/src/main/res/values/strings.xml
View File

@@ -95,6 +95,7 @@
<!-- tr -->
<string name="cannot_use_campaign">Bu kampanyadan daha önce yararlandığınız için sepetinize ekleyemezsiniz.</string>
<string name="restaurant_out_of_order">Restorant şu anda hizmet vermemektedir. İleri bir tarih ve saat için sipariş oluşturmak ister misiniz?</string>
<string name="restaurant_out_of_order_on_selected_date">Restorant seçtiğiniz tarih ve saatte hizmet vermemektedir. Başka bir tarih ve saat için sipariş oluşturmak ister misiniz?</string>
<!-- ProductPropertiesBottomSheetDialog -->
<!-- CartFragment-->