add date and time picker dialog for pick up from store
This commit is contained in:
BIN
.idea/caches/build_file_checksums.ser
generated
BIN
.idea/caches/build_file_checksums.ser
generated
Binary file not shown.
BIN
.idea/caches/gradle_models.ser
generated
BIN
.idea/caches/gradle_models.ser
generated
Binary file not shown.
@@ -24,6 +24,8 @@ public class ApiConstants {
|
|||||||
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";
|
||||||
|
|
||||||
|
public static final String SHIPPING_METHOD_CODE_PICK_UP_FROM_STORE = "pickup.pickup";
|
||||||
|
|
||||||
public static final String CART_SUBTOTAL = "zwischensumme";
|
public static final String CART_SUBTOTAL = "zwischensumme";
|
||||||
public static final String CART_COMMISSION = "zahlungsgebühr";
|
public static final String CART_COMMISSION = "zahlungsgebühr";
|
||||||
public static final String CART_TOTAL = "total";
|
public static final String CART_TOTAL = "total";
|
||||||
|
|||||||
@@ -77,6 +77,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
|
|||||||
@BindString(R.string.slice_pizza) String yesText;
|
@BindString(R.string.slice_pizza) String yesText;
|
||||||
@BindString(R.string.do_not_slice_pizza) String noText;
|
@BindString(R.string.do_not_slice_pizza) String noText;
|
||||||
@BindString(R.string.restaurant_out_of_order) String restaurantOutOfOrderText;
|
@BindString(R.string.restaurant_out_of_order) String restaurantOutOfOrderText;
|
||||||
|
@BindString(R.string.choose_pick_up_date_time) String choosePickUpDateTimeText;
|
||||||
@BindString(R.string.restaurant_out_of_order_on_selected_date) String restaurantOutOfOrderOnSelectedDateText;
|
@BindString(R.string.restaurant_out_of_order_on_selected_date) String restaurantOutOfOrderOnSelectedDateText;
|
||||||
@BindString(R.string.something_went_wrong) String genericErrorText;
|
@BindString(R.string.something_went_wrong) String genericErrorText;
|
||||||
@BindString(R.string.unknown_payment_method) String unknownPaymentMethodText;
|
@BindString(R.string.unknown_payment_method) String unknownPaymentMethodText;
|
||||||
@@ -219,8 +220,13 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
|
|||||||
@Override
|
@Override
|
||||||
public void onResponse(Call<ResponseObject> call, Response<ResponseObject> response) {
|
public void onResponse(Call<ResponseObject> call, Response<ResponseObject> response) {
|
||||||
if(response.isSuccessful() && response.body().isSuccess()){
|
if(response.isSuccessful() && response.body().isSuccess()){
|
||||||
|
if(createOrderActivity.getSelectedShippingMethod().getCode().equalsIgnoreCase(ApiConstants.SHIPPING_METHOD_CODE_PICK_UP_FROM_STORE)){
|
||||||
|
getDeliveryTimeOfStore(choosePickUpDateTimeText);
|
||||||
|
}
|
||||||
|
else {
|
||||||
checkDeliveryTime();
|
checkDeliveryTime();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else{
|
else{
|
||||||
DialogHelper.hideLoadingDialog();
|
DialogHelper.hideLoadingDialog();
|
||||||
ApiErrorUtils.parseError(response);
|
ApiErrorUtils.parseError(response);
|
||||||
@@ -250,7 +256,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
|
|||||||
redirectToPayment();
|
redirectToPayment();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
getDeliveryTimeOfStore();
|
getDeliveryTimeOfStore(restaurantOutOfOrderText);
|
||||||
/*
|
/*
|
||||||
DialogHelper.hideLoadingDialog();
|
DialogHelper.hideLoadingDialog();
|
||||||
showRestaurantOutOfOrderDialog(restaurantOutOfOrderText);
|
showRestaurantOutOfOrderDialog(restaurantOutOfOrderText);
|
||||||
@@ -272,7 +278,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void getDeliveryTimeOfStore(){
|
private void getDeliveryTimeOfStore(final String dialogMessage){
|
||||||
ApiService
|
ApiService
|
||||||
.apiInterface
|
.apiInterface
|
||||||
.getDeliveryTimeOfStore(SessionHelper.getSelectedStore().getStoreName())
|
.getDeliveryTimeOfStore(SessionHelper.getSelectedStore().getStoreName())
|
||||||
@@ -285,7 +291,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
|
|||||||
|
|
||||||
if(response.body().isSuccess()){
|
if(response.body().isSuccess()){
|
||||||
storeShiftModel = response.body().getData();
|
storeShiftModel = response.body().getData();
|
||||||
showRestaurantOutOfOrderDialog(restaurantOutOfOrderText);
|
showRestaurantOutOfOrderDialog(dialogMessage);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText);
|
DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText);
|
||||||
@@ -1004,6 +1010,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
|
|||||||
String[] array = part.split("-");
|
String[] array = part.split("-");
|
||||||
String partStart = array[0];
|
String partStart = array[0];
|
||||||
String partEnd = array[1];
|
String partEnd = array[1];
|
||||||
|
partEnd = fixEndTime(partEnd);
|
||||||
|
|
||||||
int partStartHour = Integer.valueOf(partStart.substring(0,2));
|
int partStartHour = Integer.valueOf(partStart.substring(0,2));
|
||||||
int partStartMinute = Integer.valueOf(partStart.substring(3, 5));
|
int partStartMinute = Integer.valueOf(partStart.substring(3, 5));
|
||||||
@@ -1095,4 +1102,32 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String fixEndTime(String endTime){
|
||||||
|
try {
|
||||||
|
String[] time = endTime.split(":");
|
||||||
|
int hour = Integer.parseInt(time[0]);
|
||||||
|
int minute = Integer.parseInt(time[1]);
|
||||||
|
if(minute < 15){
|
||||||
|
minute += 60;
|
||||||
|
if(hour == 0){
|
||||||
|
hour += 24;
|
||||||
|
}
|
||||||
|
hour -= 1;
|
||||||
|
}
|
||||||
|
minute -= 15;
|
||||||
|
String hourString = String.valueOf(hour);
|
||||||
|
if(hourString.length() == 1){
|
||||||
|
hourString = "0" + hourString;
|
||||||
|
}
|
||||||
|
String minuteString = String.valueOf(minute);
|
||||||
|
if(minuteString.length() == 1){
|
||||||
|
minuteString = "0" + minuteString;
|
||||||
|
}
|
||||||
|
return hourString + ":" + minuteString;
|
||||||
|
}catch (Exception e){
|
||||||
|
e.printStackTrace();
|
||||||
|
return endTime;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -191,6 +191,7 @@
|
|||||||
<string name="unknown_payment_method">Unbekannte Zahlungsmethode.</string>
|
<string name="unknown_payment_method">Unbekannte Zahlungsmethode.</string>
|
||||||
<string name="payment_canceled">Die Zahlung wurde storniert.</string>
|
<string name="payment_canceled">Die Zahlung wurde storniert.</string>
|
||||||
<string name="andorid_pay_not_found">Android Pay konnte nicht finden.</string>
|
<string name="andorid_pay_not_found">Android Pay konnte nicht finden.</string>
|
||||||
|
<string name="choose_pick_up_date_time">Lütfen siparişinizi restorandan almak istediğiniz tarih ve saati seçiniz.</string>
|
||||||
<!-- CreateOrderSummaryFragment-->
|
<!-- CreateOrderSummaryFragment-->
|
||||||
|
|
||||||
<!-- CreateOrderResultFragment-->
|
<!-- CreateOrderResultFragment-->
|
||||||
|
|||||||
Reference in New Issue
Block a user