feat:Unificaction of radhathakare's PR (#1879)
* feat:Clients Translate Module * feat: Collections Translate Module * feat:Loan Translate Module * feat:Search Translate Module * feat English Json File --------- Co-authored-by: radhathakare <radhathakare322@gmail.com>
This commit is contained in:
Francisco Cuandon
co-authored by
radhathakare
radhathakare
parent
3e1067bfc6
commit
d92f6c1c5e
+7
-7
@@ -2,39 +2,39 @@
|
||||
|
||||
<div style="margin-top: 5px;">
|
||||
|
||||
<h2> Charges Overview</h2>
|
||||
<h2>{{ "labels.heading.Charges Overview" |translate}}</h2>
|
||||
|
||||
<table mat-table [dataSource]="dataSource">
|
||||
|
||||
<ng-container matColumnDef="name">
|
||||
<th mat-header-cell *matHeaderCellDef> Name </th>
|
||||
<th mat-header-cell *matHeaderCellDef> {{ "labels.inputs.name" |translate}} </th>
|
||||
<td mat-cell *matCellDef="let chargeOverviewData"><i class="fa fa-stop"
|
||||
[ngClass]="(!(chargeOverviewData.isWaived || chargeOverviewData.isPaid))|statusLookup"></i>
|
||||
{{chargeOverviewData.name}} </td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="dueAsOf">
|
||||
<th mat-header-cell *matHeaderCellDef> Due as of </th>
|
||||
<th mat-header-cell *matHeaderCellDef> {{ "labels.inputs.Due as of" |translate}} </th>
|
||||
<td mat-cell *matCellDef="let chargeOverviewData"> {{chargeOverviewData.dueDate | dateFormat}} </td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="due">
|
||||
<th mat-header-cell *matHeaderCellDef> Due </th>
|
||||
<th mat-header-cell *matHeaderCellDef> {{ "labels.inputs.Due" |translate}} </th>
|
||||
<td mat-cell *matCellDef="let chargeOverviewData"> {{chargeOverviewData.amount}} </td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="paid">
|
||||
<th mat-header-cell *matHeaderCellDef> Paid </th>
|
||||
<th mat-header-cell *matHeaderCellDef> {{ "labels.inputs.Paid" |translate}} </th>
|
||||
<td mat-cell *matCellDef="let chargeOverviewData"> {{chargeOverviewData.amountPaid}} </td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="waived">
|
||||
<th mat-header-cell *matHeaderCellDef> Waived </th>
|
||||
<th mat-header-cell *matHeaderCellDef> {{ "labels.inputs.Waived" |translate}} </th>
|
||||
<td mat-cell *matCellDef="let chargeOverviewData"> {{chargeOverviewData.amountWaived}} </td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="outstanding">
|
||||
<th mat-header-cell *matHeaderCellDef> Outstanding </th>
|
||||
<th mat-header-cell *matHeaderCellDef> {{ "labels.inputs.Outstanding" |translate}} </th>
|
||||
<td mat-cell *matCellDef="let chargeOverviewData"> {{chargeOverviewData.amountOutstanding}} </td>
|
||||
</ng-container>
|
||||
|
||||
|
||||
+6
-6
@@ -7,28 +7,28 @@
|
||||
<div fxLayout="column">
|
||||
|
||||
<mat-form-field>
|
||||
<mat-label> Amount </mat-label>
|
||||
<mat-label> {{ "labels.inputs.Amount" |translate}} </mat-label>
|
||||
<input matInput required autofocus formControlName="amount">
|
||||
<mat-error *ngIf="transactionForm.controls.amount.hasError('required')">
|
||||
Amount <strong>is required</strong>
|
||||
{{ "labels.inputs.Amount" |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field (click)="transactionDatePicker.open()">
|
||||
<mat-label> Transaction date </mat-label>
|
||||
<mat-label> {{ "labels.inputs.Transaction date" |translate}} </mat-label>
|
||||
<input matInput [min]="minDate" [matDatepicker]="transactionDatePicker" required formControlName="transactionDate">
|
||||
<mat-datepicker-toggle matSuffix [for]="transactionDatePicker"></mat-datepicker-toggle>
|
||||
<mat-datepicker #transactionDatePicker></mat-datepicker>
|
||||
<mat-error *ngIf="transactionForm.controls.transactionDate.hasError('required')">
|
||||
Transaction date <strong>is required</strong>
|
||||
{{ "labels.inputs.Transaction date" |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
</div>
|
||||
|
||||
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="5px">
|
||||
<button type="button" mat-raised-button [routerLink]="['../../..','general']">Cancel</button>
|
||||
<button mat-raised-button color="primary" [disabled]="!transactionForm.valid">Submit</button>
|
||||
<button type="button" mat-raised-button [routerLink]="['../../..','general']">{{ "labels.buttons.Cancel" | translate}}</button>
|
||||
<button mat-raised-button color="primary" [disabled]="!transactionForm.valid">{{ "labels.buttons.Submit" | translate}}</button>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
|
||||
<button mat-raised-button color="primary" [routerLink]="['pay']" *mifosxHasPermission="'PAY_CLIENTCHARGE'">
|
||||
<fa-icon icon="dollar-sign" class="m-r-10"></fa-icon>
|
||||
Pay
|
||||
{{ "labels.buttons.Pay" | translate}}
|
||||
</button>
|
||||
<button mat-raised-button color="primary" (click)="waiveCharge()" *mifosxHasPermission="'WAIVE_CLIENTCHARGE'">
|
||||
<i class="fa fa-flag"></i>
|
||||
Waive Charge
|
||||
{{ "labels.buttons.Waive Charge" | translate}}
|
||||
</button>
|
||||
<button mat-raised-button color="primary" (click)="deleteCharge()">
|
||||
<fa-icon icon="trash" class="m-r-10"></fa-icon>
|
||||
Delete
|
||||
{{ "labels.buttons.Delete" | translate}}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
@@ -32,41 +32,41 @@
|
||||
<tbody>
|
||||
|
||||
<tr>
|
||||
<td> Currency </td>
|
||||
<td> {{ "labels.inputs.Currency" |translate}} </td>
|
||||
<td> {{ chargeData.currency.name }} </td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td> Charge Time Type </td>
|
||||
<td> {{ "labels.inputs.Charge Time Type" |translate}} </td>
|
||||
<td> {{ chargeData.chargeTimeType.value }} </td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td> Charge Calculation Type </td>
|
||||
<td> {{ "labels.inputs.Charge Calculation Type" |translate}} </td>
|
||||
<td> {{ chargeData.chargeCalculationType.value }} </td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td> Due as of </td>
|
||||
<td> {{ "labels.inputs.Due as of" |translate}} </td>
|
||||
<td> {{ chargeData.dueDate | dateFormat }} </td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td> Due </td>
|
||||
<td> {{ "labels.inputs.Due" |translate}} </td>
|
||||
<td> {{ chargeData.amount }} </td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td> Paid </td>
|
||||
<td> {{ "labels.inputs.Paid" |translate}} </td>
|
||||
<td> {{ chargeData.amountPaid }} </td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td> Waived </td>
|
||||
<td> {{ "labels.inputs.Waived" |translate}} </td>
|
||||
<td> {{ chargeData.amountWaived }} </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> Outstanding </td>
|
||||
<td> {{ "labels.inputs.Outstanding" |translate}} </td>
|
||||
<td> {{ chargeData.amountOutstanding }} </td>
|
||||
</tr>
|
||||
|
||||
@@ -79,36 +79,36 @@
|
||||
</mat-card-content>
|
||||
|
||||
<div fxLayout="row wrap" class="content" style="padding-top:10px">
|
||||
<h1><b> Transactions </b></h1>
|
||||
<h1><b> {{ "labels.heading.Transactions" |translate}} </b></h1>
|
||||
|
||||
<table mat-table [dataSource]="chargeData.clientTransactionDatas" *ngIf="chargeData.clientTransactionDatas">
|
||||
|
||||
<ng-container matColumnDef="id">
|
||||
<th mat-header-cell *matHeaderCellDef> ID </th>
|
||||
<th mat-header-cell *matHeaderCellDef> {{ "labels.inputs.ID" |translate}} </th>
|
||||
<td mat-cell *matCellDef="let element" [ngClass]="{'strikeoff':element.reversed}"> {{element.id}} </td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="officeName">
|
||||
<th mat-header-cell *matHeaderCellDef> Office Name </th>
|
||||
<th mat-header-cell *matHeaderCellDef> {{ "labels.inputs.Office Name" |translate}} </th>
|
||||
<td mat-cell *matCellDef="let element" [ngClass]="{'strikeoff':element.reversed}"> {{element.officeName }} </td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="type">
|
||||
<th mat-header-cell *matHeaderCellDef> Type </th>
|
||||
<th mat-header-cell *matHeaderCellDef> {{ "labels.inputs.Type" |translate}} </th>
|
||||
<td mat-cell *matCellDef="let element" [ngClass]="{'strikeoff':element.reversed}"> {{element.type.value}} </td>
|
||||
</ng-container>
|
||||
<ng-container matColumnDef="transactionDate">
|
||||
<th mat-header-cell *matHeaderCellDef> Transaction Date </th>
|
||||
<th mat-header-cell *matHeaderCellDef> {{ "labels.inputs.Transaction Date" |translate}} </th>
|
||||
<td mat-cell *matCellDef="let element" [ngClass]="{'strikeoff':element.reversed}"> {{element.date | dateFormat}} </td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="amount">
|
||||
<th mat-header-cell *matHeaderCellDef> Amount </th>
|
||||
<th mat-header-cell *matHeaderCellDef> {{ "labels.inputs.Amount" |translate}} </th>
|
||||
<td mat-cell *matCellDef="let element" [ngClass]="{'strikeoff':element.reversed}"> {{element.amount | formatNumber }} </td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="actions">
|
||||
<th mat-header-cell *matHeaderCellDef> Actions </th>
|
||||
<th mat-header-cell *matHeaderCellDef> {{ "labels.inputs.Actions" |translate}} </th>
|
||||
<td mat-cell *matCellDef="let element" [ngClass]="{'strikeoff':element.reversed}">
|
||||
<button mat-raised-button color="primary" (click)="undoTransaction(element.id)" class="delBtn">
|
||||
<fa-icon icon="trash" class="m-r-10"></fa-icon>
|
||||
@@ -124,7 +124,7 @@
|
||||
|
||||
|
||||
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
|
||||
<button type="button" mat-raised-button [routerLink]="['../../','general']">Back</button>
|
||||
<button type="button" mat-raised-button [routerLink]="['../../','general']">{{ "labels.buttons.Back" | translate}}</button>
|
||||
</mat-card-actions>
|
||||
|
||||
</mat-card>
|
||||
|
||||
Reference in New Issue
Block a user