Added the final missing Voids or Reprints report aslo.

Ready for beta 1.
Removed voucher.is_void in favour voucher_type == void

bookie/src/app/app-routing.module.ts

@@ -93,6 +93,10 @@ const routes: Routes = [
     path: 'users',
     loadChildren: () => import('./users/users.module').then(mod => mod.UsersModule)
   },
+  {
+    path: 'voids-reprints-report',
+    loadChildren: () => import('./voids-reprints-report/voids-reprints-report.module').then(mod => mod.VoidsReprintsReportModule)
+  },
   {path: 'login', component: LoginComponent},
   {path: 'logout', component: LogoutComponent},
   {path: '', component: HomeComponent},

bookie/src/app/home/home.component.html

@@ -29,6 +29,9 @@
   <mat-card fxLayout="column" class="square-button" matRipple *ngIf="auth.hasPermission('Beer Consumption')"  [routerLink]="['/', 'beer-consumption-report']">
     <h3 class="item-name">Beer Consumption Report</h3>
   </mat-card>
+  <mat-card fxLayout="column" class="square-button" matRipple *ngIf="auth.hasPermission('Void or Reprinted Bill Report')"  [routerLink]="['/', 'voids-reprints-report']">
+    <h3 class="item-name">Voids and Reprints Report</h3>
+  </mat-card>
   <mat-card fxLayout="column" class="square-button" matRipple *ngIf="auth.hasPermission('Discount Report')"  [routerLink]="['/', 'discount-report']">
     <h3 class="item-name">Discount Report</h3>
   </mat-card>

bookie/src/app/voids-reprints-report/voids-reprints-report-datasource.ts

@@ -0,0 +1,18 @@
+import { DataSource } from '@angular/cdk/collections';
+import { Observable, of as observableOf } from 'rxjs';
+import { VoidsReprintsReportItem } from './voids-reprints-report';
+
+
+export class VoidsReprintsReportDataSource extends DataSource<VoidsReprintsReportItem> {
+
+  constructor(public data: VoidsReprintsReportItem[]) {
+    super();
+  }
+
+  connect(): Observable<VoidsReprintsReportItem[]> {
+    return observableOf(this.data);
+  }
+
+  disconnect() {
+  }
+}

bookie/src/app/voids-reprints-report/voids-reprints-report-resolver.service.spec.ts

@@ -0,0 +1,15 @@
+import {inject, TestBed} from '@angular/core/testing';
+
+import {VoidsReprintsReportResolver} from './voids-reprints-report-resolver.service';
+
+describe('VoidsReprintsReportResolver', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [VoidsReprintsReportResolver]
+    });
+  });
+
+  it('should be created', inject([VoidsReprintsReportResolver], (service: VoidsReprintsReportResolver) => {
+    expect(service).toBeTruthy();
+  }));
+});

bookie/src/app/voids-reprints-report/voids-reprints-report-resolver.service.ts

@@ -0,0 +1,20 @@
+import {Injectable} from '@angular/core';
+import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from '@angular/router';
+import {Observable} from 'rxjs/internal/Observable';
+import {VoidsReprintsReport} from './voids-reprints-report';
+import {VoidsReprintsReportService} from './voids-reprints-report.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class VoidsReprintsReportResolver implements Resolve<VoidsReprintsReport> {
+
+  constructor(private ser: VoidsReprintsReportService) {
+  }
+
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<VoidsReprintsReport> {
+    const startDate = route.queryParamMap.get('startDate') || null;
+    const finishDate = route.queryParamMap.get('finishDate') || null;
+    return this.ser.get(startDate, finishDate);
+  }
+}

bookie/src/app/voids-reprints-report/voids-reprints-report-routing.module.spec.ts

@@ -0,0 +1,13 @@
+import {VoidsReprintsReportRoutingModule} from './voids-reprints-report-routing.module';
+
+describe('VoidsReprintsReportRoutingModule', () => {
+  let pvoidsReprintsReportRoutingModule: VoidsReprintsReportRoutingModule;
+
+  beforeEach(() => {
+    pvoidsReprintsReportRoutingModule = new VoidsReprintsReportRoutingModule();
+  });
+
+  it('should create an instance', () => {
+    expect(pvoidsReprintsReportRoutingModule).toBeTruthy();
+  });
+});

bookie/src/app/voids-reprints-report/voids-reprints-report-routing.module.ts

@@ -0,0 +1,37 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterModule, Routes } from '@angular/router';
+import { VoidsReprintsReportResolver } from './voids-reprints-report-resolver.service';
+import { AuthGuard } from '../auth/auth-guard.service';
+import { VoidsReprintsReportComponent } from './voids-reprints-report.component';
+
+const VoidsReprintsReportRoutes: Routes = [
+  {
+    path: '',
+    component: VoidsReprintsReportComponent,
+    canActivate: [AuthGuard],
+    data: {
+      permission: 'Void or Reprinted Bill Report' // rename to Void and Reprinted Bill Report
+    },
+    resolve: {
+      info: VoidsReprintsReportResolver
+    },
+    runGuardsAndResolvers: 'always'
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    RouterModule.forChild(VoidsReprintsReportRoutes)
+
+  ],
+  exports: [
+    RouterModule
+  ],
+  providers: [
+    VoidsReprintsReportResolver
+  ]
+})
+export class VoidsReprintsReportRoutingModule {
+}

bookie/src/app/voids-reprints-report/voids-reprints-report.component.css

@@ -0,0 +1,4 @@
+.right {
+  display: flex;
+  justify-content: flex-end;
+}

bookie/src/app/voids-reprints-report/voids-reprints-report.component.html

@@ -0,0 +1,57 @@
+<mat-card>
+  <mat-card-title-group>
+    <mat-card-title>Voids and Reprints Report</mat-card-title>
+    <button mat-button mat-icon-button (click)="exportCsv()">
+      <mat-icon>save_alt</mat-icon>
+    </button>
+  </mat-card-title-group>
+  <mat-card-content>
+    <form [formGroup]="form" fxLayout="column">
+      <div fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="20px" fxLayoutGap.lt-md="0px"
+           fxLayoutAlign="space-around start">
+        <mat-form-field fxFlex="40">
+          <input matInput [matDatepicker]="startDate" (focus)="startDate.open()" placeholder="Start Date"
+                 formControlName="startDate" autocomplete="off">
+          <mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
+          <mat-datepicker #startDate></mat-datepicker>
+        </mat-form-field>
+        <mat-form-field fxFlex="40">
+          <input matInput [matDatepicker]="finishDate" (focus)="finishDate.open()" placeholder="Finish Date"
+                 formControlName="finishDate" autocomplete="off">
+          <mat-datepicker-toggle matSuffix [for]="finishDate"></mat-datepicker-toggle>
+          <mat-datepicker #finishDate></mat-datepicker>
+        </mat-form-field>
+        <button fxFlex="20" mat-raised-button color="primary" (click)="show()">Show</button>
+      </div>
+    </form>
+    <mat-table #table [dataSource]="dataSource" aria-label="Elements">
+
+      <!-- Date Column -->
+      <ng-container matColumnDef="date">
+        <mat-header-cell *matHeaderCellDef>Time</mat-header-cell>
+        <mat-cell *matCellDef="let row">{{row.date}}</mat-cell>
+      </ng-container>
+
+      <!-- Bill ID Column -->
+      <ng-container matColumnDef="billId">
+        <mat-header-cell *matHeaderCellDef class="right">Bill ID</mat-header-cell>
+        <mat-cell *matCellDef="let row" class="right">{{row.billId}}</mat-cell>
+      </ng-container>
+
+      <!-- Amount Column -->
+      <ng-container matColumnDef="amount">
+        <mat-header-cell *matHeaderCellDef class="right">Amount</mat-header-cell>
+        <mat-cell *matCellDef="let row" class="right">{{row.amount | number:'1.2-2'}}</mat-cell>
+      </ng-container>
+
+      <!-- Settlement Column -->
+      <ng-container matColumnDef="settlement">
+        <mat-header-cell *matHeaderCellDef class="right">Settlement</mat-header-cell>
+        <mat-cell *matCellDef="let row" class="right">{{row.settlement}}</mat-cell>
+      </ng-container>
+
+      <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
+    </mat-table>
+  </mat-card-content>
+</mat-card>

bookie/src/app/voids-reprints-report/voids-reprints-report.component.spec.ts

@@ -0,0 +1,25 @@
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+
+import {VoidsReprintsReportComponent} from './voids-reprints-report.component';
+
+describe('VoidsReprintsReportComponent', () => {
+  let component: VoidsReprintsReportComponent;
+  let fixture: ComponentFixture<VoidsReprintsReportComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [VoidsReprintsReportComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(VoidsReprintsReportComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

bookie/src/app/voids-reprints-report/voids-reprints-report.component.ts

@@ -0,0 +1,90 @@
+import { Component, OnInit } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { ActivatedRoute, Router } from '@angular/router';
+import * as moment from 'moment';
+import { VoidsReprintsReportDataSource } from './voids-reprints-report-datasource';
+import { VoidsReprintsReport } from './voids-reprints-report';
+import { ToCsvService } from '../shared/to-csv.service';
+
+@Component({
+  selector: 'app-voids-reprints-report',
+  templateUrl: './voids-reprints-report.component.html',
+  styleUrls: ['./voids-reprints-report.component.css']
+})
+export class VoidsReprintsReportComponent implements OnInit {
+  dataSource: VoidsReprintsReportDataSource;
+  form: FormGroup;
+  info: VoidsReprintsReport;
+
+  /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
+  displayedColumns = ['date', 'billId', 'amount', 'settlement'];
+
+
+  constructor(
+    private route: ActivatedRoute,
+    private router: Router,
+    private fb: FormBuilder,
+    private toCsv: ToCsvService
+  ) {
+    this.createForm();
+
+  }
+
+  ngOnInit() {
+    this.route.data
+      .subscribe((data: { info: VoidsReprintsReport }) => {
+        this.info = data.info;
+        this.form.setValue({
+          startDate: moment(this.info.startDate, 'DD-MMM-YYYY').toDate(),
+          finishDate: moment(this.info.finishDate, 'DD-MMM-YYYY').toDate()
+        });
+        this.dataSource = new VoidsReprintsReportDataSource(this.info.amounts);
+      });
+  }
+
+  show() {
+    const info = this.getInfo();
+    this.router.navigate(['voids-reprints-report'], {
+      queryParams: {
+        startDate: info.startDate,
+        finishDate: info.finishDate
+      }
+    });
+  }
+
+  createForm() {
+    this.form = this.fb.group({
+      startDate: '',
+      finishDate: ''
+    });
+  }
+
+  getInfo(): VoidsReprintsReport {
+    const formModel = this.form.value;
+
+    return {
+      startDate: moment(formModel.startDate).format('DD-MMM-YYYY'),
+      finishDate: moment(formModel.finishDate).format('DD-MMM-YYYY')
+    };
+  }
+
+  exportCsv() {
+    const headers = {
+      Date: 'date',
+      Name: 'name',
+      Type: 'type',
+      Narration: 'narration',
+      Debit: 'debit',
+      Credit: 'credit',
+      Running: 'running',
+      Posted: 'posted'
+    };
+    const csvData = new Blob([this.toCsv.toCsv(headers, this.dataSource.data)], {type: 'text/csv;charset=utf-8;'});
+    const link = document.createElement('a');
+    link.href = window.URL.createObjectURL(csvData);
+    link.setAttribute('download', 'voids-reprints-report.csv');
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  }
+}

bookie/src/app/voids-reprints-report/voids-reprints-report.module.spec.ts

@@ -0,0 +1,13 @@
+import {VoidsReprintsReportModule} from './voids-reprints-report.module';
+
+describe('VoidsReprintsReportModule', () => {
+  let pvoidsReprintsReportModule: VoidsReprintsReportModule;
+
+  beforeEach(() => {
+    pvoidsReprintsReportModule = new VoidsReprintsReportModule();
+  });
+
+  it('should create an instance', () => {
+    expect(pvoidsReprintsReportModule).toBeTruthy();
+  });
+});

bookie/src/app/voids-reprints-report/voids-reprints-report.module.ts

@@ -0,0 +1,61 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatAutocompleteModule } from '@angular/material/autocomplete';
+import { MatButtonModule } from '@angular/material/button';
+import { MatCardModule } from '@angular/material/card';
+import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+import { MatTableModule } from '@angular/material/table';
+import { SharedModule} from '../shared/shared.module';
+import { ReactiveFormsModule } from '@angular/forms';
+import { CdkTableModule } from '@angular/cdk/table';
+import { VoidsReprintsReportRoutingModule } from './voids-reprints-report-routing.module';
+import { VoidsReprintsReportComponent } from './voids-reprints-report.component';
+import { MomentDateAdapter } from '@angular/material-moment-adapter';
+import { A11yModule } from '@angular/cdk/a11y';
+import { FlexLayoutModule } from '@angular/flex-layout';
+
+export const MY_FORMATS = {
+  parse: {
+    dateInput: 'DD-MMM-YYYY',
+  },
+  display: {
+    dateInput: 'DD-MMM-YYYY',
+    monthYearLabel: 'MMM YYYY',
+    dateA11yLabel: 'DD-MMM-YYYY',
+    monthYearA11yLabel: 'MMM YYYY',
+  },
+};
+
+@NgModule({
+  imports: [
+    A11yModule,
+    CommonModule,
+    CdkTableModule,
+    FlexLayoutModule,
+    MatAutocompleteModule,
+    MatButtonModule,
+    MatCardModule,
+    MatDatepickerModule,
+    MatFormFieldModule,
+    MatIconModule,
+    MatInputModule,
+    MatNativeDateModule,
+    MatTableModule,
+    ReactiveFormsModule,
+    SharedModule,
+    VoidsReprintsReportRoutingModule
+  ],
+  declarations: [
+    VoidsReprintsReportComponent
+  ],
+  providers: [
+    {provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
+    {provide: MAT_DATE_FORMATS, useValue: MY_FORMATS},
+  ]
+})
+export class VoidsReprintsReportModule {
+}

bookie/src/app/voids-reprints-report/voids-reprints-report.service.spec.ts

@@ -0,0 +1,15 @@
+import {inject, TestBed} from '@angular/core/testing';
+
+import {VoidsReprintsReportService} from './voids-reprints-report.service';
+
+describe('VoidsReprintsReportService', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [VoidsReprintsReportService]
+    });
+  });
+
+  it('should be created', inject([VoidsReprintsReportService], (service: VoidsReprintsReportService) => {
+    expect(service).toBeTruthy();
+  }));
+});

bookie/src/app/voids-reprints-report/voids-reprints-report.service.ts

@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import { catchError } from 'rxjs/operators';
+import { Observable } from 'rxjs/internal/Observable';
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
+import { VoidsReprintsReport } from './voids-reprints-report';
+import { ErrorLoggerService } from '../core/error-logger.service';
+
+const httpOptions = {
+  headers: new HttpHeaders({'Content-Type': 'application/json'})
+};
+
+const url = '/v1/voids-reprints-report';
+const serviceName = 'VoidsReprintsReportService';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class VoidsReprintsReportService {
+
+  constructor(private http: HttpClient, private log: ErrorLoggerService) {
+  }
+
+  get(startDate: string, finishDate): Observable<VoidsReprintsReport> {
+    const options = {params: new HttpParams()};
+    if (startDate !== null) {
+      options.params = options.params.set('s', startDate);
+    }
+    if (finishDate !== null) {
+      options.params = options.params.set('f', finishDate);
+    }
+    return <Observable<VoidsReprintsReport>>this.http.get<VoidsReprintsReport>(url, options)
+      .pipe(
+        catchError(this.log.handleError(serviceName, 'get'))
+      );
+  }
+}

bookie/src/app/voids-reprints-report/voids-reprints-report.ts

@@ -0,0 +1,12 @@
+export class VoidsReprintsReportItem {
+  date: string;
+  billId: string;
+  amount: number;
+  settlement: string;
+}
+
+export class VoidsReprintsReport {
+  startDate: string;
+  finishDate: string;
+  amounts?: VoidsReprintsReportItem[];
+}