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

Fully working with the rule no explicit any

Browse Source
This commit is contained in:
Amritanshu Agrawal
2020-11-25 09:27:42 +05:30
parent 84535ca9bb
commit b583b90756
27 changed files with 223 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bookie/src/app/sales/bill-type/bill-type.component.ts
View File

@ -20,9 +20,9 @@ export class BillTypeComponent {
}
accept(): void {
if (this.selected === 'REGULAR_BILL') this.dialogRef.close(VoucherType.Bill)
else if (this.selected === 'STAFF') this.dialogRef.close(VoucherType.Staff)
else if (this.selected === 'NO_CHARGE') this.dialogRef.close(VoucherType.NoCharge)
if (this.selected === 'REGULAR_BILL') this.dialogRef.close(VoucherType.Bill);
else if (this.selected === 'STAFF') this.dialogRef.close(VoucherType.Staff);
else if (this.selected === 'NO_CHARGE') this.dialogRef.close(VoucherType.NoCharge);
else this.dialogRef.close();
}
}

53
bookie/src/app/sales/bill.service.ts
View File

@ -21,14 +21,14 @@ import { ModifiersComponent } from './modifiers/modifiers.component';
@Injectable()
export class BillService {
public dataObs;
public data: any[];
public dataObs: BehaviorSubject<BillViewItem[]>;
public data: BillViewItem[];
public bill: Bill = new Bill();
public netAmount: BehaviorSubject<number>;
public discountAmount: BehaviorSubject<number>;
public taxAmount: BehaviorSubject<number>;
public amount: BehaviorSubject<number>;
public selection = new SelectionModel<any>(true, []);
public selection = new SelectionModel<BillViewItem>(true, []);
constructor(
private dialog: MatDialog,
@ -37,7 +37,7 @@ export class BillService {
private modifierCategoryService: ModifierCategoryService,
) {
this.data = [];
this.dataObs = new BehaviorSubject<any[]>(this.data);
this.dataObs = new BehaviorSubject<BillViewItem[]>(this.data);
this.netAmount = new BehaviorSubject(0);
this.discountAmount = new BehaviorSubject(0);
this.taxAmount = new BehaviorSubject(0);
@ -50,7 +50,6 @@ export class BillService {
new BillViewItem({
id: k.id,
isKot: true,
oldKot: true,
info: `Kot: ${k.code} / ${k.date} (${k.user.name}) `,
}),
...k.inventories.map(
@ -74,7 +73,7 @@ export class BillService {
),
]);
this.data = view.reduce((a, c) => a.concat(c), []);
this.data.push({ isKot: true, newKot: true, info: '== New Kot ==' });
this.data.push(new BillViewItem({ isKot: true, info: '== New Kot ==' }));
this.dataObs.next(this.data);
this.updateAmounts();
}
@ -101,7 +100,7 @@ export class BillService {
if (old !== undefined) {
old.quantity += quantity;
} else {
const item = {
const item = new BillViewItem({
isKot: false,
product,
productId: product.id,
@ -113,11 +112,11 @@ export class BillService {
taxRate: product.tax.rate,
tax: product.tax,
modifiers: [],
};
});
this.data.push(item);
this.modifierCategoryService.listForProduct(product.id as string).subscribe((result) => {
if (
result.reduce((a: any, c: ModifierCategory) => {
result.reduce((a: number, c: ModifierCategory) => {
return a + c.minimum;
}, 0)
) {
@ -129,14 +128,14 @@ export class BillService {
this.updateAmounts();
}
showModifier(item: any): void {
showModifier(item: BillViewItem): void {
// [routerLink]="['/sales', 'modifiers', item.id]"
const dialogRef = this.dialog.open(ModifiersComponent, {
position: {
top: '10vh',
},
data: {
list: this.modifierCategoryService.listForProduct(item.productId),
list: this.modifierCategoryService.listForProduct(item.productId as string),
selected: item.modifiers,
},
});
@ -148,20 +147,23 @@ export class BillService {
});
}
addOne(item: any): void {
addOne(item: BillViewItem): void {
item.quantity += 1;
this.dataObs.next(this.data);
this.updateAmounts();
}
quantity(item: any, quantity: number): void {
quantity(item: BillViewItem, quantity: number): void {
item.quantity = quantity;
this.dataObs.next(this.data);
this.updateAmounts();
}
subtractOne(item: any, canEdit: boolean): void {
if (item.quantity > 1 || (canEdit && this.minimum(item.productId, item.isHappyHour) >= 1)) {
subtractOne(item: BillViewItem, canEdit: boolean): void {
if (
item.quantity > 1 ||
(canEdit && this.minimum(item.productId as string, item.isHappyHour) >= 1)
) {
item.quantity -= 1;
this.dataObs.next(this.data);
this.updateAmounts();
@ -170,13 +172,13 @@ export class BillService {
}
}
removeItem(item: any): void {
removeItem(item: BillViewItem): void {
this.data.splice(this.data.indexOf(item), 1);
this.dataObs.next(this.data);
this.updateAmounts();
}
modifier(item: any): void {
modifier(item: BillViewItem): void {
this.showModifier(item);
}
@ -230,7 +232,7 @@ export class BillService {
const item = JSON.parse(JSON.stringify(this.bill));
item.kots.forEach((k: Kot) => {
k.inventories.forEach((i: Inventory) => {
i.discount = this.data.find((x) => !x.isKot && x.id === i.id).discount;
i.discount = (this.data.find((x) => !x.isKot && x.id === i.id) as BillViewItem).discount;
});
});
item.kots.push(this.getKot());
@ -273,7 +275,10 @@ export class BillService {
math.round(
this.data
.filter((x) => !x.isKot)
.reduce((ca: number, c: any) => ca + (c.isHappyHour ? 0 : c.price) * c.quantity, 0),
.reduce(
(ca: number, c: BillViewItem) => ca + (c.isHappyHour ? 0 : c.price) * c.quantity,
0,
),
),
);
this.discountAmount.next(
@ -281,7 +286,7 @@ export class BillService {
this.data
.filter((x) => !x.isKot)
.reduce(
(ca: number, c: Inventory) =>
(ca: number, c: BillViewItem) =>
ca + (c.isHappyHour ? 0 : c.price) * c.quantity * c.discount,
0,
),
@ -292,7 +297,7 @@ export class BillService {
this.data
.filter((x) => !x.isKot)
.reduce(
(ca: number, c: Inventory) =>
(ca: number, c: BillViewItem) =>
ca + (c.isHappyHour ? 0 : c.price) * c.quantity * (1 - c.discount) * c.taxRate,
0,
),
@ -303,7 +308,7 @@ export class BillService {
this.data
.filter((x) => !x.isKot)
.reduce(
(ca: number, c: Inventory) =>
(ca: number, c: BillViewItem) =>
ca + (c.isHappyHour ? 0 : c.price) * c.quantity * (1 - c.discount) * (1 + c.taxRate),
0,
),
@ -327,7 +332,9 @@ export class BillService {
}
splitBill(table: Table): Observable<boolean> {
const inventoriesToMove: string[] = this.selection.selected.map((x: any) => x.id);
const inventoriesToMove: string[] = this.selection.selected.map(
(x: BillViewItem) => x.id as string,
);
return this.ser.splitBill(this.bill.id as string, inventoriesToMove, table);
}
}

8
bookie/src/app/sales/bills/bill.ts
View File

@ -16,12 +16,12 @@ export class Bill {
kotId: string;
table: Table;
guest: GuestBook;
settlements: any[];
// settlements: any[];
voidReason: string;
voucherType: string;
serial: number;
kots: Kot[];
reprints: any[];
// reprints: any[];
get dateTip(): string {
return this.date;
@ -46,12 +46,12 @@ export class Bill {
this.kotId = '';
this.table = new Table();
this.guest = new GuestBook();
this.settlements = [];
// this.settlements = [];
this.voidReason = '';
this.voucherType = '';
this.serial = 0;
this.kots = [];
this.reprints = [];
// this.reprints = [];
Object.assign(this, init);
}
}

8
bookie/src/app/sales/bills/bills-datasource.ts
View File

@ -1,12 +1,14 @@
import { DataSource } from '@angular/cdk/collections';
import { Observable } from 'rxjs';
export class BillsDataSource extends DataSource<any> {
constructor(private data: Observable<any[]>) {
import { BillViewItem } from '../../core/bill-view-item';
export class BillsDataSource extends DataSource<BillViewItem> {
constructor(private data: Observable<BillViewItem[]>) {
super();
}
connect(): Observable<any[]> {
connect(): Observable<BillViewItem[]> {
return this.data;
}

15
bookie/src/app/sales/bills/bills.component.html
View File

@ -52,7 +52,7 @@
<ng-container matColumnDef="select">
<mat-cell *matCellDef="let row">
<mat-checkbox
*ngIf="row.oldKot"
*ngIf="row.isOldKot"
(change)="$event ? masterToggle(row) : null"
[checked]="bs.selection.hasValue() && isAllSelected(row)"
[indeterminate]="isAnySelected(row)"
@ -70,7 +70,7 @@
</ng-container>
<!-- Info Column -->
<ng-container matColumnDef="info">
<mat-cell *matCellDef="let row" [class.blue800]="row.newKot">
<mat-cell *matCellDef="let row" [class.blue800]="row.isNewKot">
<span>
{{ row.info }}
</span>
@ -123,7 +123,12 @@
>
<mat-icon class="del">assignment</mat-icon>
</button>
<button mat-icon-button (click)="moveKot(row)" [disabled]="row.newKot" *ngIf="row.isKot">
<button
mat-icon-button
(click)="moveKot(row)"
[disabled]="row.isKot && !row.id"
*ngIf="row.isKot"
>
<mat-icon class="del">open_in_new</mat-icon>
</button>
</mat-cell>
@ -166,8 +171,8 @@
<mat-header-row *matHeaderRowDef="['table-title', 'table-details']"></mat-header-row>
<mat-row
*matRowDef="let row; columns: displayedColumns"
[class.blue400]="row.oldKot"
[class.blue800]="row.newKot"
[class.blue400]="row.isOldKot"
[class.blue800]="row.isNewKot"
[class.red100]="row.isPrinted"
></mat-row>
<mat-footer-row *matFooterRowDef="['net-title', 'net-amount']"></mat-footer-row>

17
bookie/src/app/sales/bills/bills.component.ts
View File

@ -5,6 +5,7 @@ import { Observable } from 'rxjs';
import { map, switchMap } from 'rxjs/operators';
import { AuthService } from '../../auth/auth.service';
import { BillViewItem } from '../../core/bill-view-item';
import { Table } from '../../core/table';
import { ToasterService } from '../../core/toaster.service';
import { ConfirmDialogComponent } from '../../shared/confirm-dialog/confirm-dialog.component';
@ -68,7 +69,7 @@ export class BillsComponent implements OnInit {
isAllSelected(kot: Kot) {
return this.bs.data
.filter((x) => x.kotId === kot.id)
.reduce((p: boolean, c: any) => p && this.bs.selection.isSelected(c), true);
.reduce((p: boolean, c: BillViewItem) => p && this.bs.selection.isSelected(c), true);
}
isAnySelected(kot: Kot) {
@ -76,7 +77,7 @@ export class BillsComponent implements OnInit {
let found = 0;
this.bs.data
.filter((x) => x.kotId === kot.id)
.forEach((c: any) => {
.forEach((c: BillViewItem) => {
total += 1;
if (this.bs.selection.isSelected(c)) {
found += 1;
@ -94,11 +95,11 @@ export class BillsComponent implements OnInit {
);
}
addOne(item: any): void {
addOne(item: BillViewItem): void {
this.bs.addOne(item);
}
quantity(item: any): void {
quantity(item: BillViewItem): void {
const dialogRef = this.dialog.open(QuantityComponent, {
// width: '750px',
data: item.quantity,
@ -123,16 +124,16 @@ export class BillsComponent implements OnInit {
});
}
subtractOne(item: any): void {
subtractOne(item: BillViewItem): void {
const canEdit = this.auth.allowed('edit-printed-product');
this.bs.subtractOne(item, canEdit);
}
removeItem(item: any): void {
removeItem(item: BillViewItem): void {
this.bs.removeItem(item);
}
modifier(item: any): void {
modifier(item: BillViewItem): void {
this.bs.modifier(item);
}
@ -202,7 +203,7 @@ export class BillsComponent implements OnInit {
);
}
rowQuantityDisabled(row: any) {
rowQuantityDisabled(row: BillViewItem) {
if (!row.isPrinted) {
return false;
}

6
bookie/src/app/sales/discount/discount.component.ts
View File

@ -11,7 +11,7 @@ import { DiscountDataSource } from './discount-datasource';
styleUrls: ['./discount.component.css'],
})
export class DiscountComponent {
list: any[] = [];
list: { name: string; discount: number }[] = [];
form: FormGroup;
dataSource: DiscountDataSource = new DiscountDataSource([]);
@ -20,12 +20,12 @@ export class DiscountComponent {
constructor(
public dialogRef: MatDialogRef<DiscountComponent>,
private fb: FormBuilder,
@Inject(MAT_DIALOG_DATA) public data: Observable<any[]>,
@Inject(MAT_DIALOG_DATA) public data: Observable<{ name: string; discount: number }[]>,
) {
this.form = this.fb.group({
discounts: '',
});
this.data.subscribe((list: any[]) => {
this.data.subscribe((list: { name: string; discount: number }[]) => {
this.list = list;
this.form.setControl(
'discounts',

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

@ -249,7 +249,7 @@ export class SalesHomeComponent {
}
const amount = this.bs.amountVal();
const type = this.bs.type();
let obs: any;
let obs: Observable<boolean>;
if (type === 'NO_CHARGE' || type === 'STAFF') {
obs = this.receivePaymentWithReason(type, amount);
} else {