From 436902b961544431e2fe512513eafb7d8c35f505 Mon Sep 17 00:00:00 2001 From: cimenmus Date: Tue, 14 Aug 2018 21:27:08 +0300 Subject: [PATCH] coupon code dialog --- .../fragment/createOrder/PaymentMethodFragment.java | 11 ++++++++--- app/src/main/res/values/strings.xml | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) 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 aaa3efc..285f358 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 @@ -43,12 +43,14 @@ import retrofit2.Response; public class PaymentMethodFragment extends CreateOrderBaseFragment { @BindView(R.id.paymentMethodsRecyclerView) RecyclerView paymentMethodsRecyclerView; - @BindView(R.id.couponCodePizzalinkEditText) - AppEditText couponCodeAppEditText; + @BindView(R.id.couponCodePizzalinkEditText) AppEditText couponCodeAppEditText; @BindString(R.string.app_name) String appName; @BindString(R.string.alert_choose_payment_method) String choosePaymentMethodText; @BindString(R.string.coupon_is_not_active) String couponIsNotActiveText; + @BindString(R.string.coupon_used_dialog_title) String couponUsedDialogTitle; + @BindString(R.string.coupon_used_dialog_content_part_1) String couponUsedDialogContentPart1; + @BindString(R.string.coupon_used_dialog_content_part_2) String couponUsedDialogContentPart2; private ArrayList paymentMethodList = new ArrayList<>(); private PaymentMethodsRecyclerAdapter paymentMethodsRecyclerAdapter; @@ -242,7 +244,10 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment { couponModel = response.body().getData(); couponModel.checkNull(); if(couponModel.isActive()){ - DialogHelper.showDialogWithPositiveButton(appName, BaseActivity.currentActivity, couponModel.getName()); + DialogHelper.showDialogWithPositiveButton( + couponUsedDialogTitle, + BaseActivity.currentActivity, + couponUsedDialogContentPart1 + " " + couponModel.getName() + " " + couponUsedDialogContentPart2); getCartProducts(); } else { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index df7b150..0438e70 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -156,6 +156,9 @@ Bitte wählen Sie ein Bezahlverfahren aus. Gutscheincode (Wahlweise) Bezahlverfahren + Gutscheincode + Sie haben erfolgreich Ihre + eingelöst Der Coupon ist nicht aktiv.