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

MIFOSX-1850 : UI changes for recurring deposits without maturity date

Browse Source
This commit is contained in:
Pramod Nuthakki 2015-02-24 14:27:38 +05:30
parent 662b2dd7b9
commit e87827db63
5 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/global-translations/locale-en.json
View File

@ -1552,6 +1552,7 @@
"label.heading.prematureclosefixeddepositaccount":"Premature Closure of Fixed Deposit Account",
"label.heading.closefixeddepositaccount":"Fixed Deposit Closure on Maturity",
"label.heading.closerecurringdepositaccount":"Recurring Deposit Closure on Maturity",
"label.heading.closeopenrecurringdepositaccount":"Recurring Deposit Closure",
"label.heading.editrecurringdepositaccounttransaction":"Edit Recurring Account Transaction",
"label.heading.editfixeddepositaccounttransaction":"Edit Fixed Deposit Account Transaction",
"label.heading.enforceMinRequiredBalance":"Enforce minimum balance",

7
app/scripts/controllers/deposits/recurring/RecurringDepositAccountActionsController.js
View File

@ -108,8 +108,13 @@
scope.savingsAccounts = data.savingsAccounts;
scope.paymentTypes = data.paymentTypeOptions;
scope.currency = data.currency;
if(data.maturityAmount){
scope.title = 'label.heading.closerecurringdepositaccount';
} else{
scope.title = 'label.heading.closeopenrecurringdepositaccount';
}
});
scope.title = 'label.heading.closerecurringdepositaccount';
scope.labelName = 'label.input.closedon';
scope.modelName = 'closedOnDate';
scope.showDateField = true;

8
app/scripts/controllers/deposits/recurring/ViewRecurringDepositAccountDetailsController.js
View File

@ -85,6 +85,7 @@
scope.savingaccountdetails.accountChart.chartSlabs = _.sortBy(scope.chartSlabs, function (obj) {
return obj.fromPeriod
});
scope.isprematureAllowed = data.maturityDate != null;
scope.status = data.status.value;
if (scope.status == "Submitted and pending approval" || scope.status == "Active" || scope.status == "Approved") {
scope.choice = true;
@ -179,6 +180,13 @@
}
}
}
if(!scope.isprematureAllowed){
scope.buttons.singlebuttons[1] = {
name: "button.close",
icon: "icon-arrow-right"
};
}
}
if (data.status.value == "Matured") {

2
app/views/deposits/recurring/recurring_deposit_account_actions.html
View File

@ -26,7 +26,7 @@
</div>
</div>
<div ng-show="isAccountClose">
<div class="form-group">
<div class="form-group" data-ng-show="maturityAmount">
<label class="control-label col-sm-2" for="maturityAmount">{{ 'label.account.maturity.amount' |
translate}}<span class="required">*</span></label>

14
app/views/deposits/recurring/viewaccountdetails.html
View File

@ -53,7 +53,8 @@
</td>
<td class="active fontnormal col-md-3">{{'label.account.deposit.principal.amount' | translate}}
</td>
<td class="col-md-3"><span class="padded-td">{{savingaccountdetails.currency.displaySymbol}}&nbsp;{{savingaccountdetails.depositAmount | number}}</span>
<td class="col-md-3"><span class="padded-td" data-ng-show="savingaccountdetails.depositAmount">{{savingaccountdetails.currency.displaySymbol}}&nbsp;{{savingaccountdetails.depositAmount | number}}</span>
<span class="padded-td" data-ng-hide="savingaccountdetails.depositAmount">{{savingaccountdetails.currency.displaySymbol}}&nbsp;0</span>
</td>
</tr>
<tr>
@ -66,7 +67,7 @@
<td><span class="padded-td">{{savingaccountdetails.nominalAnnualInterestRate}}</span>
</td>
</tr>
<tr>
<tr ng-show="savingaccountdetails.maturityDate">
<td class="active fontnormal">{{'label.account.maturity.date' | translate}}
</td>
<td><span class="padded-td">{{savingaccountdetails.maturityDate | DateFormat}}</span>
@ -79,11 +80,13 @@
<tr>
<td class="active fontnormal">{{'label.account.total.deposit' | translate}}
</td>
<td><span class="padded-td">{{savingaccountdetails.currency.displaySymbol}}&nbsp;{{savingaccountdetails.summary.totalDeposits | number}}</span>
<td><span class="padded-td" data-ng-show="savingaccountdetails.summary.totalDeposits">{{savingaccountdetails.currency.displaySymbol}}&nbsp;{{savingaccountdetails.summary.totalDeposits | number}}</span>
<span class="padded-td" data-ng-hide="savingaccountdetails.summary.totalDeposits">{{savingaccountdetails.currency.displaySymbol}}&nbsp;0</span>
</td>
<td class="active fontnormal">{{'label.account..total.withdrawals' | translate}}
</td>
<td><span class="padded-td">{{savingaccountdetails.currency.displaySymbol}}&nbsp;{{savingaccountdetails.summary.totalWithdrawals | number}}</span>
<td><span class="padded-td" data-ng-show="savingaccountdetails.summary.totalWithdrawals">{{savingaccountdetails.currency.displaySymbol}}&nbsp;{{savingaccountdetails.summary.totalWithdrawals | number}}</span>
<span class="padded-td" data-ng-hide="savingaccountdetails.summary.totalWithdrawals">{{savingaccountdetails.currency.displaySymbol}}&nbsp;0</span>
</td>
</tr>
<tr>
@ -115,7 +118,8 @@
<td class="active fontnormal">{{'label.totalinterestposted' |
translate}}
</td>
<td><span class="padded-td">{{savingaccountdetails.currency.displaySymbol}}&nbsp;{{savingaccountdetails.summary.totalInterestPosted | number}}</span>
<td><span class="padded-td" data-ng-show="savingaccountdetails.summary.totalInterestPosted">{{savingaccountdetails.currency.displaySymbol}}&nbsp;{{savingaccountdetails.summary.totalInterestPosted | number}}</span>
<span class="padded-td" data-ng-hide="savingaccountdetails.summary.totalInterestPosted">{{savingaccountdetails.currency.displaySymbol}}&nbsp;0</span>
</td>
</tr>
<tr ng-show="savingaccountdetails.summary.totalWithdrawals">