From fc91f333887e725aa08287b7434e91715e595527 Mon Sep 17 00:00:00 2001
From: cimenmus <cimenmus@macbook-MacBook-Pro.local>
Date: Mon, 3 Sep 2018 00:22:11 +0300
Subject: [PATCH] coupon fix

---
 .idea/misc.xml                                              | 2 +-
 .../android/fragment/createOrder/PaymentMethodFragment.java | 2 +-
 .../java/ch/pizzapp/android/model/CheckCouponModel.java     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

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 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
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;
             }