mirror of
https://github.com/openMF/community-app.git
synced 2026-02-06 14:26:51 +00:00
FINERACT-893-fixed-deposit-rollover (#3194)
This commit is contained in:
fynmanoj
GitHub
parent
ab9c606e4c
commit
91c0c3bf2f
@ -4228,5 +4228,11 @@
|
||||
"label.button.activateselfservice": "Activate Self Service User",
|
||||
"label.button.selfserviceactivatehelp": "Activate Self Service User Help",
|
||||
"label.createdselfserviceuser": "Self Service User created successfully",
|
||||
"#----End---": "--End of file--- "
|
||||
|
||||
"label.input.maturity.instruction" : "Maturity Instruction",
|
||||
"label.input.apply.maturity.instructions" :"Add Maturity Instructions",
|
||||
"label.input.transfer.to.account" : "Transfer To Savings Account",
|
||||
"validation.msg.fixeddepositaccount.transferToSavingsId.cannot.be.blank" : "Savings account for transfer cannot be blank.",
|
||||
|
||||
"----End---": "--End of file--- "
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
scope.products = [];
|
||||
scope.fieldOfficers = [];
|
||||
scope.formData = {};
|
||||
scope.transientData ={};
|
||||
scope.restrictDate = new Date();
|
||||
scope.clientId = routeParams.clientId;
|
||||
scope.groupId = routeParams.groupId;
|
||||
@ -42,7 +43,8 @@
|
||||
scope.changeProduct = function () {
|
||||
scope.inparams.productId = scope.formData.productId;
|
||||
resourceFactory.fixedDepositAccountTemplateResource.get(scope.inparams, function (data) {
|
||||
|
||||
scope.depositRolloverOptions = data.maturityInstructionOptions;
|
||||
scope.savingsAccounts = data.savingsAccounts;
|
||||
scope.data = data;
|
||||
scope.charges = data.charges;
|
||||
|
||||
@ -182,6 +184,9 @@
|
||||
location.path('/viewgroup/' + scope.groupId);
|
||||
}
|
||||
}
|
||||
scope.changeMaturityInstruction = function(){
|
||||
scope.formData.transferToSavingsId =null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a new row with default values for entering chart details
|
||||
|
||||
@ -29,15 +29,22 @@
|
||||
}
|
||||
}
|
||||
|
||||
scope.inparams = {};
|
||||
if (data.clientId) {
|
||||
scope.formData.clientId = data.clientId;
|
||||
scope.clientName = data.clientName;
|
||||
scope.inparams.clientId = data.clientId
|
||||
}
|
||||
if (data.groupId) {
|
||||
scope.formData.groupId = data.groupId;
|
||||
scope.groupName = data.groupName;
|
||||
scope.inparams.groupId = data.groupId
|
||||
}
|
||||
scope.formData.productId = data.depositProductId;
|
||||
scope.inparams.productId = scope.formData.productId;
|
||||
resourceFactory.fixedDepositAccountTemplateResource.get(scope.inparams, function (data) {
|
||||
scope.depositRolloverOptions = data.maturityInstructionOptions;
|
||||
});
|
||||
scope.products = data.productOptions;
|
||||
scope.savingsAccounts = data.savingsAccounts;
|
||||
if (data.linkedAccount) {
|
||||
@ -54,6 +61,8 @@
|
||||
scope.formData.depositPeriod = data.depositPeriod;
|
||||
scope.formData.lockinPeriodFrequency = data.lockinPeriodFrequency;
|
||||
scope.formData.withHoldTax = data.withHoldTax;
|
||||
scope.formData.maturityInstructionId = data.onAccountClosure.id;
|
||||
scope.formData.transferToSavingsId = data.transferToSavingsId;
|
||||
/* FIX-ME: uncomment annualFeeAmount when datepicker avialable, because it depends on the date field 'annualFeeOnMonthDay'*/
|
||||
//scope.formData.annualFeeAmount = data.annualFeeAmount;
|
||||
//scope.formData.withdrawalFeeAmount = data.withdrawalFeeAmount;
|
||||
@ -199,6 +208,10 @@
|
||||
location.path('/viewsavingaccount/' + scope.accountId);
|
||||
}
|
||||
|
||||
scope.changeMaturityInstruction = function(){
|
||||
scope.formData.transferToSavingsId =null;
|
||||
}
|
||||
|
||||
scope.submit = function () {
|
||||
if (this.formData.submittedOnDate) this.formData.submittedOnDate = dateFilter(this.formData.submittedOnDate, scope.df);
|
||||
this.formData.locale = scope.optlang.code;
|
||||
|
||||
@ -194,6 +194,30 @@
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>
|
||||
<label class="control-label">{{ 'label.input.maturity.instruction' | translate }}</label>
|
||||
</td>
|
||||
<td>
|
||||
<select id="depositRollover" ng-model="formData.maturityInstructionId" ng-options="depositRollover.id as depositRollover.value for depositRollover in depositRolloverOptions"
|
||||
class="form-control width170px" value="{{depositRollover.id}}" ng-change="changeMaturityInstruction()">
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-if="formData.maturityInstructionId == 200">
|
||||
<td >
|
||||
<label class="control-label">{{ 'label.input.transfer.to.account' | translate }}
|
||||
</label>
|
||||
</td>
|
||||
<td >
|
||||
<select id="depositRollover" ng-model="formData.transferToSavingsId" ng-options="savingsAccount.id as savingsAccount.accountNo for savingsAccount in savingsAccounts"
|
||||
class="form-control width170px" value="{{savingsAccount.id}}" >
|
||||
<option value="">{{'label.menu.selectone' | translate}}</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr ng-show="data.taxGroup">
|
||||
<td colspan="2" class="paddedbottom10">
|
||||
<input type="checkbox" ng-model="formData.withHoldTax"> <span
|
||||
|
||||
@ -234,6 +234,36 @@
|
||||
{{data.taxGroup.name}}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4" class="paddedbottom20">
|
||||
<input type="checkbox" ng-model="transientData.maturityInstuctions">
|
||||
<label class="control-label">{{ 'label.input.apply.maturity.instructions' | translate }} </label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-show="transientData.maturityInstuctions">
|
||||
<td class="paddedbottom20" ng-show="transientData.maturityInstuctions">
|
||||
<label class="control-label">{{ 'label.input.maturity.instruction' | translate }}
|
||||
</label>
|
||||
</td>
|
||||
<td class="paddedbottom20" ng-show="transientData.maturityInstuctions">
|
||||
<select id="depositRollover" ng-model="formData.maturityInstructionId" ng-options="depositRollover.id as depositRollover.value for depositRollover in depositRolloverOptions"
|
||||
class="form-control width170px" value="{{depositRollover.id}}" ng-change="changeMaturityInstruction()">
|
||||
<!--option value="">{{'label.menu.selectone' | translate}}</option-->
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-if="formData.maturityInstructionId == 200">
|
||||
<td class="paddedbottom20">
|
||||
<label class="control-label">{{ 'label.input.transfer.to.account' | translate }}
|
||||
</label>
|
||||
</td>
|
||||
<td class="paddedbottom20">
|
||||
<select id="depositRollover" ng-model="formData.transferToSavingsId" ng-options="savingsAccount.id as savingsAccount.accountNo for savingsAccount in savingsAccounts"
|
||||
class="form-control width170px" value="{{savingsAccount.id}}">
|
||||
<option value="">{{'label.menu.selectone' | translate}}</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<hr data-ng-show="formData.productId" />
|
||||
<h3 ng-show="data">{{ 'label.heading.interestchart' | translate }}</h3>
|
||||
|
||||
@ -78,6 +78,18 @@
|
||||
<th class="active fontnormal"> {{'label.heading.withholdtaxgroup' | translate}}</th>
|
||||
<td><span class="padded-td">{{savingaccountdetails.taxGroup.name}}</span></td>
|
||||
</tr>
|
||||
<tr ng-if="savingaccountdetails.onAccountClosure && savingaccountdetails.onAccountClosure.id ">
|
||||
<th class="active fontnormal">{{'label.input.maturity.instruction' | translate}}
|
||||
</th>
|
||||
<td><span
|
||||
class="padded-td">{{savingaccountdetails.onAccountClosure.value}}
|
||||
<span ng-if="savingaccountdetails.onAccountClosure.id == 1 || savingaccountdetails.onAccountClosure.id == 2">
|
||||
(Re-Invest) </span>
|
||||
<span ng-if="savingaccountdetails.onAccountClosure.id == 200">
|
||||
(to) {{savingaccountdetails.transferToSavingsAccount.accountNo}}</span>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<br>
|
||||
<table class="table table-bordered table-striped" ng-show="!savingaccountdetails.status.rejected && !savingaccountdetails.status.submittedAndPendingApproval">
|
||||
@ -112,13 +124,6 @@
|
||||
<td><span class="padded-td">{{savingaccountdetails.interestCalculationType.value}}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class="active fontnormal">{{'label.noofdaysinyear' | translate}}
|
||||
</th>
|
||||
<td><span
|
||||
class="padded-td">{{savingaccountdetails.interestCalculationDaysInYearType.value}}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-show="savingaccountdetails.preClosurePenalApplicable">
|
||||
<th class="active fontnormal">{{'label.preclosurepenal' | translate}}
|
||||
</th>
|
||||
@ -259,6 +264,18 @@
|
||||
class="padded-td">{{savingaccountdetails.interestCalculationDaysInYearType.value}}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-if="savingaccountdetails.onAccountClosure && savingaccountdetails.onAccountClosure.id ">
|
||||
<td class="active fontnormal">{{'label.input.maturity.instruction' | translate}}
|
||||
</td>
|
||||
<td><span
|
||||
class="padded-td">{{savingaccountdetails.onAccountClosure.value}}
|
||||
<span ng-if="savingaccountdetails.onAccountClosure.id == 300|| savingaccountdetails.onAccountClosure.id == 400">
|
||||
(Re-Invest) </span>
|
||||
<span ng-if="savingaccountdetails.onAccountClosure.id == 200">
|
||||
(to) {{savingaccountdetails.transferToSavingsAccount.accountNo}}</span>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-show="savingaccountdetails.preClosurePenalApplicable">
|
||||
<td class="active fontnormal">{{'label.preclosurepenal' | translate}}
|
||||
</td>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user