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

Fix: Kot move fixed. Kot id was missing on move. Also, voucher_type KOT as truthy not and would give bill not found error.

Browse Source
This commit is contained in:
Amritanshu Agrawal 2020-12-24 09:10:55 +05:30
parent 7550ced477
commit 565cffaef1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
barker/barker/routers/voucher/merge_move.py
View File

@ -165,7 +165,7 @@ def update_settlements(vouchers: List[uuid.UUID], db: Session):
def check_if_voucher_is_unprinted(voucher_id: uuid.UUID, db: Session) -> None: def check_if_voucher_is_unprinted(voucher_id: uuid.UUID, db: Session) -> None:
voucher_type: VoucherType = db.query(Voucher.voucher_type).filter(Voucher.id == voucher_id).scalar() voucher_type: VoucherType = db.query(Voucher.voucher_type).filter(Voucher.id == voucher_id).scalar()
if not voucher_type: if voucher_type is None:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND, status_code=status.HTTP_404_NOT_FOUND,
detail="Original bill not found", detail="Original bill not found",

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

@ -220,7 +220,7 @@ export class BillsComponent implements OnInit {
); );
} }
moveKot(kot: Kot) { moveKot(kot: BillViewItem) {
const canMergeTables = this.auth.allowed('merge-tables'); const canMergeTables = this.auth.allowed('merge-tables');
this.chooseTable(canMergeTables) this.chooseTable(canMergeTables)
.pipe( .pipe(
@ -233,9 +233,9 @@ export class BillsComponent implements OnInit {
return this.bs.moveTable(table); return this.bs.moveTable(table);
} }
if (table.status) { if (table.status) {
return this.bs.mergeKot(kot.id as string, table); return this.bs.mergeKot(kot.kotId as string, table);
} }
return this.bs.moveKot(kot.id as string, table); return this.bs.moveKot(kot.kotId as string, table);
}), }),
) )
.subscribe( .subscribe(