tanshu/barker
1
0
Fork 0
Code Issues 1 Pull Requests Releases 4 Activity

Added feature: Split bill by Sales Category if no item is selected.

Browse Source
This commit is contained in:
Amritanshu Agrawal
2020-12-25 11:47:03 +05:30
parent 6257313792
commit 41d4ef1200
7 changed files with 204 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
bookie/src/app/sales/home/sales-home.component.ts
View File

@ -13,10 +13,12 @@ import { ConfirmDialogComponent } from '../../shared/confirm-dialog/confirm-dial
import { TableService } from '../../tables/table.service';
import { BillTypeComponent } from '../bill-type/bill-type.component';
import { BillService } from '../bill.service';
import { BillSelectionItem } from '../bills/bill-selection-item';
import { VoucherType } from '../bills/voucher-type';
import { DiscountComponent } from '../discount/discount.component';
import { ReasonComponent } from '../reason/reason.component';
import { ReceivePaymentComponent } from '../receive-payment/receive-payment.component';
import { SplitBillComponent } from '../split-bill/split-bill.component';
import { TablesDialogComponent } from '../tables-dialog/tables-dialog.component';
@Component({
@ -100,17 +102,17 @@ export class SalesHomeComponent {
return this.dialog.open(BillTypeComponent).afterClosed();
}
confirmTableDialog(table: Table): Observable<{ table: Table; confirmed: boolean }> {
confirmTableDialog(table: Table): Observable<Table | boolean> {
return this.dialog
.open(ConfirmDialogComponent, {
width: '250px',
data: { title: 'Select Table?', content: 'Are you sure?' },
})
.afterClosed()
.pipe(map((x: boolean) => ({ table, confirmed: x })));
.pipe(map((x: boolean) => (x ? table : x)));
}
confirmVoidDialog(reason: string): Observable<boolean | string> {
confirmVoidDialog(reason: string): Observable<string | boolean> {
return this.dialog
.open(ConfirmDialogComponent, {
width: '250px',
@ -237,32 +239,22 @@ export class SalesHomeComponent {
return;
}
const canMergeTables = this.auth.allowed('merge-tables');
this.dialog
.open(TablesDialogComponent, {
// width: '750px',
data: {
list: this.tSer.running(),
canChooseRunning: canMergeTables,
},
})
.afterClosed()
this.showChooseTableDialog(canMergeTables)
.pipe(
switchMap((x: boolean | Table) => {
if (x) {
return this.confirmTableDialog(x as Table);
tap((x) => {
if (!x) {
throw new Error('Please choose a table');
}
throw new Error('Please choose a table');
}),
// eslint-disable-next-line @typescript-eslint/no-unused-vars
switchMap((value: { table: Table; confirmed: boolean }, index: number) => {
if (!value.confirmed) {
throw new Error('Please confirm move');
map((x) => x as Table),
switchMap((x: Table) => this.confirmTableDialog(x)),
tap((x) => {
if (!x) {
throw new Error('Move Table Cancelled');
}
if (value.table.status) {
return this.bs.mergeTable(value.table);
}
return this.bs.moveTable(value.table);
}),
map((x) => x as Table),
switchMap((x: Table) => (x.status ? this.bs.mergeTable(x) : this.bs.moveTable(x))),
)
.subscribe(
() => {
@ -341,33 +333,56 @@ export class SalesHomeComponent {
return true;
}
splitBill() {
if (!this.splitBillAllowed()) {
return;
}
this.dialog
showBillSplitChoices(): Observable<
{ id: string; name: string; selected: boolean }[] | undefined | false
> {
return this.dialog
.open(SplitBillComponent, {
data: this.mcSer
.list()
.pipe(map((x) => x.map((y) => ({ id: y.id, name: y.name, selected: false })))),
})
.afterClosed();
}
showChooseTableDialog(canChooseRunning: boolean): Observable<Table | undefined | null> {
return this.dialog
.open(TablesDialogComponent, {
// width: '750px',
data: {
list: this.tSer.running(),
canChooseRunning: false,
canChooseRunning,
},
})
.afterClosed()
.afterClosed();
}
splitBill() {
if (!this.splitBillAllowed()) {
return;
}
const obs = this.bs.selection.isEmpty()
? this.splitBillWithChoice()
: this.splitBillWithSelection();
let inventories: string[];
obs
.pipe(
switchMap((x: boolean | Table) => {
if (x) {
return this.confirmTableDialog(x as Table);
tap((x) => (inventories = x)),
switchMap((x) => this.showChooseTableDialog(false)),
tap((x) => {
if (!x) {
throw new Error('Please choose a table');
}
throw new Error('Please choose a table');
}),
// eslint-disable-next-line @typescript-eslint/no-unused-vars
switchMap((value: { table: Table; confirmed: boolean }, index: number) => {
if (!value.confirmed) {
throw new Error('Please confirm split');
map((x) => x as Table),
switchMap((x: Table) => this.confirmTableDialog(x)),
tap((x) => {
if (!x) {
throw new Error('Bill Split Cancelled');
}
return this.bs.splitBill(value.table);
}),
map((x) => x as Table),
switchMap((x: Table) => this.bs.splitBill(inventories, x)),
)
.subscribe(
() => {
@ -379,4 +394,35 @@ export class SalesHomeComponent {
},
);
}
splitBillWithChoice() {
let inventories: string[];
return this.showBillSplitChoices().pipe(
tap((x) => {
if (x === undefined || x === false) {
throw new Error('Cancelled');
}
}),
map((x) =>
(x as { id: string; name: string; selected: boolean }[])
.filter((y) => y.selected)
.map((y) => y.id),
),
tap((x: string[]) => {
const sel = this.bs.getInventories(x);
if (sel.keep.length === 0 || sel.move.length === 0) {
throw new Error('This will move either All or None of the items. Cancelled');
}
inventories = sel.move;
}),
map((x) => inventories),
);
}
splitBillWithSelection() {
const inventories: string[] = this.bs.selection.selected.map(
(x: string) => (JSON.parse(x) as BillSelectionItem).inventoryId as string,
);
return observableOf(inventories);
}
}