artin/mifos-mobile
1
0
Fork 0
mirror of https://github.com/openMF/mifos-mobile.git synced 2026-02-06 11:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #321 from dilpreet96/savings_fix

Browse Source 
fix:Savings account NPE while making a Transfer
This commit is contained in:
Rajan Maurya 2017-06-27 01:23:19 +05:30 committed by GitHub
commit 322cc3b63e
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/mifos/selfserviceapp/ui/fragments/SavingAccountsDetailFragment.java
View File

@ -21,6 +21,7 @@ import org.mifos.selfserviceapp.utils.CircularImageView;
import org.mifos.selfserviceapp.utils.Constants;
import org.mifos.selfserviceapp.utils.DateHelper;
import org.mifos.selfserviceapp.utils.SymbolsUtils;
import org.mifos.selfserviceapp.utils.Toaster;
import org.mifos.selfserviceapp.utils.Utils;
import javax.inject.Inject;
@ -86,6 +87,7 @@ public class SavingAccountsDetailFragment extends BaseFragment implements Saving
private View rootView;
private long savingsId;
private Status status;
public static SavingAccountsDetailFragment newInstance(long savingsId) {
SavingAccountsDetailFragment fragment = new SavingAccountsDetailFragment();
@ -127,14 +129,22 @@ public class SavingAccountsDetailFragment extends BaseFragment implements Saving
@OnClick(R.id.tv_deposit)
void deposit() {
((BaseActivity) getActivity()).replaceFragment(SavingsMakeTransferFragment
.newInstance(savingsId, Constants.TRANSFER_PAY_TO), true, R.id.container);
if (status.getActive()) {
((BaseActivity) getActivity()).replaceFragment(SavingsMakeTransferFragment
.newInstance(savingsId, Constants.TRANSFER_PAY_TO), true, R.id.container);
} else {
Toaster.show(rootView, getString(R.string.account_not_active_to_perform_deposit));
}
}
@OnClick(R.id.tv_make_a_transfer)
void transfer() {
((BaseActivity) getActivity()).replaceFragment(SavingsMakeTransferFragment
.newInstance(savingsId, Constants.TRANSFER_PAY_FROM), true, R.id.container);
if (status.getActive()) {
((BaseActivity) getActivity()).replaceFragment(SavingsMakeTransferFragment
.newInstance(savingsId, Constants.TRANSFER_PAY_FROM), true, R.id.container);
} else {
Toaster.show(rootView, getString(R.string.account_not_active_to_perform_transfer));
}
}
@Override
@ -182,7 +192,7 @@ public class SavingAccountsDetailFragment extends BaseFragment implements Saving
@Override
public void showAccountStatus(SavingsWithAssociations savingsWithAssociations) {
Status status = savingsWithAssociations.getStatus();
status = savingsWithAssociations.getStatus();
if (status.getActive()) {
ivCircularStatus.setImageDrawable(
Utils.setCircularBackground(R.color.deposit_green, getActivity()));

3
app/src/main/res/values/strings.xml
View File

@ -86,6 +86,9 @@
<string name="pending">Pending</string>
<string name="matured">Matured</string>
<string name="account_not_active_to_perform_deposit">Account should to be Active to perform a deposit</string>
<string name="account_not_active_to_perform_transfer">Account should to be Active to perform a transfer</string>
<string name="empty_savings_accounts">Their is no SavingsAccount associated with you</string>
<string name="empty_loan_accounts">Their is no LoanAccount associated with you</string>
<string name="empty_share_accounts">Their is no ShareAccount associated with you</string>