diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 26847de..04dc050 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 53c4fee..76b0394 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/api/ApiInterface.java b/app/src/main/java/ch/pizzaleu/android/api/ApiInterface.java
index 9541518..5f75cf2 100644
--- a/app/src/main/java/ch/pizzaleu/android/api/ApiInterface.java
+++ b/app/src/main/java/ch/pizzaleu/android/api/ApiInterface.java
@@ -203,12 +203,14 @@ public interface ApiInterface {
                                                                @Query("token") String token);
 
     @GET("{storeName}" + ApiEndPoints.API_CHECK_DELIVERY_TIME)
-    Call<ResponseObject<Boolean>> checkDeliveryTime(@Path("storeName") String storeName);
+    Call<ResponseObject<Boolean>> checkDeliveryTime(@Path("storeName") String storeName,
+                                                    @Query("shipping_method_code") String shippingMethodCode);
 
     @FormUrlEncoded
     @POST("{storeName}" + ApiEndPoints.API_CHECK_DELIVERY_TIME)
     Call<ResponseObject<Boolean>> checkDeliveryTimeWithDateAndTime(@Path("storeName") String storeName,
-                                                                   @Field("delivery_date") String deliveryDateAndTime);
+                                                                   @Field("delivery_date") String deliveryDateAndTime,
+                                                                   @Field("shipping_method_code") String shippingMethodCode);
 
     @FormUrlEncoded
     @POST
@@ -223,7 +225,8 @@ public interface ApiInterface {
     Call<ResponseArray<StoreModel>> getStoreList();
 
     @GET("{storeName}" + ApiEndPoints.API_GET_DELIVERY_TIME_OF_STORE)
-    Call<ResponseObject<StoreShiftModel>> getDeliveryTimeOfStore(@Path("storeName") String storeName);
+    Call<ResponseObject<StoreShiftModel>> getDeliveryTimeOfStore(@Path("storeName") String storeName,
+                                                                 @Query("shipping_method_code") String shippingMethodCode);
 
     @FormUrlEncoded
     @POST
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 878a4e6..ee95912 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
@@ -251,7 +251,9 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
     private void checkDeliveryTime(){
         ApiService
                 .apiInterface
-                .checkDeliveryTime(SessionHelper.getSelectedStore().getStoreName())
+                .checkDeliveryTime(
+                        SessionHelper.getSelectedStore().getStoreName(),
+                        createOrderActivity.getSelectedShippingMethod().getCode())
                 .enqueue(new Callback<ResponseObject<Boolean>>() {
                     @Override
                     public void onResponse(Call<ResponseObject<Boolean>> call, Response<ResponseObject<Boolean>> response) {
@@ -287,7 +289,9 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
     private void getDeliveryTimeOfStore(final String dialogMessage){
         ApiService
                 .apiInterface
-                .getDeliveryTimeOfStore(SessionHelper.getSelectedStore().getStoreName())
+                .getDeliveryTimeOfStore(
+                        SessionHelper.getSelectedStore().getStoreName(),
+                        createOrderActivity.getSelectedShippingMethod().getCode())
                 .enqueue(new Callback<ResponseObject<StoreShiftModel>>() {
                     @Override
                     public void onResponse(Call<ResponseObject<StoreShiftModel>> call, Response<ResponseObject<StoreShiftModel>> response) {
@@ -325,7 +329,8 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                 .apiInterface
                 .checkDeliveryTimeWithDateAndTime(
                         SessionHelper.getSelectedStore().getStoreName(),
-                        deliveryDateAndTime)
+                        deliveryDateAndTime,
+                        createOrderActivity.getSelectedShippingMethod().getCode())
                 .enqueue(new Callback<ResponseObject<Boolean>>() {
                     @Override
                     public void onResponse(Call<ResponseObject<Boolean>> call, Response<ResponseObject<Boolean>> response) {