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

resolving merge conflicts

Browse Source
This commit is contained in:
Vishwas Babu A J 2015-03-07 19:43:59 +05:30
parent 03bac6cc36
commit db0f93a4f4
8 changed files with 1009 additions and 1074 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1267,9 +1267,9 @@
"label.input.loan.approvaldate": "Approval date",
"label.input.loan.createdondate": "Creation date",
"label.input.hide.accrual.transactions": "Hide accruals",
"label.input.createStandingInstruction": "Create Standing Instruction at Disbursement",
"label.input.instalmentinmultiplesof":"Installment in Multiples Of",
"label.input.candefineinstalmentamount":"is providing instalment amount allowed?",
"label.input.createStandingInstruction": "Create standing instructions at disbursement",
"label.input.installmentinmultiplesof":"Installment in multiples of",
"label.input.candefineinstallmentamount":"Allow fixing of the installment amount",
"#Buttons": "..",
"label.button.addloancharge": "Add Loan Charge",
@ -2714,7 +2714,7 @@
"label.input.minimum.guarantee.from.guarantor":"Minimum Guarantee from Guarantor Funds: (%)",
"validation.msg.loanproduct.mandatoryGuarantee.cannot.be.blank":"Mandatory Guarantee can't be blank",
"validation.msg.loanproduct.mandatoryGuarantee.must.be.greter.than.sum.of.min.funds":"Mandatory Guarantee must be greter than sum of minimum guarantee from own funds and guarantor funds",
"label.input.thresholdforlastinstalment":"Principal Threshold (%) for Last Instalment",
"label.input.thresholdforlastinstallment":"Principal Threshold (%) for Last Instalment",
"label.input.arrearsbasedonoriginalschedule":"Is Arrears recognization based on original schedule",
"label.input.loan.account.moves.out.of.npa.only.on.arrears.completion":"Account moves out of NPA only after all arrears have been cleared?",

4
app/scripts/controllers/product/EditLoanProductController.js
View File

@ -84,8 +84,8 @@
holdGuaranteeFunds:scope.product.holdGuaranteeFunds,
minimumDaysBetweenDisbursalAndFirstRepayment: scope.product.minimumDaysBetweenDisbursalAndFirstRepayment,
principalThresholdForLastInstalment: scope.product.principalThresholdForLastInstalment,
instalmentAmountInMultiplesOf: scope.product.instalmentAmountInMultiplesOf,
canDefineInstalmentAmount : scope.product.canDefineInstalmentAmount
installmentAmountInMultiplesOf: scope.product.installmentAmountInMultiplesOf,
canDefineInstallmentAmount : scope.product.canDefineInstallmentAmount
};
if (scope.product.isInterestRecalculationEnabled) {

2
app/views/loans/editloanaccount.html
View File

@ -246,7 +246,7 @@
ng-model="formData.graceOnArrearsAgeing"></label>
</td>
</tr>
<tr data-ng-show="loanaccountinfo.canDefineInstalmentAmount">
<tr data-ng-show="loanaccountinfo.canDefineInstallmentAmount">
<td colspan=2>
<label>{{ 'label.input.fixedemiamount' | translate }}:</label>&nbsp;
<input id="fixedEmiAmount" type="text" ng-model="formData.fixedEmiAmount" class="form-control" number-format/>&nbsp;

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

@ -257,7 +257,7 @@
<input ng-hide="response.uiDisplayConfigurations.loanAccount.isHiddenField.graceOnArrearsAgeing == true" id="graceOnArrearsAgeing" type="text" class="input-mini-small" ng-model="formData.graceOnArrearsAgeing">
</td>
</tr>
<tr data-ng-show="loanaccountinfo.canDefineInstalmentAmount">
<tr data-ng-show="loanaccountinfo.canDefineInstallmentAmount">
<td colspan=2>
<label>{{ 'label.input.fixedemiamount' | translate }}:</label>&nbsp;
<input id="fixedEmiAmount" type="text" ng-model="formData.fixedEmiAmount" class="form-control" number-format/>&nbsp;

2
app/views/loans/viewloanaccountdetails.html
View File

@ -234,7 +234,7 @@
<td>{{'label.heading.matureson' | translate}}</td>
<td><span class="padded-td">{{loandetails.timeline.expectedMaturityDate | DateFormat}}</span></td>
</tr>
<tr data-ng-show="loandetails.canDefineInstalmentAmount">
<tr data-ng-show="loandetails.canDefineInstallmentAmount">
<td>{{'label.input.fixedemiamount' | translate}}</td>
<td><span class="padded-td">{{loandetails.fixedEmiAmount| number}}</span></td>
</tr>

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

File diff suppressed because it is too large Load Diff

14
app/views/products/editloanproduct.html
View File

@ -113,10 +113,10 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">{{ 'label.input.instalmentinmultiplesof' | translate }}<span class="required">*</span></label>
<label class="control-label col-sm-2">{{ 'label.input.installmentinmultiplesof' | translate }}<span class="required">*</span></label>
<div class="col-sm-2">
<input type="text" id="instalmentAmountInMultiplesOf" class="form-control" name="instalmentAmountInMultiplesOf"
ng-model="formData.instalmentAmountInMultiplesOf"/>
<input type="text" id="installmentAmountInMultiplesOf" class="form-control" name="installmentAmountInMultiplesOf"
ng-model="formData.installmentAmountInMultiplesOf"/>
</div>
</div>
<h3>{{ 'label.heading.terms' | translate }}</h3>
@ -480,19 +480,19 @@
</div>
<div class="form-group">
<label class="control-label col-sm-2">{{ 'label.input.candefineinstalmentamount' | translate }}</label>
<label class="control-label col-sm-4">{{ 'label.input.candefineinstallmentamount' | translate }}</label>
<div class="col-sm-2">
<label class="checkbox control-label">
<input type="checkbox" ng-model="formData.canDefineInstalmentAmount"/>
<input type="checkbox" ng-model="formData.canDefineInstallmentAmount"/>
</label>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">{{ 'label.input.thresholdforlastinstalment' | translate }}</label>
<label class="control-label col-sm-4">{{ 'label.input.thresholdforlastinstallment' | translate }}</label>
<div class="col-sm-2">
<input id="principalThresholdForLastInstalment" type="text" class="form-control" ng-model="formData.principalThresholdForLastInstalment">
<input id="principalThresholdForLastInstallment" type="text" class="form-control" ng-model="formData.principalThresholdForLastInstallment">
</div>
</div>

12
app/views/products/viewloanproduct.html
View File

@ -68,8 +68,8 @@
<td colspan="3">{{loanproduct.currency.inMultiplesOf}}</td>
</tr>
<tr>
<td>{{'label.input.instalmentinmultiplesof' | translate}}</td>
<td colspan="3">{{loanproduct.instalmentAmountInMultiplesOf}}</td>
<td>{{'label.input.installmentinmultiplesof' | translate}}</td>
<td colspan="3">{{loanproduct.installmentAmountInMultiplesOf}}</td>
</tr>
<tr>
<td colspan="4"><br/></td>
@ -213,12 +213,12 @@
<td colspan="3">{{loanproduct.daysInMonthType.value}}</td>
</tr>
<tr>
<td>{{'label.input.thresholdforlastinstalment' | translate}}</td>
<td colspan="3">{{loanproduct.principalThresholdForLastInstalment}}</td>
<td>{{'label.input.thresholdforlastinstallment' | translate}}</td>
<td colspan="3">{{loanproduct.principalThresholdForLastInstallment}}</td>
</tr>
<tr>
<td>{{'label.input.candefineinstalmentamount' | translate}}</td>
<td colspan="3">{{loanproduct.canDefineInstalmentAmount | YesOrNo}}</td>
<td>{{'label.input.candefineinstallmentamount' | translate}}</td>
<td colspan="3">{{loanproduct.canDefineInstallmentAmount | YesOrNo}}</td>
</tr>
<tr>