From 0a2e2a577de1d9fab2050567ad605f1dc17a5c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Mon, 30 Dec 2019 22:29:35 +0300 Subject: [PATCH] order time fix --- .../CreateOrderSummaryFragment.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) 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 6df27bc..2d8490d 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 @@ -477,7 +477,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { dateOfOrder.get(Calendar.DAY_OF_MONTH) == nowDate.get(Calendar.DAY_OF_MONTH); if(isTheSameDate && isChoosingDeliveyTimeForFreeShipping){ - nowDate.add( Calendar.MINUTE, 75); + nowDate.add( Calendar.MINUTE, 65); } // createOrderActivity.getSelectedShippingMethod().getCode().equalsIgnoreCase(ApiConstants.SHIPPING_METHOD_CODE_PICK_UP_FROM_STORE) else if(isTheSameDate){ @@ -562,11 +562,27 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { true ); - timePickerDialog.setSelectableTimes(generateEnabledTimePoints(workingParts)); + + Timepoint[] enabledTimePoints = generateEnabledTimePoints(workingParts); + timePickerDialog.setSelectableTimes(enabledTimePoints); timePickerDialog.vibrate(false); if(isTheSameDate){ - timePickerDialog.setMinTime(nowHour, nowMinute, nowSecond); + boolean isMinimumTimeInTimePoints = false; + for(Timepoint timepoint : enabledTimePoints){ + if(timepoint.getHour() == nowHour && timepoint.getMinute() == nowMinute){ + isMinimumTimeInTimePoints = true; + break; + } + } + + if(isMinimumTimeInTimePoints){ + timePickerDialog.setMinTime(nowHour, nowMinute, nowSecond); + } + else if(enabledTimePoints.length > 0) { + timePickerDialog.setMinTime(enabledTimePoints[0].getHour(), enabledTimePoints[0].getMinute(), nowSecond); + } + } timePickerDialog.show(BaseActivity.currentActivity.getFragmentManager(), choosetext);