diff --git a/.idea/misc.xml b/.idea/misc.xml index c0f68ed..99202cc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java index be70a78..ad18af8 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java @@ -247,8 +247,8 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment { couponModel = response.body().getData(); couponModel.setStoreName(SessionHelper.getSelectedStore().getStoreName()); couponModel.checkNull(); - SessionHelper.saveSelectedCoupon(couponModel); if(couponModel.isActive()){ + SessionHelper.saveSelectedCoupon(couponModel); DialogHelper.showDialogWithPositiveButton( couponUsedDialogTitle, BaseActivity.currentActivity, diff --git a/app/src/main/java/ch/pizzapp/android/model/CheckCouponModel.java b/app/src/main/java/ch/pizzapp/android/model/CheckCouponModel.java index 898e1b9..031a86e 100644 --- a/app/src/main/java/ch/pizzapp/android/model/CheckCouponModel.java +++ b/app/src/main/java/ch/pizzapp/android/model/CheckCouponModel.java @@ -148,15 +148,15 @@ public class CheckCouponModel { calendarEnd = Calendar.getInstance(); calendarEnd.setTime(dateEnd); - if(calendarNow.get(Calendar.YEAR) > calendarEnd.get(Calendar.YEAR)){ + if(calendarEnd.get(Calendar.YEAR) > calendarNow.get(Calendar.YEAR)){ return true; } - if(calendarNow.get(Calendar.MONTH) + 1 > calendarEnd.get(Calendar.MONTH) + 1){ + if(calendarEnd.get(Calendar.MONTH) > calendarNow.get(Calendar.MONTH)){ return true; } - if(calendarNow.get(Calendar.DAY_OF_MONTH) >= calendarEnd.get(Calendar.DAY_OF_MONTH)){ + if(calendarEnd.get(Calendar.DAY_OF_MONTH) >= calendarNow.get(Calendar.DAY_OF_MONTH)){ return true; }