bonamin
24a029a8cc
Backend:
- OrderItemInput accepts option objects {id,name,price_delta} instead of int IDs
- extra_cost from selected options added to unit_price snapshot
- GET /api/products/?all=true for manager (includes unavailable)
- PUT /api/products/{id} now replaces options, ingredients, preference_sets
- POST /api/products/{id}/image — persistent image upload to /app/data/product_images
- New models: ProductPreferenceSet, ProductPreferenceChoice, TableGroup
- tables: group_id FK, hard delete (?hard=true), batch create POST /api/tables/batch
- GET /api/tables/groups + POST/PUT/DELETE groups endpoints
- POST /api/auth/me endpoint for token rehydration
- Auto-migration on startup for new columns
PWA:
- AuthRehydrator: fetches /auth/me on load so isMyOrder works after page reload
- 401 response force-logs out (covers blocked waiters)
- ItemOptionsModal: uses extra_cost correctly, shows preferences as radio buttons
Manager:
- ProductsPage: shows unavailable products greyed out, category color picker + reorder,
full option/ingredient/preference editing, image upload
- TablesPage: table groups, auto-increment, deactivate vs hard delete, batch add
79 lines
1.7 KiB
Python
79 lines
1.7 KiB
Python
from pydantic import BaseModel
|
|
from datetime import datetime
|
|
from typing import Optional, List
|
|
|
|
|
|
class SelectedOptionInput(BaseModel):
|
|
id: Optional[int] = None
|
|
name: Optional[str] = None
|
|
price_delta: Optional[float] = None
|
|
extra_cost: Optional[float] = None
|
|
|
|
|
|
class OrderItemInput(BaseModel):
|
|
product_id: int
|
|
quantity: int
|
|
selected_options: Optional[List[SelectedOptionInput]] = None
|
|
removed_ingredients: Optional[List[str]] = None
|
|
notes: Optional[str] = None
|
|
|
|
|
|
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
|
|
selected_options: Optional[str] = None
|
|
removed_ingredients: Optional[str] = None
|
|
notes: Optional[str] = None
|
|
status: str
|
|
added_at: datetime
|
|
printed: bool
|
|
|
|
model_config = {"from_attributes": True}
|
|
|
|
|
|
class OrderCreate(BaseModel):
|
|
table_id: int
|
|
|
|
|
|
class PayItemsRequest(BaseModel):
|
|
item_ids: List[int]
|
|
|
|
|
|
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
|
|
opened_by: int
|
|
opened_at: datetime
|
|
status: str
|
|
closed_at: Optional[datetime] = None
|
|
closed_by: Optional[int] = None
|
|
notes: Optional[str] = None
|
|
items: List[OrderItemOut] = []
|
|
waiters: List[OrderWaiterOut] = []
|
|
|
|
model_config = {"from_attributes": True}
|