Merge pull request #668 from AbhilashG97/android-client-666

fix: Loan gets approved in spite of "Approved Amount" and "Transaction Amount" field being blank
openMF · Jun 26, 2017 · f65a405 · f65a405
2 parents f0fdc71 + c7789cf
commit f65a405
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/...d/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApproval.java b/...d/src/main/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApproval.java
@@ -16,6 +16,7 @@
 import android.widget.Toast;
 
 import com.mifos.api.GenericResponse;
+import com.mifos.exceptions.RequiredFieldException;
 import com.mifos.mifosxdroid.R;
 import com.mifos.mifosxdroid.core.MifosBaseActivity;
 import com.mifos.mifosxdroid.core.MifosBaseFragment;
@@ -115,6 +116,14 @@ void onClickApproveLoan() {
         LoanApproval loanApproval = new LoanApproval();
         loanApproval.setNote(et_approval_note.getEditableText().toString());
         loanApproval.setApprovedOnDate(approvalDate);
+        /* Notify the user if Approved Amount &
+         * Transaction Amount field is blank */
+        if (et_approved_amount.getEditableText().toString().isEmpty()
+                || et_transaction_amount.getEditableText().toString().isEmpty()) {
+            new RequiredFieldException(getString(R.string.amount), getString(R.string
+                    .message_field_required)).notifyUserWithToast(getActivity());
+            return;
+        }
         loanApproval.setApprovedLoanAmount(et_approved_amount.getEditableText().toString());
         loanApproval.setExpectedDisbursementDate(disbursementDate);
         initiateLoanApproval(loanApproval);