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

servis ayirma fix

Browse Source
This commit is contained in:
cimenmus
2018-08-21 23:20:53 +03:00
parent a24fabc06f
commit 68c216127d
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
View File

@@ -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();

20
app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java
View File

@@ -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;
}

2
app/src/main/java/ch/pizzapp/android/model/StoreModel.java
View File

@@ -43,7 +43,7 @@ public class StoreModel {
city = "";
}
if(minimumPrice == null){
minimumPrice = "";
minimumPrice = "00.00";
}
if(canton == null){
canton = "";