Fix order item names, add Select All, pay confirmation with total, close empty order

This commit is contained in:
2026-04-20 12:22:36 +03:00
parent 79f316aeb7
commit e9b4cfcd26
3 changed files with 69 additions and 6 deletions

View File

@@ -8,7 +8,7 @@ from database import get_db
from models.order import Order, OrderItem, OrderWaiter
from models.user import User, AssistantAssignment
from models.product import Product
from schemas.order import OrderCreate, OrderOut, OrderItemOut, AddItemsRequest, PayItemsRequest, AssignWaiterRequest
from schemas.order import OrderCreate, OrderOut, OrderItemOut, AddItemsRequest, PayItemsRequest, AssignWaiterRequest, OrderWaiterOut
from routers.deps import get_current_user, require_manager
from services.printer_service import route_and_print

View File

@@ -15,10 +15,17 @@ class AddItemsRequest(BaseModel):
items: List[OrderItemInput]
class ProductNameOut(BaseModel):
id: int
name: str
model_config = {"from_attributes": True}
class OrderItemOut(BaseModel):
id: int
order_id: int
product_id: int
product: Optional[ProductNameOut] = None
added_by: int
quantity: int
unit_price: float
@@ -44,6 +51,11 @@ class AssignWaiterRequest(BaseModel):
waiter_id: int
class OrderWaiterOut(BaseModel):
waiter_id: int
model_config = {"from_attributes": True}
class OrderOut(BaseModel):
id: int
table_id: int
@@ -54,5 +66,6 @@ class OrderOut(BaseModel):
closed_by: Optional[int] = None
notes: Optional[str] = None
items: List[OrderItemOut] = []
waiters: List[OrderWaiterOut] = []
model_config = {"from_attributes": True}