diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 59affd2..6a06c17 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java b/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java
index a873490..7d0a189 100644
--- a/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java
+++ b/app/src/main/java/ch/pizzacucina/android/api/ApiConstants.java
@@ -49,4 +49,7 @@ public class ApiConstants {
     public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTP = "http://www.cucinaexpress.ch/";
     public static final String PAYMENT_WEBVIEW_MAIN_PAGE_HTTPS = "https://www.cucinaexpress.ch/";
 
+    public static final int DELAY_SELF_PICK_UP_AS_MINUTES = 15;
+    public static final int DELAY_FREE_SHIPPING_UP_AS_MINUTES = 20;
+
 }
diff --git a/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java
index 7fc4055..e86cfbe 100644
--- a/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java
+++ b/app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java
@@ -527,10 +527,10 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
         }
         else if(isTheSameDate &&
                 createOrderActivity.getSelectedShippingMethod().getCode().toLowerCase().equals(ApiConstants.SHIPPING_METHOD_CODE_PICK_UP_FROM_STORE)){
-            nowDate.add( Calendar.MINUTE, 25);
+            nowDate.add( Calendar.MINUTE, ApiConstants.DELAY_FREE_SHIPPING_UP_AS_MINUTES);
         }
         else if(isTheSameDate){
-            nowDate.add( Calendar.MINUTE, 10);
+            nowDate.add( Calendar.MINUTE, ApiConstants.DELAY_SELF_PICK_UP_AS_MINUTES);
         }
 
         int orderYear = dateOfOrder.get(Calendar.YEAR);