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

client-fees UI fixes

Browse Source
This commit is contained in:
Vishwas Babu A J 2015-09-06 00:06:06 +05:30
parent 6da31b7998
commit 09aae099df
11 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2724,6 +2724,7 @@
"label.input.incomefrominterest": "Income from interest",
"label.input.interest.on.overdrafts": "Overdraft Interest Income",
"label.input.incomefromfees": "Income from fees",
"label.input.incomefromcharges" : "Income from charge",
"label.input.recoverypayments": "Income from Recovery Repayments",
"label.input.incomefrompenalties": "Income from penalties",
"label.input.loseswrittenoff": "Losses written off",

2
app/scripts/controllers/client/ViewClientController.js
View File

@ -514,7 +514,7 @@
scope.waiveCharge = function(chargeId){
resourceFactory.clientChargesResource.waive({clientId: routeParams.id, resourceType:chargeId}, function (data) {
location.path('/viewclient/'+ scope.client.id);
route.reload();
});
}

1
app/views/clients/addnewclientcharge.html
View File

@ -1,5 +1,6 @@
<div class="paddedbottom10">
<ul class="breadcrumb">
<li><a ng-href="#/viewclient/{{clientId}}">{{'label.anchor.viewclient' | translate}}</a></li>
<li class="active">{{ 'label.anchor.addclientcharge' | translate }}</li>
</ul>
</div>

6
app/views/clients/clientchargeoverview.html
View File

@ -1,7 +1,7 @@
<div ng-controller="ClientChargesOverviewController">
<div>
<ul class="breadcrumb">
<li><a ng-href="#/viewclient/{{clientId}}">{{'label.anchor.clients' | translate}}</a></li>
<li><a ng-href="#/viewclient/{{clientId}}">{{'label.anchor.viewclient' | translate}}</a></li>
<li class="active">{{label.heading.charges | translate}}</li>
</ul>
</div>
@ -19,7 +19,9 @@
</tr>
<tr class="pointer-main" dir-paginate="charge in charges | itemsPerPage: chargesPerPage"
total-items="totalCharges" pagination-id="chargesPage">
<td class="pointer" data-ng-click="routeToCharge(charge.id)">{{charge.name}}</td>
<td class="pointer" data-ng-click="routeToCharge(charge.id)"><i
class="icon-stop {{ (!(charge.isWaived || charge.isPaid)) |StatusLookup}}"></i>&nbsp;{{charge.name}}
</td>
<td class="pointer" data-ng-click="routeToCharge(charge.id)">{{charge.dueDate|DateFormat}}</td>
<td class="pointer" data-ng-click="routeToCharge(charge.id)">{{charge.amount | number}}</td>
<td class="pointer" data-ng-click="routeToCharge(charge.id)">{{charge.amountPaid | number}}</td>

44
app/views/clients/payclientcharge.html
View File

@ -1,19 +1,22 @@
<div class="paddedbottom10">
<ul class="breadcrumb">
<li class="active">{{ 'label.anchor.addclientcharge' | translate }}</li>
</ul>
</div>
<form name="payclientchargeform" novalidate="" class="form-horizontal" ng-controller="PayClientChargeController"
rc-submit="submit()">
<api-validate></api-validate>
<fieldset>
<div ng-controller="PayClientChargeController">
<div class="paddedbottom10">
<ul class="breadcrumb">
<li><a ng-href="#/viewclient/{{clientId}}">{{'label.anchor.viewclient' | translate}}</a></li>
<li class="active">{{ 'label.anchor.addclientcharge' | translate }}</li>
</ul>
</div>
<form name="payclientchargeform" novalidate="" class="form-horizontal"
rc-submit="submit()">
<api-validate></api-validate>
<fieldset>
<div class="form-group">
<label class="control-label col-sm-2">{{ 'label.input.amount' | translate }}<span
class="required">*</span></label>
<div class="col-sm-3">
<input id="amount" type="text" name="amount" ng-model="formData.amount" class="form-control" required ng-late-Validate/>
<input id="amount" type="text" name="amount" ng-model="formData.amount" class="form-control"
required ng-late-Validate/>
<form-validate valattributeform="payclientchargeform" valattribute="amount"/>
</div>
</div>
@ -23,17 +26,20 @@
class="required">*</span></label>
<div class="col-sm-3">
<input sort type="text" datepicker-pop={{df}}
<input sort type="text" datepicker-pop={{df}}
ng-model="paymentDate" is-open="opened" class="form-control"/>
</div>
</div>
</div>
<div class="col-md-offset-3">
<a id="cancel" href="#/viewclient/{{cancelRoute}}" class="btn btn-default">{{'label.button.cancel' |
translate}}</a>
<button id="save" type="submit" class="btn btn-primary" has-permission='PAY_CLIENTCHARGE'>{{'label.button.save' | translate}}</button>
</div>
</fieldset>
</form>
<div class="col-md-offset-3">
<a id="cancel" href="#/viewclient/{{cancelRoute}}" class="btn btn-default">{{'label.button.cancel' |
translate}}</a>
<button id="save" type="submit" class="btn btn-primary" has-permission='PAY_CLIENTCHARGE'>
{{'label.button.save' |
translate}}
</button>
</div>
</fieldset>
</form>
</div>

2
app/views/clients/viewclient.html
View File

@ -236,7 +236,7 @@
</tr>
<tr class="pointer-main" ng-repeat="charge in charges">
<td class="pointer" data-ng-click="routeToCharge(charge.id)">
<i class="icon-circle {{charge.isWaived || charge.isPaid|StatusLookup}}" ></i>&nbsp;{{charge.name}}
<i class="icon-stop {{ (!(charge.isWaived || charge.isPaid)) |StatusLookup}}" ></i>&nbsp;{{charge.name}}
</td>
<td class="pointer" data-ng-click="routeToCharge(charge.id)">{{charge.dueDate|DateFormat}}</td>
<td class="pointer" data-ng-click="routeToCharge(charge.id)">{{charge.amount | number}}</td>

5
app/views/clients/viewclientcharge.html
View File

@ -1,11 +1,12 @@
<div ng-controller="ViewClientChargeController">
<div class="paddedbottom10">
<ul class="breadcrumb">
<li><a ng-href="#/viewclient/{{clientId}}">{{'label.anchor.viewclient' | translate}}</a></li>
<li class="active">{{ 'label.anchor.viewcharge' | translate }}</li>
</ul>
</div>
<div class="well">
<h3 class="bolder">{{charge.name}}
<h3 class="bolder"><i class="icon-stop {{ (!(charge.isWaived || charge.isPaid)) |StatusLookup}}"></i>&nbsp;&nbsp;{{charge.name}}
<div class="btn-group pull-right">
<a tooltip="{{'label.button.paycharge' | translate}}" ng-show="!charge.isPaid && !charge.isWaived"
has-permission='PAY_CLIENTCHARGE' ng-href="#/viewclient/{{clientId}}/paycharge/{{charge.id}}"
@ -65,7 +66,7 @@
</div>
</div>
<div class="row">
<h3>Transactions</h3>
<h3>{{ 'label.heading.transactions' | translate}}</h3>
<table id="transactionsTable" data-ng-show="charge.clientTransactionDatas.length > 0"
class="table table-condensed">
<tr class="graybg">

2
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.incomefromfees' | translate }}</label>
<label class="control-label col-sm-2">{{ 'label.input.incomefromcharges' | translate }}</label>
<div class="col-sm-3">
<select id="incomeOrLiabilityAccountId" ng-model="formData.incomeAccountId"
chosen="incomeAndLiabilityAccountOptions"

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

@ -154,7 +154,7 @@
</div>
</div>
<div class="form-group" ng-show="showGLAccount">
<label class="control-label col-sm-2">{{ 'label.input.incomefromfees' | translate }}</label>
<label class="control-label col-sm-2">{{ 'label.input.incomefromcharges' | translate }}</label>
<div class="col-sm-3">
<select id="incomeOrLiabilityAccountId" ng-model="formData.incomeAccountId"
chosen="incomeAndLiabilityAccountOptions"

2
app/views/products/viewcharge.html
View File

@ -73,7 +73,7 @@
<td>{{charge.feeInterval}}</td>
</tr>
<tr ng-show="charge.incomeOrLiabilityAccount">
<td>{{'label.heading.incomefromfees' | translate}}</td>
<td>{{'label.input.incomefromcharges' | translate}}</td>
<td>{{charge.incomeOrLiabilityAccount.name}} ({{charge.incomeOrLiabilityAccount.glCode}})</td>
</tr>
</table>

2
app/views/savings/edit_saving_account_application.html
View File

@ -27,7 +27,7 @@
</td>
<td class="width36 paddedbottom10">
<input ng-show="formData.productId" id="submittedOnDate" sort type="text" datepicker-pop="dd MMMM yyyy"
ng-model="date.submittedOnDate" is-open="opened" min="minDate" max="restrictDate"
ng-model="formData.submittedOnDate" is-open="opened" min="minDate" max="restrictDate"
class="form-control"/>
</td>
</tr>