diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 45578f9..6ee9564 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/java/ch/pizzacucina/android/adapter/recycler/PersonalCouponCodesRecyclerAdapter.java b/app/src/main/java/ch/pizzacucina/android/adapter/recycler/PersonalCouponCodesRecyclerAdapter.java index 720e3f2..5e02dbd 100644 --- a/app/src/main/java/ch/pizzacucina/android/adapter/recycler/PersonalCouponCodesRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzacucina/android/adapter/recycler/PersonalCouponCodesRecyclerAdapter.java @@ -11,6 +11,7 @@ import butterknife.BindView; import butterknife.ButterKnife; import ch.pizzacucina.android.R; import ch.pizzacucina.android.activity.BaseActivity; +import ch.pizzacucina.android.helper.PriceHelper; import ch.pizzacucina.android.model.PersonalCouponModel; public class PersonalCouponCodesRecyclerAdapter extends RecyclerView.Adapter { @@ -22,6 +23,7 @@ public class PersonalCouponCodesRecyclerAdapter extends RecyclerView.Adapter paymentMethodList = new ArrayList<>(); private PaymentMethodsRecyclerAdapter paymentMethodsRecyclerAdapter; @@ -244,17 +243,11 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment { couponModel = response.body().getData(); couponModel.setStoreName(SessionHelper.getSelectedStore().getStoreName()); if(couponModel.isActive()){ - - String couponName = ""; - if(couponModel instanceof PersonalCouponModel){ - couponName = ((PersonalCouponModel) couponModel).getTheme(); - } - SessionHelper.saveSelectedCoupon(couponModel); DialogHelper.showDialogWithPositiveButton( couponUsedDialogTitle, BaseActivity.currentActivity, - couponUsedDialogContentPart1 + " " + couponName + " " + couponUsedDialogContentPart2); + couponUsedDialogMessage); getCartProducts(); } else { @@ -307,7 +300,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment { DialogHelper.showDialogWithPositiveButton( couponUsedDialogTitle, BaseActivity.currentActivity, - couponUsedDialogContentPart1 + " " + couponName + " " + couponUsedDialogContentPart2); + couponUsedDialogMessage); getCartProducts(); } else { diff --git a/app/src/main/res/layout/row_personal_coupon_code.xml b/app/src/main/res/layout/row_personal_coupon_code.xml index 97810dc..ec56a16 100644 --- a/app/src/main/res/layout/row_personal_coupon_code.xml +++ b/app/src/main/res/layout/row_personal_coupon_code.xml @@ -9,10 +9,10 @@ android:background="@color/white" android:paddingTop="8dp" android:paddingBottom="8dp" - android:paddingLeft="16dp" - android:paddingStart="16dp" - android:paddingRight="16dp" - android:paddingEnd="16dp"> + android:paddingLeft="8dp" + android:paddingStart="8dp" + android:paddingRight="8dp" + android:paddingEnd="8dp"> + + + + + + + + Gutscheincode (Wahlweise) Zahlungsart Gutscheincode - Sie haben erfolgreich Ihre - eingelöst. + Sie haben erfolgreich Ihre Gutschein eingelöst Der Coupon ist nicht aktiv. @@ -226,6 +225,7 @@ GUTSCHEINE  Code:  Belastet:  + Eingelöst:  Restguthaben:  Aktiv: