volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

order time fix

Browse Source
This commit is contained in:
mustafa içmen
2019-12-30 22:29:35 +03:00
parent 979b01b37c
commit 0a2e2a577d
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
View File

@@ -477,7 +477,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
dateOfOrder.get(Calendar.DAY_OF_MONTH) == nowDate.get(Calendar.DAY_OF_MONTH); dateOfOrder.get(Calendar.DAY_OF_MONTH) == nowDate.get(Calendar.DAY_OF_MONTH);
if(isTheSameDate && isChoosingDeliveyTimeForFreeShipping){ 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) // createOrderActivity.getSelectedShippingMethod().getCode().equalsIgnoreCase(ApiConstants.SHIPPING_METHOD_CODE_PICK_UP_FROM_STORE)
else if(isTheSameDate){ else if(isTheSameDate){
@@ -562,11 +562,27 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
true true
); );
timePickerDialog.setSelectableTimes(generateEnabledTimePoints(workingParts));
Timepoint[] enabledTimePoints = generateEnabledTimePoints(workingParts);
timePickerDialog.setSelectableTimes(enabledTimePoints);
timePickerDialog.vibrate(false); timePickerDialog.vibrate(false);
if(isTheSameDate){ 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); timePickerDialog.show(BaseActivity.currentActivity.getFragmentManager(), choosetext);