From 68c216127da4ff4c050ce9f08b415e41bd4e6dbc Mon Sep 17 00:00:00 2001
From: cimenmus <cimenmus@macbook-MacBook-Pro.local>
Date: Tue, 21 Aug 2018 23:20:53 +0300
Subject: [PATCH] servis ayirma fix

---
 .../android/fragment/CartFragment.java        | 10 ++++++----
 .../CreateOrderSummaryFragment.java           | 20 +++++++++----------
 .../ch/pizzapp/android/model/StoreModel.java  |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
index ec16d42..958ab02 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
@@ -123,18 +123,20 @@ public class CartFragment extends BaseFragment {
             case R.id.continueCartButton:
 
                 Double storeMinimumPrice = PriceHelper.stringToDouble(SessionHelper.getSelectedStore().getMinimumPrice());
-                Double currentBasketPrice = PriceHelper.stringToDouble(PriceHelper.removeCurrencyFromPrice(cartInfoModel.getCartTotalModel().getText()));
+                Double cartCurrentPrice = PriceHelper.stringToDouble(PriceHelper.removeCurrencyFromPrice(cartInfoModel.getCartTotalModel().getText()));
 
-                if(currentBasketPrice >=  storeMinimumPrice){
+                if(cartCurrentPrice >=  storeMinimumPrice){
                     Intent continueCartIntent = new Intent(BaseActivity.currentActivity, CreateOrderActivity.class);
                     continueCartIntent.putExtra("cartInfoModel", cartInfoModel);
                     startActivity(continueCartIntent);
                 }
                 else {
                     String dialogText =
-                            new StringBuilder().append(minimumOrderPriceAlertText)
+                            new StringBuilder()
+                                    .append(minimumOrderPriceAlertText)
                                     .append("\n")
-                                    .append(minimumOrderPriceText).append(" ")
+                                    .append(minimumOrderPriceText)
+                                    .append(" ")
                                     .append(PriceHelper.getPriceWithCurreny(storeMinimumPrice))
                                     .toString();
 
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java
index 56382a0..28710d2 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java
@@ -372,7 +372,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                         if(response.isSuccessful() &&
                                 response.body() != null){
 
-                            if(!response.body().isSuccess()){
+                            if(response.body().isSuccess()){
                                 redirectToPayment();
                             }
                             else {
@@ -571,26 +571,26 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
         int selectedDayIndex = dateOfOrder.get(Calendar.DAY_OF_WEEK);
         StoreWorkDayModel storeWorkDayModelOfSelectedDay = new StoreWorkDayModel();
         switch (selectedDayIndex){
-            case 0:
-                storeWorkDayModelOfSelectedDay = storeShiftModel.getMondayShift();
-                break;
             case 1:
-                storeWorkDayModelOfSelectedDay = storeShiftModel.getTuesdayShift();
+                storeWorkDayModelOfSelectedDay = storeShiftModel.getSundayShift();
                 break;
             case 2:
-                storeWorkDayModelOfSelectedDay = storeShiftModel.getWednesdayShift();
+                storeWorkDayModelOfSelectedDay = storeShiftModel.getMondayShift();
                 break;
             case 3:
-                storeWorkDayModelOfSelectedDay = storeShiftModel.getThursdayShift();
+                storeWorkDayModelOfSelectedDay = storeShiftModel.getTuesdayShift();
                 break;
             case 4:
-                storeWorkDayModelOfSelectedDay = storeShiftModel.getFridayShift();
+                storeWorkDayModelOfSelectedDay = storeShiftModel.getWednesdayShift();
                 break;
             case 5:
-                storeWorkDayModelOfSelectedDay = storeShiftModel.getSaturdayShift();
+                storeWorkDayModelOfSelectedDay = storeShiftModel.getThursdayShift();
                 break;
             case 6:
-                storeWorkDayModelOfSelectedDay = storeShiftModel.getSundayShift();
+                storeWorkDayModelOfSelectedDay = storeShiftModel.getFridayShift();
+                break;
+            case 7:
+                storeWorkDayModelOfSelectedDay = storeShiftModel.getSaturdayShift();
                 break;
         }
 
diff --git a/app/src/main/java/ch/pizzapp/android/model/StoreModel.java b/app/src/main/java/ch/pizzapp/android/model/StoreModel.java
index 5b35790..c36031b 100644
--- a/app/src/main/java/ch/pizzapp/android/model/StoreModel.java
+++ b/app/src/main/java/ch/pizzapp/android/model/StoreModel.java
@@ -43,7 +43,7 @@ public class StoreModel {
             city = "";
         }
         if(minimumPrice == null){
-            minimumPrice = "";
+            minimumPrice = "00.00";
         }
         if(canton == null){
             canton = "";