+
diff --git a/bookie/src/app/temporal-product/temporal-product-detail/temporal-product-detail.component.ts b/bookie/src/app/temporal-product/temporal-product-detail/temporal-product-detail.component.ts
index d0abc4dd..10dcf561 100644
--- a/bookie/src/app/temporal-product/temporal-product-detail/temporal-product-detail.component.ts
+++ b/bookie/src/app/temporal-product/temporal-product-detail/temporal-product-detail.component.ts
@@ -9,13 +9,14 @@ import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { MatSelectModule } from '@angular/material/select';
import { MatSnackBar } from '@angular/material/snack-bar';
+import { MatTableModule } from '@angular/material/table';
import { ActivatedRoute, Router } from '@angular/router';
import moment from 'moment';
import { MenuCategory } from '../../core/menu-category';
import { SaleCategory } from '../../core/sale-category';
-import { StockKeepingUnit as Product } from '../../core/stock-keeping-unit';
import { ConfirmDialogComponent } from '../../shared/confirm-dialog/confirm-dialog.component';
+import { Product, StockKeepingUnit, TemporalProduct } from '../temporal-product';
import { TemporalProductService } from '../temporal-product.service';
@Component({
@@ -24,14 +25,13 @@ import { TemporalProductService } from '../temporal-product.service';
styleUrls: ['./temporal-product-detail.component.css'],
imports: [
MatButtonModule,
-
MatCheckboxModule,
MatDatepickerModule,
MatFormFieldModule,
MatInputModule,
MatOptionModule,
-
MatSelectModule,
+ MatTableModule,
ReactiveFormsModule,
],
})
@@ -42,72 +42,117 @@ export class TemporalProductDetailComponent implements OnInit, AfterViewInit {
private snackBar = inject(MatSnackBar);
private ser = inject(TemporalProductService);
+ productDisplayedColumns = ['name', 'fractionUnits', 'saleCategory', 'validFrom', 'validTill', 'actions'];
+ skuDisplayedColumns = ['units', 'salePrice', 'menuCategory', 'validFrom', 'validTill', 'actions'];
+
@ViewChild('name', { static: true }) nameElement?: ElementRef;
- form: FormGroup<{
- id: FormControl
;
+
+ private selectedProduct: Product | null;
+ private selectedSku: StockKeepingUnit | null;
+
+ productForm: FormGroup<{
name: FormControl;
- units: FormControl;
- menuCategory: FormControl;
+ fractionUnits: FormControl;
saleCategory: FormControl;
- price: FormControl;
+ validFrom: FormControl;
+ validTill: FormControl;
+ }>;
+
+ skuForm: FormGroup<{
+ units: FormControl;
+ fraction: FormControl;
+ productYield: FormControl;
+ costPrice: FormControl;
+ salePrice: FormControl;
+ menuCategory: FormControl;
hasHappyHour: FormControl;
isNotAvailable: FormControl;
- quantity: FormControl;
validFrom: FormControl;
validTill: FormControl;
}>;
menuCategories: MenuCategory[] = [];
saleCategories: SaleCategory[] = [];
- item: Product = new Product();
+ item: TemporalProduct = new TemporalProduct();
constructor() {
// Create form
- this.form = new FormGroup({
- id: new FormControl('', { nonNullable: true }),
+ this.productForm = new FormGroup({
name: new FormControl('', { nonNullable: true }),
- units: new FormControl('', { nonNullable: true }),
- menuCategory: new FormControl('', { nonNullable: true }),
+ fractionUnits: new FormControl('', { nonNullable: true }),
saleCategory: new FormControl('', { nonNullable: true }),
- price: new FormControl(0, { nonNullable: true }),
+ validFrom: new FormControl(null),
+ validTill: new FormControl(null),
+ });
+ this.skuForm = new FormGroup({
+ units: new FormControl('', { nonNullable: true }),
+ fraction: new FormControl(1, { nonNullable: true }),
+ productYield: new FormControl(1, { nonNullable: true }),
+ costPrice: new FormControl(0, { nonNullable: true }),
+ salePrice: new FormControl(0, { nonNullable: true }),
+
+ menuCategory: new FormControl('', { nonNullable: true }),
hasHappyHour: new FormControl(false, { nonNullable: true }),
isNotAvailable: new FormControl(false, { nonNullable: true }),
- quantity: new FormControl(0, { nonNullable: true }),
- validFrom: new FormControl(new Date()),
- validTill: new FormControl(new Date()),
+ validFrom: new FormControl(null),
+ validTill: new FormControl(null),
});
+ this.selectedProduct = null;
+ this.selectedSku = null;
}
ngOnInit() {
this.route.data.subscribe((value) => {
const data = value as {
- item: Product;
+ item: TemporalProduct;
menuCategories: MenuCategory[];
saleCategories: SaleCategory[];
};
this.menuCategories = data.menuCategories;
this.saleCategories = data.saleCategories;
- this.showItem(data.item);
+ this.item = data.item;
+ // this.showItem(data.item);
});
}
- showItem(item: Product) {
- this.item = item;
- this.form.setValue({
- id: this.item.id ?? '',
- name: this.item.name,
- units: this.item.units,
- menuCategory: this.item.menuCategory?.id ?? '',
- saleCategory: this.item.saleCategory?.id ?? '',
- price: this.item.price,
- hasHappyHour: this.item.hasHappyHour,
- isNotAvailable: this.item.isNotAvailable,
- quantity: this.item.quantity,
- validFrom: this.item.validFrom === null ? null : moment(this.item.validFrom, 'DD-MMM-YYYY').toDate(),
- validTill: this.item.validTill === null ? null : moment(this.item.validTill, 'DD-MMM-YYYY').toDate(),
- });
+ private parseDateOrNull(d: string | null | undefined): Date | null {
+ return !d ? null : moment(d, 'DD-MMM-YYYY').toDate();
}
+ private formatDateOrNull(d: Date | null | undefined): string | null {
+ return !d ? null : moment(d).format('DD-MMM-YYYY');
+ }
+
+ // showItem(item: TemporalProduct) {
+ // this.item = item;
+ // this.selectedProduct = this.item.products[0];
+ // this.selectedSku = this.item.skus[0];
+
+ // this.productForm.setValue({
+ // // product
+ // name: this.selectedProduct.name ?? '',
+ // fractionUnits: this.selectedProduct.fraction_units ?? '',
+ // saleCategory: this.selectedProduct.saleCategory?.id ?? '',
+ // validFrom: this.parseDateOrNull(this.selectedProduct.validFrom),
+ // validTill: this.parseDateOrNull(this.selectedProduct.validTill),
+ // });
+
+ // this.skuForm.setValue({
+ // // sku
+ // units: this.selectedSku.units ?? '',
+ // fraction: this.selectedSku.fraction ?? 1,
+ // productYield: this.selectedSku.productYield ?? 1,
+ // costPrice: this.selectedSku.costPrice ?? 0,
+ // salePrice: this.selectedSku.salePrice ?? 0,
+
+ // menuCategory: this.selectedSku.menuCategory?.id ?? '',
+ // hasHappyHour: this.selectedSku.hasHappyHour ?? false,
+ // isNotAvailable: this.selectedSku.isNotAvailable ?? false,
+ // validFrom: this.parseDateOrNull(this.selectedSku.validFrom),
+ // validTill: this.parseDateOrNull(this.selectedSku.validTill),
+ // });
+ // }
+
ngAfterViewInit() {
setTimeout(() => {
if (this.nameElement !== undefined) {
@@ -116,8 +161,131 @@ export class TemporalProductDetailComponent implements OnInit, AfterViewInit {
}, 0);
}
+ editProduct(p: Product) {
+ this.selectedProduct = p;
+
+ console.log(p);
+
+ this.productForm.setValue({
+ name: p.name ?? '',
+ fractionUnits: p.fraction_units ?? '',
+ saleCategory: p.saleCategory?.id ?? '',
+ validFrom: this.parseDateOrNull(p.validFrom),
+ validTill: this.parseDateOrNull(p.validTill),
+ });
+ setTimeout(() => this.nameElement?.nativeElement?.focus?.(), 0);
+ }
+
+ updateProduct() {
+ if (!this.selectedProduct) return;
+ const formModel = this.productForm.value;
+
+ const p = this.selectedProduct;
+
+ p.name = formModel.name ?? '';
+ p.fraction_units = formModel.fractionUnits ?? '';
+
+ if (!p.saleCategory) p.saleCategory = new SaleCategory();
+ if (p.saleCategory === null || p.saleCategory === undefined) {
+ p.saleCategory = new SaleCategory();
+ }
+
+ p.saleCategory.id = formModel.saleCategory;
+
+ p.validFrom = this.formatDateOrNull(formModel.validFrom);
+ p.validTill = this.formatDateOrNull(formModel.validTill);
+ }
+
+ deleteProduct() {
+ if (!this.selectedProduct) return;
+
+ const idx = (this.item.products ?? []).indexOf(this.selectedProduct);
+ if (idx >= 0) {
+ this.item.products.splice(idx, 1);
+ }
+
+ this.selectedProduct = null;
+
+ // Reset form
+ this.productForm.reset({
+ name: '',
+ fractionUnits: '',
+ saleCategory: '',
+ validFrom: null,
+ validTill: null,
+ });
+ }
+
+ editSku(s: StockKeepingUnit) {
+ this.selectedSku = s;
+
+ this.skuForm.setValue({
+ units: s.units ?? '',
+ fraction: s.fraction ?? 1,
+ productYield: s.productYield ?? 1,
+ costPrice: s.costPrice ?? 0,
+ salePrice: s.salePrice ?? 0,
+ menuCategory: s.menuCategory?.id ?? '',
+
+ hasHappyHour: s.hasHappyHour ?? false,
+ isNotAvailable: s.isNotAvailable ?? false,
+ validFrom: this.parseDateOrNull(s.validFrom),
+ validTill: this.parseDateOrNull(s.validTill),
+ });
+ }
+
+ updateSku() {
+ if (!this.selectedSku) return;
+ const formModel = this.skuForm.value;
+
+ const s = this.selectedSku;
+ s.units = formModel.units ?? '';
+ s.fraction = formModel.fraction ?? 1;
+ s.productYield = formModel.productYield ?? 1;
+ s.costPrice = formModel.costPrice ?? 0;
+ s.salePrice = formModel.salePrice ?? 0;
+
+ if (!s.menuCategory) s.menuCategory = new MenuCategory();
+ if (s.menuCategory === null || s.menuCategory === undefined) {
+ s.menuCategory = new MenuCategory();
+ }
+
+ s.menuCategory.id = formModel.menuCategory;
+
+ s.hasHappyHour = formModel.hasHappyHour ?? false;
+ s.isNotAvailable = formModel.isNotAvailable ?? false;
+
+ s.validFrom = this.formatDateOrNull(formModel.validFrom);
+ s.validTill = this.formatDateOrNull(formModel.validTill);
+ }
+
+ deleteSku() {
+ if (!this.selectedSku) return;
+
+ const idx = (this.item.skus ?? []).indexOf(this.selectedSku);
+ if (idx >= 0) {
+ this.item.skus.splice(idx, 1);
+ }
+
+ this.selectedSku = null;
+
+ // Reset form
+ this.skuForm.reset({
+ units: '',
+ fraction: 1,
+ productYield: 1,
+ costPrice: 0,
+ salePrice: 0,
+ menuCategory: '',
+ hasHappyHour: false,
+ isNotAvailable: false,
+ validFrom: null,
+ validTill: null,
+ });
+ }
+
update() {
- this.ser.update(this.getItem()).subscribe({
+ this.ser.update(this.item).subscribe({
next: () => {
this.snackBar.open('', 'Success');
this.router.navigateByUrl('/temporal-products');
@@ -129,7 +297,7 @@ export class TemporalProductDetailComponent implements OnInit, AfterViewInit {
}
delete() {
- this.ser.delete(this.item.versionId as string).subscribe({
+ this.ser.delete(this.item.products[0].id as string).subscribe({
next: () => {
this.snackBar.open('', 'Success');
this.router.navigateByUrl('/temporal-products');
@@ -152,28 +320,4 @@ export class TemporalProductDetailComponent implements OnInit, AfterViewInit {
}
});
}
-
- getItem(): Product {
- const formModel = this.form.value;
- this.item.id = formModel.id;
- this.item.name = formModel.name ?? '';
- this.item.units = formModel.units ?? '';
- if (this.item.menuCategory === null || this.item.menuCategory === undefined) {
- this.item.menuCategory = new MenuCategory();
- }
- this.item.menuCategory.id = formModel.menuCategory;
- if (this.item.saleCategory === null || this.item.saleCategory === undefined) {
- this.item.saleCategory = new SaleCategory();
- }
- this.item.saleCategory.id = formModel.saleCategory;
- this.item.price = formModel.price ?? 0;
- this.item.hasHappyHour = formModel.hasHappyHour ?? false;
- this.item.isNotAvailable = formModel.isNotAvailable ?? false;
- this.item.quantity = formModel.quantity ?? 0;
- this.item.validFrom = !formModel.validFrom ? null : moment(formModel.validFrom).format('DD-MMM-YYYY');
- console.log(formModel.validTill);
- this.item.validTill = !formModel.validTill ? null : moment(formModel.validTill).format('DD-MMM-YYYY');
-
- return this.item;
- }
}
diff --git a/bookie/src/app/temporal-product/temporal-product-list.resolver.ts b/bookie/src/app/temporal-product/temporal-product-list.resolver.ts
index 5d669cfd..52e43edd 100644
--- a/bookie/src/app/temporal-product/temporal-product-list.resolver.ts
+++ b/bookie/src/app/temporal-product/temporal-product-list.resolver.ts
@@ -1,9 +1,9 @@
import { inject } from '@angular/core';
import { ResolveFn } from '@angular/router';
-import { StockKeepingUnit as Product } from '../core/stock-keeping-unit';
+import { TemporalProduct } from './temporal-product';
import { TemporalProductService } from './temporal-product.service';
-export const temporalProductListResolver: ResolveFn = () => {
+export const temporalProductListResolver: ResolveFn = () => {
return inject(TemporalProductService).list();
};
diff --git a/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list-datasource.ts b/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list-datasource.ts
index 52e44d1b..7f27c51c 100644
--- a/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list-datasource.ts
+++ b/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list-datasource.ts
@@ -2,13 +2,11 @@ import { DataSource } from '@angular/cdk/collections';
import { merge, Observable } from 'rxjs';
import { map, tap } from 'rxjs/operators';
-import { MenuCategory } from '../../core/menu-category';
-import { SaleCategory } from '../../core/sale-category';
-import { StockKeepingUnit as Product } from '../../core/stock-keeping-unit';
+import { TemporalProduct } from '../temporal-product';
-export class TemporalProductListDatasource extends DataSource {
- public data: Product[][];
- public filteredData: Product[][];
+export class TemporalProductListDatasource extends DataSource {
+ public data: TemporalProduct[];
+ public filteredData: TemporalProduct[];
public search: string;
public menuCategory: string;
public saleCategory: string;
@@ -17,7 +15,7 @@ export class TemporalProductListDatasource extends DataSource {
private readonly searchFilter: Observable,
private readonly menuCategoryFilter: Observable,
private readonly saleCategoryFilter: Observable,
- private readonly dataObs: Observable,
+ private readonly dataObs: Observable,
) {
super();
this.data = [];
@@ -27,7 +25,7 @@ export class TemporalProductListDatasource extends DataSource {
this.saleCategory = '';
}
- connect(): Observable {
+ connect(): Observable {
const dataMutations = [
this.dataObs.pipe(
tap((x) => {
@@ -52,42 +50,49 @@ export class TemporalProductListDatasource extends DataSource {
];
return merge(...dataMutations).pipe(
map(() => this.getFilteredData(this.data, this.search, this.menuCategory, this.saleCategory)),
- tap((x: Product[][]) => {
+ tap((x: TemporalProduct[]) => {
this.filteredData = x;
}),
- map((x: Product[][]) => x.reduce((p, c) => p.concat(c), [])),
);
}
disconnect() {}
- private getFilteredData(data: Product[][], search: string, menuCategory: string, saleCategory: string): Product[][] {
- return data.filter(
- (o: Product[]) =>
- o
- .filter(
- (x: Product) =>
- search === null ||
- search === undefined ||
- search === '' ||
- `${x.name} ${x.units} ${x.saleCategory?.name} ${x.menuCategory?.name}`
- .toLowerCase()
- .indexOf(search.toLowerCase()) !== -1,
- )
- .filter(
- (x) =>
- menuCategory === null ||
- menuCategory === undefined ||
- menuCategory === '' ||
- (x.menuCategory as MenuCategory).id === menuCategory,
- )
- .filter(
- (x) =>
- saleCategory === null ||
- saleCategory === undefined ||
- saleCategory === '' ||
- (x.saleCategory as SaleCategory).id === saleCategory,
- ).length > 0,
- );
+ private getFilteredData(
+ data: TemporalProduct[],
+ search: string,
+ menuCategory: string,
+ saleCategory: string,
+ ): TemporalProduct[] {
+ const tokens = (search ?? '').toLowerCase().split(/\s+/).filter(Boolean);
+
+ return data.filter((tp: TemporalProduct) => {
+ search = search.toLowerCase();
+
+ const products = tp.products ?? [];
+ const skus = tp.skus ?? [];
+
+ // 1) Search: match ANY product/sku fields
+ const matchesSearch =
+ tokens.length === 0 ||
+ tokens.every(
+ (token) =>
+ products.some((p) => {
+ const hay = `${p.name ?? ''} ${p.fraction_units ?? ''} ${p.saleCategory?.name ?? ''}`.toLowerCase();
+ return hay.includes(token);
+ }) ||
+ skus.some((k) => {
+ const hay = `${k.units ?? ''} ${k.menuCategory?.name ?? ''}`.toLowerCase();
+ return hay.includes(token);
+ }),
+ );
+
+ const matchesMenuCategory = menuCategory === '' || skus.some((k) => (k.menuCategory?.id ?? '') === menuCategory);
+
+ const matchesSaleCategory =
+ saleCategory === '' || products.some((p) => (p.saleCategory?.id ?? '') === saleCategory);
+
+ return matchesSearch && matchesMenuCategory && matchesSaleCategory;
+ });
}
}
diff --git a/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.html b/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.html
index 9b4376a8..0ade8289 100644
--- a/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.html
+++ b/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.html
@@ -31,16 +31,36 @@
-
- Name
+
+ Products
+
+
+
+
+ Skus
+
+
+ @for (s of row.skus; track s) {
+ -
+ {{ s.units }}
+
+ }
@@ -48,26 +68,26 @@
Price
- {{ row.price | currency: 'INR' }}
+ {{ row.skus.at(-1).price | currency: 'INR' }}
Menu Category
- {{ row.menuCategory.name }}
+ {{ row.skus.at(-1).menuCategory.name }}
Sale Category
- {{ row.saleCategory.name }}
+ {{ row.products.at(-1).saleCategory.name }}
Details
-
-
+
diff --git a/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.ts b/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.ts
index 8406e53e..cefa36a4 100644
--- a/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.ts
+++ b/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.ts
@@ -1,4 +1,4 @@
-import { DecimalPipe, CurrencyPipe } from '@angular/common';
+import { CurrencyPipe } from '@angular/common';
import { Component, OnInit, inject } from '@angular/core';
import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
import { MatOptionModule } from '@angular/material/core';
@@ -13,7 +13,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
import { MenuCategory } from '../../core/menu-category';
import { SaleCategory } from '../../core/sale-category';
-import { StockKeepingUnit as Product } from '../../core/stock-keeping-unit';
+import { TemporalProduct } from '../temporal-product';
import { TemporalProductListDatasource } from './temporal-product-list-datasource';
@Component({
@@ -22,7 +22,7 @@ import { TemporalProductListDatasource } from './temporal-product-list-datasourc
styleUrls: ['./temporal-product-list.component.css'],
imports: [
CurrencyPipe,
- DecimalPipe,
+ // DecimalPipe,
MatFormFieldModule,
MatIconModule,
@@ -40,7 +40,7 @@ export class TemporalProductListComponent implements OnInit {
searchFilter = new Observable();
menuCategoryFilter = new BehaviorSubject('');
saleCategoryFilter = new BehaviorSubject('');
- data: BehaviorSubject = new BehaviorSubject([]);
+ data: BehaviorSubject = new BehaviorSubject([]);
dataSource: TemporalProductListDatasource = new TemporalProductListDatasource(
this.searchFilter,
this.menuCategoryFilter,
@@ -54,11 +54,11 @@ export class TemporalProductListComponent implements OnInit {
saleCategory: FormControl;
}>;
- list: Product[][] = [];
+ list: TemporalProduct[] = [];
menuCategories: MenuCategory[] = [];
saleCategories: SaleCategory[] = [];
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
- displayedColumns: string[] = ['name', 'price', 'menuCategory', 'saleCategory', 'info', 'quantity'];
+ displayedColumns: string[] = ['product', 'sku', 'price', 'menuCategory', 'saleCategory', 'info'];
constructor() {
this.form = new FormGroup({
@@ -66,7 +66,7 @@ export class TemporalProductListComponent implements OnInit {
menuCategory: new FormControl(''),
saleCategory: new FormControl(''),
});
- this.data.subscribe((data: Product[][]) => {
+ this.data.subscribe((data: TemporalProduct[]) => {
this.list = data;
});
this.searchFilter = this.form.controls.filter.valueChanges.pipe(debounceTime(150), distinctUntilChanged());
@@ -89,7 +89,7 @@ export class TemporalProductListComponent implements OnInit {
);
this.route.data.subscribe((value) => {
const data = value as {
- list: Product[][];
+ list: TemporalProduct[];
menuCategories: MenuCategory[];
saleCategories: SaleCategory[];
};
@@ -97,7 +97,7 @@ export class TemporalProductListComponent implements OnInit {
});
}
- loadData(list: Product[][], menuCategories: MenuCategory[], saleCategories: SaleCategory[]) {
+ loadData(list: TemporalProduct[], menuCategories: MenuCategory[], saleCategories: SaleCategory[]) {
this.menuCategories = menuCategories;
this.saleCategories = saleCategories;
this.data.next(list);
diff --git a/bookie/src/app/temporal-product/temporal-product.resolver.ts b/bookie/src/app/temporal-product/temporal-product.resolver.ts
index 5c517527..7652b7fa 100644
--- a/bookie/src/app/temporal-product/temporal-product.resolver.ts
+++ b/bookie/src/app/temporal-product/temporal-product.resolver.ts
@@ -1,10 +1,10 @@
import { inject } from '@angular/core';
import { ResolveFn } from '@angular/router';
-import { StockKeepingUnit as Product } from '../core/stock-keeping-unit';
+import { TemporalProduct } from './temporal-product';
import { TemporalProductService } from './temporal-product.service';
-export const temporalProductResolver: ResolveFn = (route) => {
+export const temporalProductResolver: ResolveFn = (route) => {
const id = route.paramMap.get('id');
return inject(TemporalProductService).get(id as string);
};
diff --git a/bookie/src/app/temporal-product/temporal-product.service.ts b/bookie/src/app/temporal-product/temporal-product.service.ts
index 9e2bb589..c20808a9 100644
--- a/bookie/src/app/temporal-product/temporal-product.service.ts
+++ b/bookie/src/app/temporal-product/temporal-product.service.ts
@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
import { catchError } from 'rxjs/operators';
import { ErrorLoggerService } from '../core/error-logger.service';
-import { StockKeepingUnit as Product } from '../core/stock-keeping-unit';
+import { TemporalProduct } from './temporal-product';
const httpOptions = {
headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
@@ -18,27 +18,27 @@ export class TemporalProductService {
private http = inject(HttpClient);
private log = inject(ErrorLoggerService);
- get(id: string): Observable {
+ get(id: string): Observable {
return this.http
- .get(`${url}/${id}`)
- .pipe(catchError(this.log.handleError(serviceName, `get id=${id}`))) as Observable;
+ .get(`${url}/${id}`)
+ .pipe(catchError(this.log.handleError(serviceName, `get id=${id}`))) as Observable;
}
- list(): Observable {
+ list(): Observable {
return this.http
- .get(`${url}/list`)
- .pipe(catchError(this.log.handleError(serviceName, 'list'))) as Observable;
+ .get(`${url}/list`)
+ .pipe(catchError(this.log.handleError(serviceName, 'list'))) as Observable;
}
- update(product: Product): Observable {
+ update(product: TemporalProduct): Observable {
return this.http
- .put(`${url}/${product.versionId}`, product, httpOptions)
+ .put(`${url}/${product.products[0].id}`, product, httpOptions)
.pipe(catchError(this.log.handleError(serviceName, 'update'))) as Observable;
}
delete(id: string): Observable {
return this.http
- .delete(`${url}/${id}`, httpOptions)
+ .delete(`${url}/${id}`, httpOptions)
.pipe(catchError(this.log.handleError(serviceName, 'delete'))) as Observable;
}
}
diff --git a/bookie/src/app/temporal-product/temporal-product.ts b/bookie/src/app/temporal-product/temporal-product.ts
new file mode 100644
index 00000000..d26f1771
--- /dev/null
+++ b/bookie/src/app/temporal-product/temporal-product.ts
@@ -0,0 +1,68 @@
+import { MenuCategory } from '../core/menu-category';
+import { SaleCategory } from '../core/sale-category';
+
+export class Product {
+ id: string | undefined;
+ versionId?: string;
+ name: string;
+ fraction_units: string;
+ saleCategory?: SaleCategory;
+ sortOrder: number;
+
+ validFrom: string | null;
+ validTill: string | null;
+
+ public constructor(init?: Partial) {
+ this.id = undefined;
+ this.name = '';
+ this.fraction_units = '';
+ this.sortOrder = 0;
+ this.validFrom = null;
+ this.validTill = null;
+ Object.assign(this, init);
+ }
+}
+
+export class StockKeepingUnit {
+ id: string | undefined;
+ versionId?: string;
+ units: string;
+ fraction: number;
+ productYield: number;
+ costPrice: number;
+ salePrice: number;
+ menuCategory?: MenuCategory;
+
+ sortOrder: number;
+
+ hasHappyHour: boolean;
+ isNotAvailable: boolean;
+
+ validFrom: string | null;
+ validTill: string | null;
+
+ public constructor(init?: Partial) {
+ this.units = '';
+ this.fraction = 1;
+ this.productYield = 1;
+ this.costPrice = 0;
+ this.salePrice = 0;
+ this.sortOrder = 0;
+ this.hasHappyHour = false;
+ this.isNotAvailable = false;
+ this.validFrom = null;
+ this.validTill = null;
+ Object.assign(this, init);
+ }
+}
+
+export class TemporalProduct {
+ products: Product[];
+ skus: StockKeepingUnit[];
+
+ public constructor(init?: Partial) {
+ this.products = [];
+ this.skus = [];
+ Object.assign(this, init);
+ }
+}