Skip to content

Commit 8cfdd0a

Browse files
authored
Merge branch 'dev' into WEB-1037-playwright-add-client-action-page-objects-seeded-factory-with-state-overrides-and-api-setup-manager-get-client-template
2 parents c792443 + a2cbe85 commit 8cfdd0a

1 file changed

Lines changed: 40 additions & 42 deletions

File tree

src/app/loans/loans-view/charges-tab/charges-tab.component.html

Lines changed: 40 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -269,49 +269,47 @@
269269
{{ 'labels.inputs.Actions' | translate }}
270270
</th>
271271
<td mat-cell *matCellDef="let charge" class="col-c" (click)="$event.stopPropagation()">
272-
@if (!isPaid(charge) && !isWaived(charge)) {
273-
<div class="act-group">
274-
<button
275-
mat-icon-button
276-
type="button"
277-
[matMenuTriggerFor]="chargeMenu"
278-
[attr.aria-label]="'labels.inputs.Actions' | translate"
279-
>
280-
<mat-icon>more_vert</mat-icon>
281-
</button>
272+
<div class="act-group">
273+
<button
274+
mat-icon-button
275+
type="button"
276+
[matMenuTriggerFor]="chargeMenu"
277+
[attr.aria-label]="'labels.inputs.Actions' | translate"
278+
>
279+
<mat-icon>more_vert</mat-icon>
280+
</button>
282281

283-
<mat-menu #chargeMenu="matMenu" class="charge-actions-menu">
284-
@if (status === 'Active' && !charge.paid) {
285-
<button mat-menu-item (click)="adjustCharge(charge.id)">
286-
<mat-icon matMenuItemIcon>tune</mat-icon>
287-
{{ 'tooltips.Adjust Charge' | translate }}
288-
</button>
289-
}
290-
@if (status === 'Submitted and pending approval') {
291-
<button mat-menu-item (click)="editCharge(charge)">
292-
<mat-icon matMenuItemIcon>edit</mat-icon>
293-
{{ 'tooltips.Edit Charge' | translate }}
294-
</button>
295-
<button mat-menu-item class="menu-item-danger" (click)="deleteCharge(charge.id)">
296-
<mat-icon matMenuItemIcon>delete</mat-icon>
297-
{{ 'labels.buttons.Delete' | translate }}
298-
</button>
299-
}
300-
@if (charge.chargePayable && !charge.paid && status === 'Active') {
301-
<button mat-menu-item (click)="payCharge(charge.id)">
302-
<mat-icon matMenuItemIcon>payments</mat-icon>
303-
{{ 'labels.buttons.Pay Charge' | translate }}
304-
</button>
305-
}
306-
@if (!charge.actionFlag) {
307-
<button mat-menu-item (click)="waiveCharge(charge.id)">
308-
<mat-icon matMenuItemIcon>check_circle</mat-icon>
309-
{{ 'labels.buttons.Waive Charge' | translate }}
310-
</button>
311-
}
312-
</mat-menu>
313-
</div>
314-
}
282+
<mat-menu #chargeMenu="matMenu" class="charge-actions-menu">
283+
@if (status === 'Active') {
284+
<button mat-menu-item (click)="adjustCharge(charge.id)">
285+
<mat-icon matMenuItemIcon>tune</mat-icon>
286+
{{ 'tooltips.Adjust Charge' | translate }}
287+
</button>
288+
}
289+
@if (status === 'Submitted and pending approval') {
290+
<button mat-menu-item (click)="editCharge(charge)">
291+
<mat-icon matMenuItemIcon>edit</mat-icon>
292+
{{ 'tooltips.Edit Charge' | translate }}
293+
</button>
294+
<button mat-menu-item class="menu-item-danger" (click)="deleteCharge(charge.id)">
295+
<mat-icon matMenuItemIcon>delete</mat-icon>
296+
{{ 'labels.buttons.Delete' | translate }}
297+
</button>
298+
}
299+
@if (charge.chargePayable && !charge.paid && status === 'Active') {
300+
<button mat-menu-item (click)="payCharge(charge.id)">
301+
<mat-icon matMenuItemIcon>payments</mat-icon>
302+
{{ 'labels.buttons.Pay Charge' | translate }}
303+
</button>
304+
}
305+
@if (!charge.actionFlag) {
306+
<button mat-menu-item (click)="waiveCharge(charge.id)">
307+
<mat-icon matMenuItemIcon>check_circle</mat-icon>
308+
{{ 'labels.buttons.Waive Charge' | translate }}
309+
</button>
310+
}
311+
</mat-menu>
312+
</div>
315313
</td>
316314
</ng-container>
317315

0 commit comments

Comments
 (0)