Compare commits

..
2 Commits
Author SHA1 Message Date
tanshu af684c976e Version Bump v13.0.1 2025-07-09 15:37:37 +00:00
tanshu 26c65b4b65 Fix: Could not open bill with bill number or voucher id 2025-07-09 15:35:35 +00:00
6 changed files with 53 additions and 46 deletions
+1 -1
View File
@@ -1 +1 @@
__version__ = "13.0.0" __version__ = "13.0.1"
+13 -6
View File
@@ -59,7 +59,8 @@ def from_id(
ProductVersion.valid_till >= Voucher.date, ProductVersion.valid_till >= Voucher.date,
), ),
) )
item: Voucher = db.execute( item: Voucher = (
db.execute(
select(Voucher) select(Voucher)
.join(Voucher.food_table) .join(Voucher.food_table)
.join(Voucher.customer, isouter=True) .join(Voucher.customer, isouter=True)
@@ -77,7 +78,10 @@ def from_id(
.contains_eager(Inventory.product) .contains_eager(Inventory.product)
.contains_eager(Product.versions), .contains_eager(Product.versions),
) )
).scalar_one() )
.unique()
.scalar_one()
)
return voucher_info(item, db) return voucher_info(item, db)
@@ -104,7 +108,8 @@ def from_bill(
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
detail="Bill Number is invalid", detail="Bill Number is invalid",
) )
item: Voucher | None = db.execute( item: Voucher | None = (
db.execute(
select(Voucher) select(Voucher)
.join(Voucher.bills) .join(Voucher.bills)
.join(Bill.regime) .join(Bill.regime)
@@ -125,7 +130,10 @@ def from_bill(
.contains_eager(Product.versions), .contains_eager(Product.versions),
contains_eager(Voucher.bills).contains_eager(Bill.regime), contains_eager(Voucher.bills).contains_eager(Bill.regime),
) )
).scalar_one_or_none() )
.unique()
.scalar_one_or_none()
)
if item is None: if item is None:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND, status_code=status.HTTP_404_NOT_FOUND,
@@ -192,8 +200,7 @@ def from_table(
) )
) )
.unique() .unique()
.scalars() .scalar_one()
.one()
) )
if guest is not None: if guest is not None:
+1 -1
View File
@@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "barker" name = "barker"
version = "13.0.0" version = "13.0.1"
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
View File
@@ -1,6 +1,6 @@
{ {
"name": "bookie", "name": "bookie",
"version": "13.0.0", "version": "13.0.1",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
+1 -1
View File
@@ -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: '13.0.0', version: '13.0.1',
}; };
export const dateFormat = { export const dateFormat = {
+1 -1
View File
@@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "frank" name = "frank"
version = "13.0.0" version = "13.0.1"
description = "Point of Sale for a restaurant" description = "Point of Sale for a restaurant"
authors = ["tanshu <git@tanshu.com>"] authors = ["tanshu <git@tanshu.com>"]