Feature: In the Beer Sale Report, you can choose the type of consumption

Chore: Sorted the product sale report by name
Fix: Voided bills now also include the old bill number

bookie/src/app/beer-sale-report/beer-sale-report.component.ts

@@ -32,6 +32,10 @@ export class BeerSaleReportComponent implements OnInit {
     this.form = this.fb.group({
       startDate: '',
       finishDate: '',
+      regular: true,
+      happy: true,
+      staff: true,
+      nc: true,
     });
   }
 
@@ -43,6 +47,10 @@ export class BeerSaleReportComponent implements OnInit {
       this.form.setValue({
         startDate: moment(this.info.startDate, 'DD-MMM-YYYY').toDate(),
         finishDate: moment(this.info.finishDate, 'DD-MMM-YYYY').toDate(),
+        regular: this.info.regular,
+        happy: this.info.happy,
+        staff: this.info.staff,
+        nc: this.info.nc,
       });
       this.dataSource = new BeerSaleReportDataSource(this.info.data);
     });
@@ -54,6 +62,10 @@ export class BeerSaleReportComponent implements OnInit {
       queryParams: {
         startDate: info.startDate,
         finishDate: info.finishDate,
+        regular: info.regular,
+        happy: info.happy,
+        staff: info.staff,
+        nc: info.nc,
       },
     });
   }
@@ -64,6 +76,10 @@ export class BeerSaleReportComponent implements OnInit {
     return new BeerSaleReport({
       startDate: moment(formModel.startDate).format('DD-MMM-YYYY'),
       finishDate: moment(formModel.finishDate).format('DD-MMM-YYYY'),
+      regular: formModel.regular,
+      happy: formModel.happy,
+      staff: formModel.staff,
+      nc: formModel.nc,
     });
   }