diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 3fa24df..48e95dc 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index 5b5bdc6..1b23c3b 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
index 22988e8..ac7b04f 100644
--- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
+++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
@@ -227,16 +227,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
             @Override
             public void onResponse(Call<ResponseObject> call, Response<ResponseObject> response) {
                 if(response.isSuccessful() && response.body().isSuccess()){
-
-                    if(createOrderActivity.getSelectedShippingMethod().getCode().equalsIgnoreCase(ApiConstants.SHIPPING_METHOD_CODE_FREE_SHIPPING)){
-                        checkDeliveryTimeForPreferenceDialog();
-                    }
-                    else if(createOrderActivity.getSelectedShippingMethod().getCode().equalsIgnoreCase(ApiConstants.SHIPPING_METHOD_CODE_PICK_UP_FROM_STORE)){
-                        getDeliveryTimeOfStore(choosePickUpDateTimeText);
-                    }
-                    else {
-                        checkDeliveryTime();
-                    }
+                    checkDeliveryTimeForPreferenceDialog();
                 }
                 else{
                     DialogHelper.hideLoadingDialog();
@@ -301,8 +292,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                     @Override
                     public void onResponse(Call<ResponseObject<Boolean>> call, Response<ResponseObject<Boolean>> response) {
                         DialogHelper.hideLoadingDialog();
-                        if(response.isSuccessful() &&
-                                response.body() != null){
+                        if(response.isSuccessful() && response.body() != null){
 
                             if(response.body().isSuccess()){
                                 showDeliveryTimePreferenceDialogWithTwoButtons();