Feature: Cancelled bills are now separate from void bills.

Void bills are automatically generated when printed bills are changed.
Manually cancelled bills are called cancelled bills.
This commit is contained in:
2023-03-17 08:27:30 +05:30
parent a62018ad1f
commit 1a08066c2d
15 changed files with 170 additions and 39 deletions

View File

@ -4,7 +4,7 @@ export class ProductSaleReportItem {
regularBill: number;
noCharge: number;
staff: number;
void: number;
cancel: number;
public constructor(init?: Partial<ProductSaleReportItem>) {
this.name = '';
@ -12,7 +12,7 @@ export class ProductSaleReportItem {
this.regularBill = 0;
this.noCharge = 0;
this.staff = 0;
this.void = 0;
this.cancel = 0;
Object.assign(this, init);
}
}

View File

@ -72,10 +72,10 @@
<mat-cell *matCellDef="let row" class="right">{{ row.staff | number : '1.2-2' }}</mat-cell>
</ng-container>
<!-- Void Column -->
<ng-container matColumnDef="void">
<mat-header-cell *matHeaderCellDef class="right">Void</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{ row.void | number : '1.2-2' }}</mat-cell>
<!-- Cancelled Column -->
<ng-container matColumnDef="cancel">
<mat-header-cell *matHeaderCellDef class="right">Cancelled</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{ row.cancel | number : '1.2-2' }}</mat-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>

View File

@ -24,7 +24,7 @@ export class ProductSaleReportComponent implements OnInit {
}>;
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
displayedColumns = ['name', 'unbilled', 'sale', 'noCharge', 'staff', 'void'];
displayedColumns = ['name', 'unbilled', 'sale', 'noCharge', 'staff', 'cancel'];
constructor(
private route: ActivatedRoute,