Product Group renamed to Menu Category

Extracted Product Group -> Group_type to a a new object called Sale Category.
Moved tax from product to Sale Category for uniform taxes on types of sales.

bookie/src/app/menu-category/menu-categories-routing.module.spec.ts

@@ -0,0 +1,13 @@
+import {MenuCategoriesRoutingModule} from './menu-categories-routing.module';
+
+describe('MenuCategoriesRoutingModule', () => {
+  let menuCategoriesRoutingModule: MenuCategoriesRoutingModule;
+
+  beforeEach(() => {
+    menuCategoriesRoutingModule = new MenuCategoriesRoutingModule();
+  });
+
+  it('should create an instance', () => {
+    expect(menuCategoriesRoutingModule).toBeTruthy();
+  });
+});

bookie/src/app/menu-category/menu-categories-routing.module.ts

@@ -0,0 +1,61 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterModule, Routes } from '@angular/router';
+import { MenuCategoryListResolver } from './menu-category-list-resolver.service';
+import { MenuCategoryResolver } from './menu-category-resolver.service';
+import { MenuCategoryListComponent } from './menu-category-list/menu-category-list.component';
+import { MenuCategoryDetailComponent } from './menu-category-detail/menu-category-detail.component';
+import { AuthGuard } from '../auth/auth-guard.service';
+
+const menuCategoriesRoutes: Routes = [
+  {
+    path: '',
+    component: MenuCategoryListComponent,
+    canActivate: [AuthGuard],
+    data: {
+      permission: 'Products'
+    },
+    resolve: {
+      list: MenuCategoryListResolver
+    }
+  },
+  {
+    path: 'new',
+    component: MenuCategoryDetailComponent,
+    canActivate: [AuthGuard],
+    data: {
+      permission: 'Products'
+    },
+    resolve: {
+      item: MenuCategoryResolver
+    }
+  },
+  {
+    path: ':id',
+    component: MenuCategoryDetailComponent,
+    canActivate: [AuthGuard],
+    data: {
+      permission: 'Products'
+    },
+    resolve: {
+      item: MenuCategoryResolver
+    }
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    RouterModule.forChild(menuCategoriesRoutes)
+
+  ],
+  exports: [
+    RouterModule
+  ],
+  providers: [
+    MenuCategoryListResolver,
+    MenuCategoryResolver
+  ]
+})
+export class MenuCategoriesRoutingModule {
+}

bookie/src/app/menu-category/menu-categories.module.spec.ts

@@ -0,0 +1,13 @@
+import {MenuCategoriesModule} from './menu-categories.module';
+
+describe('MenuCategoriesModule', () => {
+  let menuCategoriesModule: MenuCategoriesModule;
+
+  beforeEach(() => {
+    menuCategoriesModule = new MenuCategoriesModule();
+  });
+
+  it('should create an instance', () => {
+    expect(menuCategoriesModule).toBeTruthy();
+  });
+});

bookie/src/app/menu-category/menu-categories.module.ts

@@ -0,0 +1,41 @@
+import { NgModule} from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { MenuCategoryListComponent}  from './menu-category-list/menu-category-list.component';
+import { MenuCategoryDetailComponent } from './menu-category-detail/menu-category-detail.component';
+import { MenuCategoriesRoutingModule } from './menu-categories-routing.module';
+import { MatButtonModule } from '@angular/material/button';
+import { MatCardModule } from '@angular/material/card';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { MatTableModule } from '@angular/material/table';
+import { CdkTableModule } from '@angular/cdk/table';
+import { DragDropModule } from '@angular/cdk/drag-drop';
+import { FlexLayoutModule } from '@angular/flex-layout';
+import { ReactiveFormsModule } from '@angular/forms';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    CdkTableModule,
+    DragDropModule,
+    FlexLayoutModule,
+    MatTableModule,
+    MatCardModule,
+    MatCheckboxModule,
+    MatProgressSpinnerModule,
+    MatInputModule,
+    MatButtonModule,
+    MatIconModule,
+    ReactiveFormsModule,
+    MenuCategoriesRoutingModule
+  ],
+  declarations: [
+    MenuCategoryListComponent,
+    MenuCategoryDetailComponent
+  ]
+})
+export class MenuCategoriesModule {
+}

bookie/src/app/menu-category/menu-category-detail/menu-category-detail.component.css

@@ -0,0 +1,3 @@
+.example-card {
+  max-width: 400px;
+}

bookie/src/app/menu-category/menu-category-detail/menu-category-detail.component.html

@@ -0,0 +1,35 @@
+<div fxLayout="row" fxFlex="50%" fxLayoutAlign="space-around center" class="example-card">
+  <mat-card fxFlex>
+    <mat-card-title-group>
+      <mat-card-title>Menu Category</mat-card-title>
+    </mat-card-title-group>
+    <mat-card-content>
+      <form [formGroup]="form" fxLayout="column">
+        <div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
+             fxLayoutGap.lt-md="0px">
+          <mat-form-field fxFlex>
+            <mat-label>Name</mat-label>
+            <input matInput #nameElement placeholder="Name" formControlName="name">
+          </mat-form-field>
+        </div>
+        <div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
+             fxLayoutGap.lt-md="0px">
+          <mat-form-field fxFlex>
+            <mat-label>Discount Limit</mat-label>
+            <input matInput type="number" placeholder="Discount Limit" formControlName="discountLimit" class="right-align">
+            <span matSuffix>%</span>
+          </mat-form-field>
+        </div>
+        <div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
+             fxLayoutGap.lt-md="0px">
+          <mat-checkbox formControlName="isModifierCompulsory">Is Modifier Compulsory?</mat-checkbox>
+          <mat-checkbox formControlName="isActive">Is Active?</mat-checkbox>
+        </div>
+      </form>
+    </mat-card-content>
+    <mat-card-actions>
+      <button mat-raised-button [disabled]="item.isFixture" color="primary" (click)="save()">Save</button>
+      <button mat-raised-button [disabled]="item.isFixture" color="warn" (click)="confirmDelete()" *ngIf="!!item.id">Delete</button>
+    </mat-card-actions>
+  </mat-card>
+</div>

bookie/src/app/menu-category/menu-category-detail/menu-category-detail.component.spec.ts

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

bookie/src/app/menu-category/menu-category-detail/menu-category-detail.component.ts

@@ -0,0 +1,111 @@
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { ActivatedRoute, Router } from '@angular/router';
+import { MatDialog } from "@angular/material";
+
+import { MenuCategoryService } from '../menu-category.service';
+import { MenuCategory } from '../../core/menu-category';
+import { ToasterService } from '../../core/toaster.service';
+import { ConfirmDialogComponent } from "../../shared/confirm-dialog/confirm-dialog.component";
+
+@Component({
+  selector: 'app-menu-category-detail',
+  templateUrl: './menu-category-detail.component.html',
+  styleUrls: ['./menu-category-detail.component.css']
+})
+export class MenuCategoryDetailComponent implements OnInit, AfterViewInit {
+  @ViewChild('nameElement', { static: true }) nameElement: ElementRef;
+  form: FormGroup;
+  item: MenuCategory;
+
+  constructor(
+    private route: ActivatedRoute,
+    private router: Router,
+    private dialog: MatDialog,
+    private fb: FormBuilder,
+    private toaster: ToasterService,
+    private ser: MenuCategoryService
+  ) {
+    this.createForm();
+  }
+
+  createForm() {
+    this.form = this.fb.group({
+      name: '',
+      discountLimit: '',
+      isModifierCompulsory: '',
+      isActive: ''
+    });
+  }
+
+  ngOnInit() {
+    this.route.data
+      .subscribe((data: { item: MenuCategory }) => {
+        this.showItem(data.item);
+      });
+  }
+
+  showItem(item: MenuCategory) {
+    this.item = item;
+    this.form.setValue({
+      name: this.item.name,
+      discountLimit: this.item.discountLimit,
+      isModifierCompulsory: this.item.isModifierCompulsory,
+      isActive: this.item.isActive
+    });
+  }
+
+  ngAfterViewInit() {
+    setTimeout(() => {
+      this.nameElement.nativeElement.focus();
+    }, 0);
+  }
+
+  save() {
+    this.ser.saveOrUpdate(this.getItem())
+      .subscribe(
+        (result) => {
+          this.toaster.show('Success', '');
+          this.router.navigateByUrl('/menu-categories');
+        },
+        (error) => {
+          this.toaster.show('Danger', error.error);
+        }
+      );
+  }
+
+  delete() {
+    this.ser.delete(this.item.id)
+      .subscribe(
+        (result) => {
+          this.toaster.show('Success', '');
+          this.router.navigateByUrl('/menu-categories');
+        },
+        (error) => {
+          this.toaster.show('Danger', error.error);
+        }
+      );
+  }
+
+  confirmDelete(): void {
+    const dialogRef = this.dialog.open(ConfirmDialogComponent, {
+      width: '250px',
+      data: {title: 'Delete Menu Category?', content: 'Are you sure? This cannot be undone.'}
+    });
+
+    dialogRef.afterClosed().subscribe((result: boolean) => {
+      if (result) {
+        this.delete();
+      }
+    });
+  }
+
+  getItem(): MenuCategory {
+    const formModel = this.form.value;
+    this.item.name = formModel.name;
+    this.item.discountLimit = +formModel.discountLimit;
+    this.item.isModifierCompulsory = formModel.isModifierCompulsory;
+    this.item.isActive = formModel.isActive;
+    return this.item;
+  }
+}

bookie/src/app/menu-category/menu-category-list-resolver.service.spec.ts

@@ -0,0 +1,14 @@
+import {inject, TestBed} from '@angular/core/testing';
+import {MenuCategoryListResolver} from './menu-category-list-resolver.service';
+
+describe('MenuCategoryListResolver', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [MenuCategoryListResolver]
+    });
+  });
+
+  it('should be created', inject([MenuCategoryListResolver], (service: MenuCategoryListResolver) => {
+    expect(service).toBeTruthy();
+  }));
+});

bookie/src/app/menu-category/menu-category-list-resolver.service.ts

@@ -0,0 +1,18 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
+import { MenuCategory } from '../core/menu-category';
+import { Observable } from 'rxjs/internal/Observable';
+import { MenuCategoryService } from './menu-category.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class MenuCategoryListResolver implements Resolve<MenuCategory[]> {
+
+  constructor(private ser: MenuCategoryService, private router: Router) {
+  }
+
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<MenuCategory[]> {
+    return this.ser.list();
+  }
+}

bookie/src/app/menu-category/menu-category-list/menu-category-list-datasource.ts

@@ -0,0 +1,22 @@
+import { DataSource } from '@angular/cdk/collections';
+import { Observable } from 'rxjs';
+import { MenuCategory } from '../../core/menu-category';
+import { tap } from "rxjs/operators";
+
+export class MenuCategoryListDatasource extends DataSource<MenuCategory> {
+  private data: MenuCategory[];
+
+  constructor(private readonly dataObs: Observable<MenuCategory[]>) {
+    super();
+    this.dataObs = dataObs.pipe(
+      tap(x => this.data = x)
+    );
+  }
+
+  connect(): Observable<MenuCategory[]> {
+    return this.dataObs;
+  }
+
+  disconnect() {
+  }
+}

bookie/src/app/menu-category/menu-category-list/menu-category-list.component.html

@@ -0,0 +1,49 @@
+<mat-card>
+  <mat-card-title-group>
+    <mat-card-title>Menu Categories</mat-card-title>
+    <button mat-button (click)="updateSortOrder()">
+      Update Order
+    </button>
+    <a mat-button [routerLink]="['/menu-categories', 'new']">
+      <mat-icon>add_box</mat-icon>
+      Add
+    </a>
+  </mat-card-title-group>
+  <mat-card-content>
+    <mat-table #table cdkDropList [dataSource]="dataSource" [cdkDropListData]="dataSource" aria-label="Elements" (cdkDropListDropped)="dropTable($event)">
+
+      <!-- Name Column -->
+      <ng-container matColumnDef="name">
+        <mat-header-cell *matHeaderCellDef>Name</mat-header-cell>
+        <mat-cell *matCellDef="let row"><a [routerLink]="['/menu-categories', row.id]">{{row.name}}</a></mat-cell>
+      </ng-container>
+
+      <!-- Discount Limit Column -->
+      <ng-container matColumnDef="discountLimit">
+        <mat-header-cell *matHeaderCellDef>Discount Limit</mat-header-cell>
+        <mat-cell *matCellDef="let row">{{row.discountLimit | percent:'1.2-2'}}</mat-cell>
+      </ng-container>
+
+      <!-- Is Modifier Compulsory Column -->
+      <ng-container matColumnDef="isModifierCompulsory">
+        <mat-header-cell *matHeaderCellDef>Modifier Compulsory?</mat-header-cell>
+        <mat-cell *matCellDef="let row">{{row.isModifierCompulsory}}</mat-cell>
+      </ng-container>
+
+      <!-- Is Active Column -->
+      <ng-container matColumnDef="isActive">
+        <mat-header-cell *matHeaderCellDef>Active?</mat-header-cell>
+        <mat-cell *matCellDef="let row">{{row.isActive}}</mat-cell>
+      </ng-container>
+
+      <!-- Is Fixture Column -->
+      <ng-container matColumnDef="isFixture">
+        <mat-header-cell *matHeaderCellDef>Fixture?</mat-header-cell>
+        <mat-cell *matCellDef="let row">{{row.isFixture}}</mat-cell>
+      </ng-container>
+
+      <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: displayedColumns;" cdkDrag [cdkDragData]="row"></mat-row>
+    </mat-table>
+  </mat-card-content>
+</mat-card>

bookie/src/app/menu-category/menu-category-list/menu-category-list.component.spec.ts

@@ -0,0 +1,23 @@
+import {ComponentFixture, fakeAsync, TestBed} from '@angular/core/testing';
+
+import {MenuCategoryListComponent} from './menu-category-list.component';
+
+describe('MenuCategoryListComponent', () => {
+  let component: MenuCategoryListComponent;
+  let fixture: ComponentFixture<MenuCategoryListComponent>;
+
+  beforeEach(fakeAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [MenuCategoryListComponent]
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(MenuCategoryListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should compile', () => {
+    expect(component).toBeTruthy();
+  });
+});

bookie/src/app/menu-category/menu-category-list/menu-category-list.component.ts

@@ -0,0 +1,61 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { MenuCategoryListDatasource } from './menu-category-list-datasource';
+import { MenuCategory } from '../../core/menu-category';
+import { ActivatedRoute, Router } from '@angular/router';
+import { CdkDragDrop, moveItemInArray } from "@angular/cdk/drag-drop";
+import { MatTable } from "@angular/material";
+import { ToasterService } from "../../core/toaster.service";
+import { MenuCategoryService } from "../menu-category.service";
+import { BehaviorSubject } from "rxjs";
+
+@Component({
+  selector: 'app-menu-category-list',
+  templateUrl: './menu-category-list.component.html',
+  styleUrls: ['./menu-category-list.component.css']
+})
+export class MenuCategoryListComponent implements OnInit {
+  @ViewChild('table', { static: true }) table: MatTable<MenuCategory>;
+  dataSource: MenuCategoryListDatasource;
+  list: MenuCategory[];
+  data: BehaviorSubject<MenuCategory[]>;
+  /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
+  displayedColumns = ['name', 'discountLimit', 'isModifierCompulsory', 'isActive', 'isFixture'];
+
+  constructor(
+    private route: ActivatedRoute,
+    private router: Router,
+    private toaster: ToasterService,
+    private ser: MenuCategoryService
+  ) {
+    this.data = new BehaviorSubject([]);
+    this.data.subscribe((data: MenuCategory[]) => {
+      this.list = data;
+    })
+  }
+
+  ngOnInit() {
+    this.route.data
+      .subscribe((data: { list: MenuCategory[] }) => {
+        this.data.next(data.list);
+      });
+    this.dataSource = new MenuCategoryListDatasource(this.data);
+  }
+
+  updateSortOrder() {
+    this.ser.updateSortOrder(this.list)
+      .subscribe(
+        (result) => {
+          this.toaster.show('Success', '');
+        },
+        (error) => {
+          this.toaster.show('Danger', error.error);
+        }
+      );
+  }
+
+  dropTable(event: CdkDragDrop<MenuCategory[]>) {
+    const prevIndex = this.list.indexOf(event.item.data);
+    moveItemInArray(this.list, prevIndex, event.currentIndex);
+    this.data.next(this.list);
+  }
+}

bookie/src/app/menu-category/menu-category-resolver.service.spec.ts

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

bookie/src/app/menu-category/menu-category-resolver.service.ts

@@ -0,0 +1,19 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
+import { MenuCategoryService } from './menu-category.service';
+import { MenuCategory } from '../core/menu-category';
+import { Observable } from 'rxjs/internal/Observable';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class MenuCategoryResolver implements Resolve<MenuCategory> {
+
+  constructor(private ser: MenuCategoryService, private router: Router) {
+  }
+
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<MenuCategory> {
+    const id = route.paramMap.get('id');
+    return this.ser.get(id);
+  }
+}

bookie/src/app/menu-category/menu-category.service.spec.ts

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

bookie/src/app/menu-category/menu-category.service.ts

@@ -0,0 +1,72 @@
+import {Injectable} from '@angular/core';
+import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
+import {ErrorLoggerService} from '../core/error-logger.service';
+import {catchError} from 'rxjs/operators';
+import {Observable} from 'rxjs/internal/Observable';
+import {MenuCategory} from '../core/menu-category';
+
+const httpOptions = {
+  headers: new HttpHeaders({'Content-Type': 'application/json'})
+};
+const url = '/v1/menu-categories';
+const serviceName = 'MenuCategoryService';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class MenuCategoryService {
+  constructor(private http: HttpClient, private log: ErrorLoggerService) {
+  }
+
+  get(id: string): Observable<MenuCategory> {
+    const getUrl: string = (id === null) ? `${url}/new` : `${url}/${id}`;
+    return <Observable<MenuCategory>>this.http.get<MenuCategory>(getUrl)
+      .pipe(
+        catchError(this.log.handleError(serviceName, `get id=${id}`))
+      );
+  }
+
+  list(): Observable<MenuCategory[]> {
+    const options = {params: new HttpParams().set('l', '')};
+    return <Observable<MenuCategory[]>>this.http.get<MenuCategory[]>(url, options)
+      .pipe(
+        catchError(this.log.handleError(serviceName, 'list'))
+      );
+  }
+
+  save(menuCategory: MenuCategory): Observable<MenuCategory> {
+    return <Observable<MenuCategory>>this.http.post<MenuCategory>(`${url}/new`, menuCategory, httpOptions)
+      .pipe(
+        catchError(this.log.handleError(serviceName, 'save'))
+      );
+  }
+
+  update(menuCategory: MenuCategory): Observable<MenuCategory> {
+    return <Observable<MenuCategory>>this.http.put<MenuCategory>(`${url}/${menuCategory.id}`, menuCategory, httpOptions)
+      .pipe(
+        catchError(this.log.handleError(serviceName, 'update'))
+      );
+  }
+
+  updateSortOrder(list: MenuCategory[]): Observable<boolean> {
+    return <Observable<boolean>>this.http.post<MenuCategory[]>(url, list, httpOptions)
+      .pipe(
+        catchError(this.log.handleError(serviceName, 'updateSortOrder'))
+      );
+  }
+
+  saveOrUpdate(menuCategory: MenuCategory): Observable<MenuCategory> {
+    if (!menuCategory.id) {
+      return this.save(menuCategory);
+    } else {
+      return this.update(menuCategory);
+    }
+  }
+
+  delete(id: string): Observable<MenuCategory> {
+    return <Observable<MenuCategory>>this.http.delete<MenuCategory>(`${url}/${id}`, httpOptions)
+      .pipe(
+        catchError(this.log.handleError(serviceName, 'delete'))
+      );
+  }
+}