Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
50846ace3f | ||
|
|
e36de39ed5 |
@@ -1 +1 @@
|
|||||||
__version__ = "12.1.4"
|
__version__ = "12.1.5"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "barker"
|
name = "barker"
|
||||||
version = "12.1.4"
|
version = "12.1.5"
|
||||||
description = "Point of Sale for a restaurant"
|
description = "Point of Sale for a restaurant"
|
||||||
authors = ["tanshu <git@tanshu.com>"]
|
authors = ["tanshu <git@tanshu.com>"]
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "bookie",
|
"name": "bookie",
|
||||||
"version": "12.1.4",
|
"version": "12.1.5",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "ng serve",
|
"start": "ng serve",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
export const environment = {
|
export const environment = {
|
||||||
production: true,
|
production: true,
|
||||||
ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry
|
ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry
|
||||||
version: '12.1.4',
|
version: '12.1.5',
|
||||||
};
|
};
|
||||||
|
|
||||||
export const dateFormat = {
|
export const dateFormat = {
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ export class BillService {
|
|||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
list: this.modifierCategoryService.listForProduct(item.product.id as string),
|
list: this.modifierCategoryService.listForProduct(item.product.id as string),
|
||||||
selected: item.modifiers,
|
selected: Object.assign([], item.modifiers),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -160,8 +160,8 @@ export class BillService {
|
|||||||
if (result !== undefined) {
|
if (result !== undefined) {
|
||||||
item.modifiers = result;
|
item.modifiers = result;
|
||||||
}
|
}
|
||||||
});
|
|
||||||
this.displayBill();
|
this.displayBill();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
addOne(item: BillViewItem): void {
|
addOne(item: BillViewItem): void {
|
||||||
|
|||||||
@@ -66,7 +66,7 @@
|
|||||||
{{ row.info }}
|
{{ row.info }}
|
||||||
</span>
|
</span>
|
||||||
<ul>
|
<ul>
|
||||||
@for (m of row.modifiers; track m) {
|
@for (m of row.modifiers; track m.id) {
|
||||||
<li>{{ m.name }}</li>
|
<li>{{ m.name }}</li>
|
||||||
}
|
}
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@@ -1,26 +1,11 @@
|
|||||||
import { AsyncPipe, CurrencyPipe } from '@angular/common';
|
import { AsyncPipe, CurrencyPipe } from '@angular/common';
|
||||||
import { Component, OnInit } from '@angular/core';
|
import { Component, OnInit } from '@angular/core';
|
||||||
import { MatButton, MatIconButton } from '@angular/material/button';
|
import { MatButtonModule } from '@angular/material/button';
|
||||||
import { MatCard, MatCardHeader, MatCardTitle, MatCardContent } from '@angular/material/card';
|
import { MatCardModule } from '@angular/material/card';
|
||||||
import { MatCheckbox } from '@angular/material/checkbox';
|
import { MatCheckbox } from '@angular/material/checkbox';
|
||||||
import { MatDialog } from '@angular/material/dialog';
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
import { MatIcon } from '@angular/material/icon';
|
import { MatIcon } from '@angular/material/icon';
|
||||||
import {
|
import { MatTableModule } from '@angular/material/table';
|
||||||
MatTable,
|
|
||||||
MatColumnDef,
|
|
||||||
MatHeaderCellDef,
|
|
||||||
MatHeaderCell,
|
|
||||||
MatCellDef,
|
|
||||||
MatCell,
|
|
||||||
MatHeaderRowDef,
|
|
||||||
MatHeaderRow,
|
|
||||||
MatRowDef,
|
|
||||||
MatRow,
|
|
||||||
MatFooterRowDef,
|
|
||||||
MatFooterRow,
|
|
||||||
MatFooterCellDef,
|
|
||||||
MatFooterCell,
|
|
||||||
} from '@angular/material/table';
|
|
||||||
import { MatTooltip } from '@angular/material/tooltip';
|
import { MatTooltip } from '@angular/material/tooltip';
|
||||||
import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
|
import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
@@ -51,29 +36,12 @@ import { VoucherType } from './voucher-type';
|
|||||||
templateUrl: './bills.component.html',
|
templateUrl: './bills.component.html',
|
||||||
styleUrls: ['./bills.component.sass'],
|
styleUrls: ['./bills.component.sass'],
|
||||||
imports: [
|
imports: [
|
||||||
MatCard,
|
MatCardModule,
|
||||||
MatCardHeader,
|
MatTableModule,
|
||||||
MatCardTitle,
|
|
||||||
MatCardContent,
|
|
||||||
MatTable,
|
|
||||||
MatColumnDef,
|
|
||||||
MatHeaderCellDef,
|
|
||||||
MatHeaderCell,
|
|
||||||
MatTooltip,
|
MatTooltip,
|
||||||
MatButton,
|
MatButtonModule,
|
||||||
MatCellDef,
|
|
||||||
MatCell,
|
|
||||||
MatCheckbox,
|
MatCheckbox,
|
||||||
MatIconButton,
|
|
||||||
MatIcon,
|
MatIcon,
|
||||||
MatHeaderRowDef,
|
|
||||||
MatHeaderRow,
|
|
||||||
MatRowDef,
|
|
||||||
MatRow,
|
|
||||||
MatFooterRowDef,
|
|
||||||
MatFooterRow,
|
|
||||||
MatFooterCellDef,
|
|
||||||
MatFooterCell,
|
|
||||||
RouterOutlet,
|
RouterOutlet,
|
||||||
AsyncPipe,
|
AsyncPipe,
|
||||||
CurrencyPipe,
|
CurrencyPipe,
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
</mat-chip-listbox>
|
</mat-chip-listbox>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<div class="flex flex-row flex-wrap -mr-5 -mb-5">
|
<div class="flex flex-row flex-wrap -mr-5 -mb-5">
|
||||||
@for (m of item.modifiers; track m) {
|
@for (m of item.modifiers; track m.id) {
|
||||||
<mat-card
|
<mat-card
|
||||||
class="flex flex-col square-button mr-5, mb-5"
|
class="flex flex-col square-button mr-5, mb-5"
|
||||||
matRipple
|
matRipple
|
||||||
|
|||||||
@@ -3,10 +3,10 @@ import { Component, Inject } from '@angular/core';
|
|||||||
import { MatBadge } from '@angular/material/badge';
|
import { MatBadge } from '@angular/material/badge';
|
||||||
import { MatButton } from '@angular/material/button';
|
import { MatButton } from '@angular/material/button';
|
||||||
import { MatCard } from '@angular/material/card';
|
import { MatCard } from '@angular/material/card';
|
||||||
import { MatChipListbox, MatChipOption } from '@angular/material/chips';
|
import { MatChipsModule } from '@angular/material/chips';
|
||||||
import { MatRipple } from '@angular/material/core';
|
import { MatRipple } from '@angular/material/core';
|
||||||
import { MAT_DIALOG_DATA, MatDialogContent, MatDialogActions, MatDialogClose } from '@angular/material/dialog';
|
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
|
||||||
import { MatTabGroup, MatTab, MatTabLabel } from '@angular/material/tabs';
|
import { MatTabsModule } from '@angular/material/tabs';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
|
|
||||||
import { Modifier } from '../../core/modifier';
|
import { Modifier } from '../../core/modifier';
|
||||||
@@ -16,21 +16,7 @@ import { ModifierCategory } from '../../core/modifier-category';
|
|||||||
selector: 'app-modifiers',
|
selector: 'app-modifiers',
|
||||||
templateUrl: './modifiers.component.html',
|
templateUrl: './modifiers.component.html',
|
||||||
styleUrls: ['./modifiers.component.css'],
|
styleUrls: ['./modifiers.component.css'],
|
||||||
imports: [
|
imports: [CdkScrollable, MatDialogModule, MatTabsModule, MatChipsModule, MatBadge, MatCard, MatRipple, MatButton],
|
||||||
CdkScrollable,
|
|
||||||
MatDialogContent,
|
|
||||||
MatTabGroup,
|
|
||||||
MatTab,
|
|
||||||
MatTabLabel,
|
|
||||||
MatChipListbox,
|
|
||||||
MatBadge,
|
|
||||||
MatChipOption,
|
|
||||||
MatCard,
|
|
||||||
MatRipple,
|
|
||||||
MatDialogActions,
|
|
||||||
MatButton,
|
|
||||||
MatDialogClose,
|
|
||||||
],
|
|
||||||
})
|
})
|
||||||
export class ModifiersComponent {
|
export class ModifiersComponent {
|
||||||
list: ModifierCategory[] = [];
|
list: ModifierCategory[] = [];
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "frank"
|
name = "frank"
|
||||||
version = "12.1.4"
|
version = "12.1.5"
|
||||||
description = "Point of Sale for a restaurant"
|
description = "Point of Sale for a restaurant"
|
||||||
authors = ["tanshu <git@tanshu.com>"]
|
authors = ["tanshu <git@tanshu.com>"]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user