Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix#1252:Display error message if expiry date is invalid #1253

Closed
wants to merge 1 commit into from
Closed

fix#1252:Display error message if expiry date is invalid #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/BankContract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ interface DebitCardView extends BaseView<DebitCardPresenter> {

void verifyDebitCardSuccess(String otp);

void verifyDebitCardError(String message);
void verifyDebitCardError(String message, int viewNumber);
}

interface UpiPinPresenter extends BasePresenter {
Expand Down
10 changes: 8 additions & 2 deletions mifospay/src/main/java/org/mifos/mobilewallet/mifospay/bank/fragment/DebitCardFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,16 @@ public void verifyDebitCardSuccess(String otp) {
}

@Override
public void verifyDebitCardError(String message) {
public void verifyDebitCardError(String message, int viewNumber) {
hideProgressDialog();
mEtDebitCardNumber.requestFocusFromTouch();
showToast(message);
if (viewNumber == 1) {
mEtDebitCardNumber.requestFocusFromTouch();
} else if (viewNumber == 2) {
mPeMonth.requestFocusFromTouch();
} else if (viewNumber == 3) {
mPeYear.requestFocusFromTouch();
}
}

public void showToast(String message) {
Expand Down
17 changes: 16 additions & 1 deletion ...spay/src/main/java/org/mifos/mobilewallet/mifospay/bank/presenter/DebitCardPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import org.mifos.mobilewallet.mifospay.bank.BankContract;
import org.mifos.mobilewallet.mifospay.base.BaseView;

import java.util.Calendar;

import javax.inject.Inject;

import static org.mifos.mobilewallet.mifospay.MifosPayApp.getContext;
Expand All @@ -30,9 +32,22 @@ public void attachView(BaseView baseView) {
@Override
public void verifyDebitCard(String s, String s1, String s2) {
String otp = "0000";
int expiryMonth = Integer.parseInt(s1);
int expiryYear = Integer.parseInt(s2);
int currentYear = Calendar.getInstance().get(Calendar.YEAR);
int currentMonth = Calendar.getInstance().get(Calendar.MONTH) + 1;
if ((s.length() < 12) || (s.length() > 19)) {
mDebitCardView.verifyDebitCardError(getContext()
.getString(R.string.debit_card_error_message));
.getString(R.string.debit_card_error_message), 1);
} else if (expiryMonth < 01 || expiryMonth > 12) {
mDebitCardView.verifyDebitCardError(getContext()
.getString(R.string.expiry_month_error_message), 2);
} else if (expiryYear < currentYear || expiryYear > currentYear + 10) {
mDebitCardView.verifyDebitCardError(getContext()
.getString(R.string.expiry_year_error_message), 3);
} else if (expiryMonth < currentMonth && expiryYear <= currentYear) {
mDebitCardView.verifyDebitCardError(getContext()
.getString(R.string.expiry_month_error_message), 2);
} else {
mDebitCardView.verifyDebitCardSuccess(otp);
}
Expand Down
2 changes: 2 additions & 0 deletions mifospay/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@
<string name="log_out">Log out</string>
<string name="debit_card_details">Debit Card Details</string>
<string name="debit_card_error_message">Invalid Debit Card Number</string>
<string name="expiry_month_error_message">Invalid Expiry Month</string>
<string name="expiry_year_error_message">Invalid Expiry Year</string>
<string name="one_time_password">One Time Password</string>
<string name="upi_pin_setup">UPI PIN Setup</string>
<string name="all_fields_are_mandatory">All fields are mandatory.</string>
Expand Down