bonamin
4b1201ecaa
4.1 — cloud_sync.py
- _push_menu_snapshot(): serializes digital-visible products+categories
and POSTs to cloud /api/menu/sync every 5 minutes
- _pull_pending_orders(): polls cloud /api/orders/pending/{site_id}
every CONNECT_SYNC_INTERVAL_SECONDS (default 30s); creates local
Order + OrderItem rows, marks synced on cloud, broadcasts SSE event
- _connect_loop(): second asyncio task running the fast poll loop;
piggybacked menu push fires every 5 min regardless of poll interval
- _sync_once(): captures site_numeric_id from heartbeat response and
stores it in license_state so Connect loops can use it
- start_cloud_sync(): now creates and returns both tasks
4.2 — orders model/schema/migrations
- models/order.py: table_id made nullable (online orders have no
table); 7 new online_* columns added to Order
- schemas/order.py: OrderOut table_id Optional, all 7 online_* fields
added
- main.py: 8 additive ALTER TABLE migrations for orders table
4.3 — routers/connect_orders.py (NEW)
GET /api/connect/orders/incoming — pending online orders (any auth)
POST /api/connect/orders/{id}/accept — accept (manager)
POST /api/connect/orders/{id}/reject — reject with optional reason (manager)
POST /api/connect/orders/{id}/status — progress through lifecycle (manager)
All state changes mirror to cloud via background task and broadcast SSE
4.4 — main.py router registration
connect_orders router registered at /api/connect
config.py
CONNECT_SYNC_INTERVAL_SECONDS setting added (default 30)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
136 lines
3.6 KiB
Python
136 lines
3.6 KiB
Python
from pydantic import BaseModel
|
|
from datetime import datetime
|
|
from typing import Optional, List
|
|
from schemas.base import UTCDatetime
|
|
|
|
|
|
class SelectedOptionInput(BaseModel):
|
|
id: Optional[int] = None
|
|
name: Optional[str] = None
|
|
price_delta: Optional[float] = None
|
|
extra_cost: Optional[float] = None
|
|
# type tags: "quick" | "pref" | "pref_sub" | "extra" | "extra_sub"
|
|
# Omitted by old clients — print code falls back gracefully.
|
|
type: Optional[str] = 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: UTCDatetime
|
|
printed: bool
|
|
paid_by: Optional[int] = None
|
|
paid_at: Optional[UTCDatetime] = None
|
|
payment_method: Optional[str] = None
|
|
paid_in_shift_id: Optional[int] = None
|
|
|
|
model_config = {"from_attributes": True}
|
|
|
|
|
|
class PrintResultOut(BaseModel):
|
|
printer_name: str
|
|
success: bool
|
|
error: Optional[str] = None
|
|
|
|
|
|
class AddItemsResponse(BaseModel):
|
|
order: "OrderOut"
|
|
print_results: List[PrintResultOut]
|
|
|
|
model_config = {"from_attributes": True}
|
|
|
|
|
|
class OrderCreate(BaseModel):
|
|
table_id: int
|
|
|
|
|
|
class PayItemsRequest(BaseModel):
|
|
item_ids: List[int]
|
|
payment_method: Optional[str] = None # 'cash' | 'card' | 'other' — optional for now
|
|
|
|
|
|
class OfflinePaymentRequest(BaseModel):
|
|
uuid: str # client-generated UUID, used for duplicate detection
|
|
item_ids: List[int]
|
|
payment_method: Optional[str] = None
|
|
offline_at: Optional[str] = None # ISO timestamp of when payment was taken offline
|
|
|
|
|
|
class AssignWaiterRequest(BaseModel):
|
|
waiter_id: int
|
|
|
|
|
|
class OrderWaiterOut(BaseModel):
|
|
waiter_id: int
|
|
model_config = {"from_attributes": True}
|
|
|
|
|
|
class AuditLogOut(BaseModel):
|
|
id: int
|
|
order_id: int
|
|
event_type: str
|
|
waiter_id: Optional[int] = None
|
|
waiter_name: Optional[str] = None # resolved server-side
|
|
item_ids: Optional[str] = None
|
|
amount: Optional[float] = None
|
|
payment_method: Optional[str] = None
|
|
note: Optional[str] = None
|
|
created_at: UTCDatetime
|
|
offline_at: Optional[str] = None
|
|
is_duplicate: int = 0
|
|
|
|
model_config = {"from_attributes": True}
|
|
|
|
|
|
class OrderOut(BaseModel):
|
|
id: int
|
|
table_id: Optional[int] = None
|
|
opened_by: int
|
|
opened_at: UTCDatetime
|
|
status: str
|
|
closed_at: Optional[UTCDatetime] = None
|
|
closed_by: Optional[int] = None
|
|
notes: Optional[str] = None
|
|
business_day_id: Optional[int] = None
|
|
# Xenia Connect — online order fields
|
|
source: str = "pos"
|
|
online_order_ref: Optional[str] = None
|
|
online_status: Optional[str] = None
|
|
online_customer_name: Optional[str] = None
|
|
online_customer_phone: Optional[str] = None
|
|
online_customer_address: Optional[str] = None
|
|
online_customer_notes: Optional[str] = None
|
|
online_order_type: Optional[str] = None
|
|
items: List[OrderItemOut] = []
|
|
waiters: List[OrderWaiterOut] = []
|
|
audit_logs: List[AuditLogOut] = []
|
|
|
|
model_config = {"from_attributes": True}
|