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

bug fixes for client charges

Browse Source
This commit is contained in:
Vishwas Babu A J 2015-09-01 06:12:33 +05:30
parent 676fe41d80
commit d555fb79e6
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -925,6 +925,7 @@
"cashAtMainVault":"Main Cash Account or Cash at Vault",
"cashAtTeller":"Cash at Tellers/Cashiers",
"liabilityTransfer":"Liability Transfer",
"fundSource":"Fund Source",
"openingBalancesTransferContra":"Opening Balances Transfer Contra",
"label.thesearepredefinedpostings": "These are predefined postings",
"label.manualjournalentrytransactionsrecordedinajournal": "Manual journal entry transactions recorded in a journal",

8
app/scripts/controllers/product/EditChargeController.js
View File

@ -8,6 +8,9 @@
scope.flag = false;
resourceFactory.chargeResource.getCharge({chargeId: routeParams.id, template: true}, function (data) {
scope.template = data;
scope.incomeAccountOptions = data.incomeOrLiabilityAccountOptions.incomeAccountOptions || [];
scope.liabilityAccountOptions = data.incomeOrLiabilityAccountOptions.liabilityAccountOptions || [];
scope.incomeAndLiabilityAccountOptions = scope.incomeAccountOptions.concat(scope.liabilityAccountOptions);
if (data.chargeAppliesTo.value === "Loan") {
scope.chargeTimeTypeOptions = data.loanChargeTimeTypeOptions;
@ -24,6 +27,7 @@
scope.template.chargeCalculationTypeOptions = data.clientChargeCalculationTypeOptions;
scope.chargeTimeTypeOptions = scope.template.clientChargeTimeTypeOptions;
scope.showFrequencyOptions = false;
scope.showGLAccount = true;
}
scope.formData = {
@ -37,6 +41,10 @@
amount: data.amount
};
if(data.incomeOrLiabilityAccount){
scope.formData.incomeAccountId = data.incomeOrLiabilityAccount.id;
}
if(data.feeFrequency){
scope.addfeefrequency = 'true';
scope.formData.feeFrequency = data.feeFrequency.id;

4
app/views/products/createcharge.html
View File

@ -188,7 +188,7 @@
</div>
</div>
<div class="form-group" ng-show="showGLAccount">
<label class="control-label col-sm-2">{{ 'label.input.fundsource' | translate }}</label>
<label class="control-label col-sm-2">{{ 'label.input.incomefromfees' | translate }}</label>
<div class="col-sm-3">
<select id="incomeOrLiabilityAccountId" ng-model="formData.incomeAccountId"
chosen="incomeAndLiabilityAccountOptions"
@ -196,7 +196,7 @@
value="{{incomeAccount.id}}">
</select>
</div>
</div>
</div>
<div class="col-md-offset-3">
<a id="cancel" href="#/charges">
<button type="reset" class="btn btn-default">{{'label.button.cancel' | translate}}</button>

10
app/views/products/editcharge.html
View File

@ -153,6 +153,16 @@
</label>
</div>
</div>
<div class="form-group" ng-show="showGLAccount">
<label class="control-label col-sm-2">{{ 'label.input.incomefromfees' | translate }}</label>
<div class="col-sm-3">
<select id="incomeOrLiabilityAccountId" ng-model="formData.incomeAccountId"
chosen="incomeAndLiabilityAccountOptions"
ng-options="incomeAccount.id as incomeAccount.name for incomeAccount in incomeAndLiabilityAccountOptions"
value="{{incomeAccount.id}}">
</select>
</div>
</div>
<div class="col-md-offset-3">
<a id="cancel" href="#/viewcharge/{{template.id}}" class="btn btn-default">{{'label.button.cancel' | translate}}</a>
<button id="save" type="submit" class="btn btn-primary" has-permission='UPDATE_CHARGE'>{{'label.button.save' | translate}}</button>