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

tool tip is added for accoutning in loan products

Browse Source
This commit is contained in:
goutham-M 2013-12-13 16:09:23 +05:30
parent 187626d91b
commit bd2ecaf1aa
6 changed files with 60 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1012,6 +1012,17 @@
"label.selectpurpose": "Select purpose",
"label.selectloanproduct": "Select loan product",
"#tool tip":"..",
"label.tooltip.fundsource":"An asset account(typically Bank or cash) that is debited during repayments/payments an credited using disbursals",
"label.tooltip.loanportfolio":"An asset account that is debited during disbursement and credited during principal repayment/writeoff",
"label.tooltip.transfersinsuspense":"An asset account that is used a suspense account for tracking portfolios of loans under transfer",
"label.tooltip.incomefrominterest":"An income account that is credited during interest payment",
"label.tooltip.incomefromfees":"An income account that is credited during fee payment",
"label.tooltip.incomefrompenalties":"An income account that is credited during penalty payment",
"label.tooltip.loseswrittenoff":"An expense account that is debited on principal writeoff(also debited in the events of interest, fee and penalty written-off in case of accural based accounting",
"label.tooltip.overpaymentliability":"A liability account that is credited on overpayments and credited when refunds are made to client",
"#Enumeration & Error Messages": "..",
"loanTransactionType.disbursement": "Disbursement",
"loanTransactionType.repayment": "Repayment",

5
app/scripts/controllers/loanAccount/EditLoanAccAppController.js
View File

@ -100,6 +100,11 @@
scope.formData.syncRepaymentsWithMeeting = true;
}
if (scope.loanaccountinfo.linkedAccount) {
scope.formData.linkAccountId = scope.loanaccountinfo.linkedAccount.id;
}
}
scope.addCharge = function() {

41
app/scripts/controllers/product/CreateLoanProductController.js
View File

@ -22,7 +22,7 @@
scope.incomeAccountOptions = scope.product.accountingMappingOptions.incomeAccountOptions || [];
scope.expenseAccountOptions = scope.product.accountingMappingOptions.expenseAccountOptions || [];
scope.liabilityOptions = data.accountingMappingOptions.liabilityAccountOptions || [];
scope.penaltyOptions = scope.product.penaltyOptions || [];
scope.formData.currencyCode = scope.product.currencyOptions[0].code;
scope.formData.includeInBorrowerCycle = 'false';
scope.formData.useBorrowerCycle = 'false';
@ -99,27 +99,22 @@
scope.addConfigureFundSource = function() {
scope.frFlag = true;
if (scope.product.paymentTypeOptions && scope.product.paymentTypeOptions.length > 0 &&
scope.assetAccountOptions && scope.assetAccountOptions.length > 0) {
scope.configureFundOptions.push({
paymentTypeId : scope.product.paymentTypeOptions[0].id,
fundSourceAccountId : scope.assetAccountOptions[0].id,
paymentTypeOptions : scope.product.paymentTypeOptions,
assetAccountOptions : scope.assetAccountOptions
});
};
scope.configureFundOptions.push({
paymentTypeId : scope.product.paymentTypeOptions.length > 0 ? scope.product.paymentTypeOptions[0].id : '',
fundSourceAccountId : scope.assetAccountOptions.length > 0 ? scope.assetAccountOptions[0].id : '',
paymentTypeOptions : scope.product.paymentTypeOptions.length > 0 ? scope.product.paymentTypeOptions : [],
assetAccountOptions : scope.assetAccountOptions.length > 0 ? scope.assetAccountOptions : []
});
};
scope.mapFees = function() {
scope.fiFlag = true;
if (scope.product.chargeOptions && scope.product.chargeOptions.length > 0 && scope.incomeAccountOptions && scope.incomeAccountOptions.length > 0) {
scope.specificIncomeaccounts.push({
chargeId : scope.product.chargeOptions[0].id,
incomeAccountId : scope.incomeAccountOptions[0].id,
chargeOptions : scope.product.chargeOptions,
incomeAccountOptions : scope.product.accountingMappingOptions.incomeAccountOptions
});
}
scope.specificIncomeaccounts.push({
chargeId : scope.product.chargeOptions.length > 0 ? scope.product.chargeOptions[0].id : '',
incomeAccountId : scope.incomeAccountOptions.length > 0 ? scope.incomeAccountOptions[0].id : '',
chargeOptions : scope.product.chargeOptions.length > 0 ? scope.product.chargeOptions : [],
incomeAccountOptions : scope.incomeAccountOptions.length > 0 ? scope.incomeAccountOptions : []
});
};
scope.addPrincipalVariation = function() {
@ -143,14 +138,12 @@
scope.mapPenalty = function() {
scope.piFlag = true;
if (scope.product.penaltyOptions && scope.product.penaltyOptions.length > 0 && scope.incomeAccountOptions && scope.incomeAccountOptions.length > 0) {
scope.penaltySpecificIncomeaccounts.push({
chargeId : scope.product.penaltyOptions[0].id,
incomeAccountId : scope.incomeAccountOptions[0].id,
penaltyOptions : scope.product.penaltyOptions,
incomeAccountOptions : scope.incomeAccountOptions
chargeId : scope.penaltyOptions.length > 0 ? scope.penaltyOptions[0].id : '',
incomeAccountId : scope.incomeAccountOptions.length > 0 ? scope.incomeAccountOptions[0].id : '',
penaltyOptions : scope.penaltyOptions.length > 0 ? scope.penaltyOptions : [],
incomeAccountOptions : scope.incomeAccountOptions.length > 0 ? scope.incomeAccountOptions : []
});
}
};
scope.deleteFund = function(index) {

2
app/styles/chosen.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
app/views/loans/newloanaccount.html
View File

@ -158,7 +158,7 @@
class="required">*</span></label>
<select id="interestCalculationPeriodType" ng-model="formData.interestCalculationPeriodType"
ng-options="interestCalculationPeriodType.id as interestCalculationPeriodType.value for interestCalculationPeriodType in loanaccountinfo.interestCalculationPeriodTypeOptions"
value="{{interestCalculationPeriodType.id}}">
value="{{interestCalculationPeriodType.id}}"/>
</td>
</td>
<td>
@ -173,7 +173,7 @@
<label class="control-label">{{ 'label.input.repaymentstrategy' | translate }}&nbsp;<span
class="required">*</span></label>
<select id="transactionProcessingStrategyId" ng-model="formData.transactionProcessingStrategyId"
ng-options="transactionProcessingStrategy.id as transactionProcessingStrategy.name for transactionProcessingStrategy in product.transactionProcessingStrategyOptions"
ng-options="transactionProcessingStrategy.id as transactionProcessingStrategy.name for transactionProcessingStrategy in loanaccountinfo.transactionProcessingStrategyOptions"
value="{{transactionProcessingStrategy.id}}"/>
</td>
<td>

40
app/views/products/createloanproduct.html
View File

@ -534,6 +534,7 @@
<tr class="control-group">
<td>
<label class="control-label">{{ 'label.input.fundsource' | translate }}&nbsp;</label>
<a title="{{'label.tooltip.fundsource' | translate}}"><i class="icon-question-sign icon-white"></i></a>
<select id="fundSourceAccountId" ng-model="formData.fundSourceAccountId" chosen="assetAccountOptions"
ng-options="assetAccount.id as assetAccount.name for assetAccount in assetAccountOptions"
value="{{assetAccount.id}}">
@ -543,6 +544,7 @@
<tr class="control-group">
<td>
<label class="control-label">{{ 'label.input.loanportfolio' | translate }}&nbsp;</label>
<a title="{{'label.tooltip.loanportfolio' | translate}}"><i class="icon-question-sign icon-white"></i></a>
<select id="loanPortfolioAccountId" ng-model="formData.loanPortfolioAccountId" chosen="assetAccountOptions"
ng-options="assetAccount.id as assetAccount.name for assetAccount in assetAccountOptions"
value="{{assetAccount.id}}">
@ -554,6 +556,7 @@
<tr class="control-group">
<td>
<label class="control-label">{{ 'label.input.transfersinsuspense' | translate }}&nbsp;</label>
<a title="{{'label.tooltip.transfersinsuspense' | translate}}" ><i class="icon-question-sign icon-white"></i></a>
<select id="transfersInSuspenseAccountId" ng-model="formData.transfersInSuspenseAccountId" chosen="assetAccountOptions"
ng-options="assetAccount.id as assetAccount.name for assetAccount in assetAccountOptions"
value="{{assetAccount.id}}">
@ -573,6 +576,7 @@
<tr class="control-group">
<td>
<label class="control-label">{{ 'label.input.incomefrominterest' | translate }}&nbsp;</label>
<a title="{{'label.tooltip.incomefrominterest' | translate}}" ><i class="icon-question-sign icon-white"></i></a>
<select id="interestOnLoanAccountId" ng-model="formData.interestOnLoanAccountId" chosen="incomeAccountOptions"
ng-options="incomeAccount.id as incomeAccount.name for incomeAccount in incomeAccountOptions"
value="{{incomeAccount.id}}">
@ -583,6 +587,7 @@
<tr class="control-group">
<td>
<label class="control-label">{{ 'label.input.incomefromfees' | translate }}&nbsp;</label>
<a title="{{'label.tooltip.incomefromfees' | translate}}"><i class="icon-question-sign icon-white"></i></a>
<select id="incomeFromFeeAccountId" ng-model="formData.incomeFromFeeAccountId" chosen="incomeAccountOptions"
ng-options="incomeAccount.id as incomeAccount.name for incomeAccount in incomeAccountOptions"
value="{{incomeAccount.id}}">
@ -594,6 +599,7 @@
<tr class="control-group">
<td>
<label class="control-label">{{ 'label.input.incomefrompenalties' | translate }}&nbsp;</label>
<a title="{{'label.tooltip.incomefrompenalties' | translate}}" ><i class="icon-question-sign icon-white"></i></a>
<select id="incomeFromPenaltyAccountId" ng-model="formData.incomeFromPenaltyAccountId" chosen="incomeAccountOptions"
ng-options="incomeAccount.id as incomeAccount.name for incomeAccount in incomeAccountOptions"
value="{{incomeAccount.id}}">
@ -613,6 +619,7 @@
<tr class="control-group">
<td>
<label class="control-label">{{ 'label.input.loseswrittenoff' | translate }}&nbsp;</label>
<a title="{{'label.tooltip.loseswrittenoff' | translate}}" ><i class="icon-question-sign icon-white"></i></a>
<select id="writeOffAccountId" ng-model="formData.writeOffAccountId" chosen="expenseAccountOptions"
ng-options="expenseAccount.id as expenseAccount.name for expenseAccount in expenseAccountOptions"
value="{{expenseAccount.id}}">
@ -628,6 +635,7 @@
<tr>
<td>
<label class="control-label">{{ 'label.input.overpaymentliability' | translate }}&nbsp;</label>
<a title="{{'label.tooltip.overpaymentliability' | translate}}" ><i class="icon-question-sign icon-white"></i></a>
<select id="overpaymentLiabilityAccountId" ng-model="formData.overpaymentLiabilityAccountId" chosen="liabilityOptions"
ng-options="liability.id as liability.name for liability in liabilityOptions"
value="{{liability.id}}">
@ -659,9 +667,9 @@
<table class="table advacctable">
<tr class="graybg">
<th>{{'label.heading.paymenttype' | translate}}</th>
<th></th>
<th>{{'label.heading.fundsource' | translate}}</th>
<th></th>
<th>{{'label.heading.actions' | translate}}</th>
</tr>
<tr ng-repeat="configureFundOption in configureFundOptions">
@ -672,15 +680,15 @@
value="{{paymentType.id}}">
</select>
</td>
<td></td>
<td>
<select id="configureFundOptions[{{$index}}].fundSourceAccountId"
ng-model="configureFundOption.fundSourceAccountId"
ng-model="configureFundOption.fundSourceAccountId" chosen="configureFundOption.assetAccountOptions"
ng-options="assetAccount.id as assetAccount.name for assetAccount in configureFundOption.assetAccountOptions"
value="{{assetAccount.id}}">
</select>
</td>
<td></td>
<td>
<a ng-click="deleteFund($index)"><i class="icon-remove icon-white"></i></a>
</td>
@ -701,9 +709,9 @@
<table class="table advacctable">
<tr class="graybg">
<th>{{'label.heading.fees' | translate}}</th>
<th></th>
<th>{{'label.heading.incomeaccount' | translate}}</th>
<th></th>
<th>{{'label.heading.actions' | translate}}</th>
</tr>
<tr ng-repeat="specificIncomeaccount in specificIncomeaccounts">
@ -714,15 +722,15 @@
value="{{charge.id}}">
</select>
</td>
<td></td>
<td>
<select id="specificIncomeaccounts[{{$index}}].incomeAccountId"
ng-model="specificIncomeaccount.incomeAccountId"
<select id="specificIncomeaccounts[{{$index}}].incomeAccountId" style="width: 220px; !important"
ng-model="specificIncomeaccount.incomeAccountId" chosen="specificIncomeaccount.incomeAccountOptions"
ng-options="assetAccount.id as assetAccount.name for assetAccount in specificIncomeaccount.incomeAccountOptions"
value="{{assetAccount.id}}">
</select>
</td>
<td></td>
<td>
<a ng-click="deleteFee($index)"><i class="icon-remove icon-white"></i></a>
</td>
@ -743,9 +751,9 @@
<table class="table advacctable">
<tr class="graybg">
<th>{{'label.heading.penalty' | translate}}</th>
<th></th>
<th>{{'label.heading.incomeaccount' | translate}}</th>
<th></th>
<th>{{'label.heading.actions' | translate}}</th>
</tr>
<tr ng-repeat="penaltySpecificIncomeaccount in penaltySpecificIncomeaccounts">
@ -756,15 +764,15 @@
value="{{charge.id}}">
</select>
</td>
<td></td>
<td>
<select id="penaltySpecificIncomeaccounts[{{$index}}].incomeAccountId"
ng-model="penaltySpecificIncomeaccount.incomeAccountId"
ng-model="penaltySpecificIncomeaccount.incomeAccountId" chosen="penaltySpecificIncomeaccount.incomeAccountOptions"
ng-options="assetAccount.id as assetAccount.name for assetAccount in penaltySpecificIncomeaccount.incomeAccountOptions"
value="{{assetAccount.id}}">
</select>
</td>
<td></td>
<td><a ng-click="deletePenalty($index)"><i
class="icon-remove icon-white"></i></a></td>
</tr>