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

MIFOSX-1310,MIFOSX-1304,MIFOSX-1280,MIFOSX-1279

Browse Source
This commit is contained in:
Madhukar 2014-06-10 11:23:28 +05:30
parent 9abe737493
commit 87f797efe8
6 changed files with 79 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1419,7 +1419,7 @@
"label.input.interestcalculatedusing": "Interest calculated using",
"label.input.daysinyears": "Days in years",
"label.input.minimumopeningbalance": "Minimum opening balance",
"label.input.lockinPeriodFrequency": "Locking period frequency",
"label.input.lockinPeriodFrequency": "Lock-in period",
"label.input.withdrawalfeefortransfers": "Apply Withdrawal fee for transfers",
"label.input.savingaccountapprovedOnDate": "Approved on",
"label.input.rejectedon": "Rejected on",
@ -1670,6 +1670,7 @@
"error.msg.recurring.deposit.account.cannot.create.not.belongs.to.any.groups.to.follow.meeting.frequency":"Cannot create Recurring deposit. Client does not belongs to any group to follow meeting frequency.",
"validation.msg.fixeddepositaccount.submittedOnDate.cannot.be.blank":"Submitted on date is mandatory.",
"error.msg.officeToAccountMapping.not.found":"Mapping for office with Id `{{params[0].value}}` does not exist for an account of type `{{params[1].value}}`",
"-------": "------------",
@ -1968,7 +1969,7 @@
"interestCompoundingPeriodType":"Interest Compounding Period",
"interestPostingPeriodType":"Interest Posting Period",
"interestCalculationType":"Interest Calculation Method",
"lockinPeriodFrequencyType":"Lockin Period Frequency",
"lockinPeriodFrequencyType":"Lock-in Period",
"minDepositTermTypeId":"Min Deposit Term Frequency",
"maxDepositTermTypeId":"Max Deposit Term Frequency",
"inMultiplesOfDepositTermTypeId":"InMultiples Of Deposit Term Frequency",
@ -2144,7 +2145,7 @@
"label.heading.interestcalculatedusing": "Interest Calculated Using",
"label.heading.daysinyears": "Days in Years",
"label.heading.minimumopeningbalance": "Minimum Opening Balance",
"label.heading.lockinPeriodFrequency": "Locking Period Frequency",
"label.heading.lockinPeriodFrequency": "Lock-in Period",
"label.heading.withdrawfee": "Withdraw Fee",
"label.heading.annualfee": "Annual Fee",
"label.heading.annualfeeon": "Annual Fee On",
@ -2308,6 +2309,8 @@
"label.fixeddepositproduct.def":"Add, modify or inactivate a Fixed deposit product",
"label.prematureclosure":"For Pre-mature Closure:",
"label.recurringdepositproduct.def":"Add, modify or inactivate a Recurring Deposit product",
"label.mandatory":"Mandatory",
"label.voluntary":"Voluntary",
"#Enumeration & Error Messages": "..",

62
app/scripts/controllers/product/EditFixedDepositProductController.js
View File

@ -78,39 +78,41 @@
scope.formData.lockinPeriodFrequencyType = data.lockinPeriodFrequencyType.id;
}
scope.formData.savingsReferenceAccountId = data.accountingMappings.savingsReferenceAccount.id;
scope.formData.savingsControlAccountId = data.accountingMappings.savingsControlAccount.id;
scope.formData.transfersInSuspenseAccountId = data.accountingMappings.transfersInSuspenseAccount.id;
scope.formData.incomeFromFeeAccountId = data.accountingMappings.incomeFromFeeAccount.id;
scope.formData.incomeFromPenaltyAccountId = data.accountingMappings.incomeFromPenaltyAccount.id;
scope.formData.interestOnSavingsAccountId = data.accountingMappings.interestOnSavingsAccount.id;
if (scope.formData.accountingRule == 2) {
scope.formData.savingsReferenceAccountId = data.accountingMappings.savingsReferenceAccount.id;
scope.formData.savingsControlAccountId = data.accountingMappings.savingsControlAccount.id;
scope.formData.transfersInSuspenseAccountId = data.accountingMappings.transfersInSuspenseAccount.id;
scope.formData.incomeFromFeeAccountId = data.accountingMappings.incomeFromFeeAccount.id;
scope.formData.incomeFromPenaltyAccountId = data.accountingMappings.incomeFromPenaltyAccount.id;
scope.formData.interestOnSavingsAccountId = data.accountingMappings.interestOnSavingsAccount.id;
_.each(scope.product.paymentChannelToFundSourceMappings, function (fundSource) {
scope.configureFundOptions.push({
paymentTypeId: fundSource.paymentType.id,
fundSourceAccountId: fundSource.fundSourceAccount.id,
paymentTypeOptions: scope.product.paymentTypeOptions,
assetAccountOptions: scope.assetAccountOptions
})
});
_.each(scope.product.paymentChannelToFundSourceMappings, function (fundSource) {
scope.configureFundOptions.push({
paymentTypeId: fundSource.paymentType.id,
fundSourceAccountId: fundSource.fundSourceAccount.id,
paymentTypeOptions: scope.product.paymentTypeOptions,
assetAccountOptions: scope.assetAccountOptions
})
});
_.each(scope.product.feeToIncomeAccountMappings, function (fees) {
scope.specificIncomeaccounts.push({
chargeId: fees.charge.id,
incomeAccountId: fees.incomeAccount.id,
chargeOptions: scope.product.chargeOptions,
incomeAccountOptions: scope.incomeAccountOptions
})
});
_.each(scope.product.feeToIncomeAccountMappings, function (fees) {
scope.specificIncomeaccounts.push({
chargeId: fees.charge.id,
incomeAccountId: fees.incomeAccount.id,
chargeOptions: scope.product.chargeOptions,
incomeAccountOptions: scope.incomeAccountOptions
})
});
_.each(scope.product.penaltyToIncomeAccountMappings, function (penalty) {
scope.penaltySpecificIncomeaccounts.push({
chargeId: penalty.charge.id,
incomeAccountId: penalty.incomeAccount.id,
penaltyOptions: scope.product.penaltyOptions,
incomeAccountOptions: scope.incomeAccountOptions
})
});
_.each(scope.product.penaltyToIncomeAccountMappings, function (penalty) {
scope.penaltySpecificIncomeaccounts.push({
chargeId: penalty.charge.id,
incomeAccountId: penalty.incomeAccount.id,
penaltyOptions: scope.product.penaltyOptions,
incomeAccountOptions: scope.incomeAccountOptions
})
});
}
});
//advanced accounting rule

63
app/scripts/controllers/product/EditRecurringDepositProductController.js
View File

@ -76,40 +76,41 @@
scope.formData.lockinPeriodFrequencyType = data.lockinPeriodFrequencyType.id;
}
scope.formData.savingsReferenceAccountId = data.accountingMappings.savingsReferenceAccount.id;
scope.formData.savingsControlAccountId = data.accountingMappings.savingsControlAccount.id;
scope.formData.transfersInSuspenseAccountId = data.accountingMappings.transfersInSuspenseAccount.id;
scope.formData.incomeFromFeeAccountId = data.accountingMappings.incomeFromFeeAccount.id;
scope.formData.incomeFromPenaltyAccountId = data.accountingMappings.incomeFromPenaltyAccount.id;
scope.formData.interestOnSavingsAccountId = data.accountingMappings.interestOnSavingsAccount.id;
if (scope.formData.accountingRule == 2) {
scope.formData.savingsReferenceAccountId = data.accountingMappings.savingsReferenceAccount.id;
scope.formData.savingsControlAccountId = data.accountingMappings.savingsControlAccount.id;
scope.formData.transfersInSuspenseAccountId = data.accountingMappings.transfersInSuspenseAccount.id;
scope.formData.incomeFromFeeAccountId = data.accountingMappings.incomeFromFeeAccount.id;
scope.formData.incomeFromPenaltyAccountId = data.accountingMappings.incomeFromPenaltyAccount.id;
scope.formData.interestOnSavingsAccountId = data.accountingMappings.interestOnSavingsAccount.id;
_.each(scope.product.paymentChannelToFundSourceMappings, function (fundSource) {
scope.configureFundOptions.push({
paymentTypeId: fundSource.paymentType.id,
fundSourceAccountId: fundSource.fundSourceAccount.id,
paymentTypeOptions: scope.product.paymentTypeOptions,
assetAccountOptions: scope.assetAccountOptions
})
});
_.each(scope.product.paymentChannelToFundSourceMappings, function (fundSource) {
scope.configureFundOptions.push({
paymentTypeId: fundSource.paymentType.id,
fundSourceAccountId: fundSource.fundSourceAccount.id,
paymentTypeOptions: scope.product.paymentTypeOptions,
assetAccountOptions: scope.assetAccountOptions
})
});
_.each(scope.product.feeToIncomeAccountMappings, function (fees) {
scope.specificIncomeaccounts.push({
chargeId: fees.charge.id,
incomeAccountId: fees.incomeAccount.id,
chargeOptions: scope.product.chargeOptions,
incomeAccountOptions: scope.incomeAccountOptions
})
});
_.each(scope.product.penaltyToIncomeAccountMappings, function (penalty) {
scope.penaltySpecificIncomeaccounts.push({
chargeId: penalty.charge.id,
incomeAccountId: penalty.incomeAccount.id,
penaltyOptions: scope.product.penaltyOptions,
incomeAccountOptions: scope.incomeAccountOptions
})
});
_.each(scope.product.feeToIncomeAccountMappings, function (fees) {
scope.specificIncomeaccounts.push({
chargeId: fees.charge.id,
incomeAccountId: fees.incomeAccount.id,
chargeOptions: scope.product.chargeOptions,
incomeAccountOptions: scope.incomeAccountOptions
})
});
_.each(scope.product.penaltyToIncomeAccountMappings, function (penalty) {
scope.penaltySpecificIncomeaccounts.push({
chargeId: penalty.charge.id,
incomeAccountId: penalty.incomeAccount.id,
penaltyOptions: scope.product.penaltyOptions,
incomeAccountOptions: scope.incomeAccountOptions
})
});
}
});
//advanced accounting rule

2
app/scripts/modules/notificationWidget.js
View File

@ -72,8 +72,6 @@ angular.module('notificationWidget', [])
$rootScope.errorStatus = 'No connection. Verify application is running.';
} else if (response.status == 401) {
$rootScope.errorStatus = 'Unauthorized';
} else if (response.status == 404) {
$rootScope.errorStatus = 'Requested page not found. [404]';
} else if (response.status == 405) {
$rootScope.errorStatus = 'HTTP verb not supported [405]';
} else if (response.status == 500) {

6
app/views/products/editrecurringdepositproduct.html
View File

@ -164,7 +164,7 @@
<div class="col-sm-2">
<select id="minDepositTermTypeId" ng-model="formData.minDepositTermTypeId"
class="form-control"
ng-options="type.id as type.value for type in product.depositTermTypeOptions"
ng-options="type.id as type.value for type in product.periodFrequencyTypeOptions"
value="{{type.id}}">
<option class="displaynone" value="">{{'label.selectone' | translate}}</option>
</select>
@ -179,7 +179,7 @@
<div class="col-sm-2">
<select id="inMultiplesOfDepositTermTypeId" ng-model="formData.inMultiplesOfDepositTermTypeId"
class="form-control"
ng-options="type.id as type.value for type in product.inMultiplesOfDepositTermTypeOptions"
ng-options="type.id as type.value for type in product.periodFrequencyTypeOptions"
value="{{type.id}}">
<option class="displaynone" value="">{{'label.selectone' | translate}}</option>
</select>
@ -191,7 +191,7 @@
<div class="col-sm-2">
<select id="maxDepositTermTypeId" ng-model="formData.maxDepositTermTypeId"
class="form-control"
ng-options="type.id as type.value for type in product.depositTermTypeOptions"
ng-options="type.id as type.value for type in product.periodFrequencyTypeOptions"
value="{{type.id}}">
<option class="displaynone" value="">{{'label.selectone' | translate}}</option>
</select>

9
app/views/products/viewrecurringdepositproduct.html
View File

@ -109,14 +109,17 @@
</tr>
<tr>
<td>{{'label.heading.recurringdeposittype' | translate}}</td>
<td>{{depositproduct.recurringDepositType.value}}</td>
<td>
<div data-ng-show="depositproduct.isMandatoryDeposit">{{'label.mandatory' | translate}}</div>
<div data-ng-show="!depositproduct.isMandatoryDeposit">{{'label.voluntary' | translate}}</div>
</td>
</tr>
<tr>
<!--<tr>
<td>{{'label.heading.recurringdepositfrequency' | translate}}</td>
<td>Every &nbsp; &nbsp; &nbsp; {{depositproduct.recurringDepositFrequency}} &nbsp; &nbsp;
{{depositproduct.recurringDepositFrequencyType.value}}
</td>
</tr>
</tr>-->
<!--<tr>
<td>{{'label.heading.interestfreeperiodapplicable' | translate}}</td>
<td>from &nbsp; {{depositproduct.interestFreeFromPeriod}} &nbsp;&nbsp; - {{depositproduct.interestFreeToPeriod}}