diff --git a/barker/barker/routers/voucher/show.py b/barker/barker/routers/voucher/show.py index 854fe1a..1871c98 100644 --- a/barker/barker/routers/voucher/show.py +++ b/barker/barker/routers/voucher/show.py @@ -59,6 +59,11 @@ def from_bill( Voucher.bill_id == int(id_.replace("ST-", "")), Voucher.voucher_type == VoucherType.STAFF, ) + elif re.compile(r"^V-\d+$").match(id_): + query = query.where( + Voucher.kot_id == int(id_.replace("V-", "")), + Voucher.voucher_type == VoucherType.VOID, + ) else: raise HTTPException( status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, diff --git a/bookie/src/app/sales/bill-number/bill-number.component.html b/bookie/src/app/sales/bill-number/bill-number.component.html index 9c56f7a..236e433 100644 --- a/bookie/src/app/sales/bill-number/bill-number.component.html +++ b/bookie/src/app/sales/bill-number/bill-number.component.html @@ -13,6 +13,7 @@ Regular Bill Staff No Charge + Void diff --git a/bookie/src/app/sales/bill-number/bill-number.component.ts b/bookie/src/app/sales/bill-number/bill-number.component.ts index 7fb082a..d6360f4 100644 --- a/bookie/src/app/sales/bill-number/bill-number.component.ts +++ b/bookie/src/app/sales/bill-number/bill-number.component.ts @@ -45,6 +45,9 @@ export class BillNumberComponent implements OnInit { case '2': // No Charge billId = 'NC-' + billNumber; break; + case '8': // Void + billId = 'V-' + billNumber; + break; default: throw new Error('Unknown Bill Type'); }