From 98038521dcb6958fc828bed2fa752ec7bf9c0195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?mustafa=20ic=CC=A7men?= <mustafaicmen@gmail.com>
Date: Sat, 18 Jan 2020 16:43:24 +0300
Subject: [PATCH] time fix

---
 .../createOrder/CreateOrderSummaryFragment.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 ac7b04f..e0f6821 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
@@ -104,7 +104,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
     private ProductOnOrderSummaryRecyclerAdapter productOnOrderSummaryRecyclerAdapter;
     private StoreShiftModel storeShiftModel;
     private PaymentTokenModel braintreePaymentTokenModel;
-    private boolean isChoosingDeliveyTimeForFreeShipping;
 
     public CreateOrderSummaryFragment() {}
 
@@ -324,7 +323,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                     @Override
                     public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
                         DialogHelper.showLoadingDialog();
-                        isChoosingDeliveyTimeForFreeShipping = false;
                         checkDeliveryTime();
                     }
                 },
@@ -333,7 +331,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                     @Override
                     public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
                         DialogHelper.showLoadingDialog();
-                        isChoosingDeliveyTimeForFreeShipping = true;
                         getDeliveryTimeOfStore(null);
                     }
                 },
@@ -352,7 +349,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                     @Override
                     public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
                         DialogHelper.showLoadingDialog();
-                        isChoosingDeliveyTimeForFreeShipping = true;
                         getDeliveryTimeOfStore(null);
                     }
                 },
@@ -468,7 +464,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
         final int nowMonth = nowDate.get(Calendar.MONTH);
         final int nowDay = nowDate.get(Calendar.DAY_OF_MONTH);
 
-        if(isChoosingDeliveyTimeForFreeShipping && nowDate.get(Calendar.HOUR_OF_DAY) == 23){
+        if(nowDate.get(Calendar.HOUR_OF_DAY) == 23){
             nowDate.add(Calendar.DAY_OF_YEAR, 1);
         }
 
@@ -518,10 +514,14 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                 dateOfOrder.get(Calendar.MONTH) == nowDate.get(Calendar.MONTH) &&
                 dateOfOrder.get(Calendar.DAY_OF_MONTH) == nowDate.get(Calendar.DAY_OF_MONTH);
 
-        if(isTheSameDate && isChoosingDeliveyTimeForFreeShipping){
+        if(isTheSameDate &&
+                createOrderActivity.getSelectedShippingMethod().getCode().toLowerCase().equals(ApiConstants.SHIPPING_METHOD_CODE_FREE_SHIPPING)){
             nowDate.add( Calendar.MINUTE, 65);
         }
-        // createOrderActivity.getSelectedShippingMethod().getCode().equalsIgnoreCase(ApiConstants.SHIPPING_METHOD_CODE_PICK_UP_FROM_STORE)
+        else if(isTheSameDate &&
+                createOrderActivity.getSelectedShippingMethod().getCode().toLowerCase().equals(ApiConstants.SHIPPING_METHOD_CODE_PICK_UP_FROM_STORE)){
+            nowDate.add( Calendar.MINUTE, 25);
+        }
         else if(isTheSameDate){
             nowDate.add( Calendar.MINUTE, 10);
         }