Selber Abholen Android ön siparis hatasi

app/src/main/java/ch/pizzacucina/android/fragment/createOrder/CreateOrderSummaryFragment.java

@@ -571,19 +571,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                 break;
         }
 
-        if(orderYear == nowYear && orderMonth == nowMonth && orderDay == nowDay){
-            ArrayList<String> realPartsOfToday = new ArrayList<>();
-            for(String part : workingParts){
-                if(isPartAvailable(part)){
-                    realPartsOfToday.add(part);
-                }
-            }
-            if(!realPartsOfToday.isEmpty()){
-                workingParts.clear();
-                workingParts.addAll(realPartsOfToday);
-            }
-        }
-
         TimePickerDialog timePickerDialog =
                 TimePickerDialog.newInstance(
                         new TimePickerDialog.OnTimeSetListener() {
@@ -611,12 +598,38 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                         true
                 );
 
+        StringBuilder restaurantWorkingHoursMessageBuilder = new StringBuilder(getString(R.string.delivery_times_of_restaurant));
+        restaurantWorkingHoursMessageBuilder.append(" ");
+        for(String workingPart: workingParts){
+            restaurantWorkingHoursMessageBuilder.append(workingPart).append(", ");
+        }
+        String restaurantWorkingHoursMessage = restaurantWorkingHoursMessageBuilder.toString().substring(0, restaurantWorkingHoursMessageBuilder.toString().length() - 2);
+
+        /*
+        time point removed
+
+        if(orderYear == nowYear && orderMonth == nowMonth && orderDay == nowDay){
+            ArrayList<String> realPartsOfToday = new ArrayList<>();
+            for(String part : workingParts){
+                if(isPartAvailable(part)){
+                    realPartsOfToday.add(part);
+                }
+            }
+            if(!realPartsOfToday.isEmpty()){
+                workingParts.clear();
+                workingParts.addAll(realPartsOfToday);
+            }
+        }
 
         Timepoint[] enabledTimePoints = generateEnabledTimePoints(workingParts);
         timePickerDialog.setSelectableTimes(enabledTimePoints);
+         */
         timePickerDialog.vibrate(false);
+        timePickerDialog.setTitle(restaurantWorkingHoursMessage);
 
         if(isTheSameDate){
+            /*
+            time point removed
             boolean isMinimumTimeInTimePoints = false;
             for(Timepoint timepoint : enabledTimePoints){
                 if(timepoint.getHour() == nowHour && timepoint.getMinute() == nowMinute){
@@ -631,6 +644,8 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
             else if(enabledTimePoints.length > 0) {
                 timePickerDialog.setMinTime(enabledTimePoints[0].getHour(), enabledTimePoints[0].getMinute(), nowSecond);
             }
+            */
+            timePickerDialog.setMinTime(nowHour, nowMinute, nowSecond);
 
         }
 

app/src/main/res/values/strings.xml

@@ -195,6 +195,7 @@
     <string name="andorid_pay_not_found">Android Pay konnte nicht finden.</string>
     <string name="choose_pick_up_date_time">Bitte wählen Sie aus wann Sie Ihre Bestellung abholen möchten.</string>
     <string name="info">Information</string>
+    <string name="delivery_times_of_restaurant">Lieferzeiten:</string>
     <string name="delivery_time_preference_message">Bitte wählen Sie die Zeit für den gewünschten Termin aus.</string>
     <string name="delivery_time_preference_as_soon_as_possible">so schnell wie möglich</string>
     <string name="delivery_time_preference_choose_delivery_time">Zeit auswählen</string>